Skip to content

: Netfilter Update for 2.6.19

Patrick McHardy netfilter-devel 1 version Applied

Status from this message: Applied, thanks a lot Thomas.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 5 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/18: x_tables: replace IPv4 dscp match by address family independent versioninclude/linux/netfilter/xt_dscp.h include/linux/netfilter_ipv4/ipt_dscp.h net/ipv4/netfilter/Kconfig +5 more+154 -740 replies
2/18: x_tables: replace IPv4 DSCP target by address family independent versioninclude/linux/netfilter/xt_DSCP.h include/linux/netfilter_ipv4/ipt_DSCP.h net/ipv4/netfilter/Kconfig +5 more+165 -1120 replies
3/18: ipt_recent: add module parameter for changing ownership of /proc/net/ipt_recent/*net/ipv4/netfilter/ipt_recent.c+8 -00 replies
4/18: conntrack: introduce connection mark eventinclude/linux/netfilter/nf_conntrack_common.h net/netfilter/xt_CONNMARK.c+18 -20 replies
5/18: ctnetlink: dump connection marknet/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c+8 -00 replies
6/18: ctnetlink: check for listeners before sending expectation eventsnet/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c+6 -00 replies
7/18: ctnetlink: remove impossible events tests for updatesnet/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c+2 -100 replies
8/18: nfnetlink_queue: fix typo in error messagenet/netfilter/nfnetlink_queue.c+2 -20 replies
9/18: replace open coded checksum updatesnet/ipv4/netfilter/ipt_ECN.c net/ipv4/netfilter/ipt_TOS.c net/ipv4/netfilter/ipt_TTL.c+20 -330 replies
10/18: xt_CONNMARK: use tabs for indentationnet/netfilter/xt_CONNMARK.c+29 -280 replies
11/18: x_tables: add helpers for mass match/target registrationinclude/linux/netfilter/x_tables.h net/netfilter/x_tables.c+65 -00 replies
12/18: x_tables: make use of mass registation helpersnet/ipv6/netfilter/ip6t_REJECT.c net/netfilter/xt_CLASSIFY.c net/netfilter/xt_CONNMARK.c +29 more+679 -10072 replies
13/18: x_tables: remove unused argument to target functionsinclude/linux/netfilter/x_tables.h include/linux/netfilter_arp/arp_tables.h include/linux/netfilter_ipv4/ip_tables.h +38 more+55 -910 replies
14/18: x_tables: remove unused size argument to check/destroy functionsinclude/linux/netfilter/x_tables.h net/ipv4/netfilter/arp_tables.c net/ipv4/netfilter/arpt_mangle.c +54 more+26 -1060 replies
15/18: nfnetlink: remove unnecessary packed attributesinclude/linux/netfilter/nfnetlink.h include/linux/netfilter/nfnetlink_log.h include/linux/netfilter/nfnetlink_queue.h+9 -90 replies
16/18: x_tables: add data member to struct xt_matchinclude/linux/netfilter/x_tables.h+3 -00 replies
17/18: ip6_tables: consolidate dst and hbh matchesnet/ipv6/netfilter/Makefile net/ipv6/netfilter/ip6t_dst.c net/ipv6/netfilter/ip6t_hbh.c+25 -2440 replies
18/18: xt_tcpmss: minor cleanupsnet/netfilter/xt_tcpmss.c+18 -300 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [NETFILTER 00/18]: Netfilter Update for 2.6.19

Hi Dave,

following is my first batch of netfilter patches for 2.6.19. Mostly cleanups and code consolidation and a few ctnetlink updates - it looks a lot larger than it is :)

Please apply, thanks.

 include/linux/netfilter/nf_conntrack_common.h |    4 
 include/linux/netfilter/nfnetlink.h           |    4 
 include/linux/netfilter/nfnetlink_log.h       |    6 
 include/linux/netfilter/nfnetlink_queue.h     |    8 
 include/linux/netfilter/x_tables.h            |   19 +-
 include/linux/netfilter/xt_DSCP.h             |   20 ++
 include/linux/netfilter/xt_dscp.h             |   23 ++
 include/linux/netfilter_arp/arp_tables.h      |    3 
 include/linux/netfilter_ipv4/ip_tables.h      |    3 
 include/linux/netfilter_ipv4/ipt_DSCP.h       |    6 
 include/linux/netfilter_ipv4/ipt_dscp.h       |   14 -
 include/linux/netfilter_ipv6/ip6_tables.h     |    3 
 net/ipv4/netfilter/Kconfig                    |   22 --
 net/ipv4/netfilter/Makefile                   |    2 
 net/ipv4/netfilter/arp_tables.c               |   14 -
 net/ipv4/netfilter/arpt_mangle.c              |    4 
 net/ipv4/netfilter/arptable_filter.c          |    2 
 net/ipv4/netfilter/ip_conntrack_netlink.c     |   13 -
 net/ipv4/netfilter/ip_nat_rule.c              |   10 -
 net/ipv4/netfilter/ip_tables.c                |   23 --
 net/ipv4/netfilter/ipt_CLUSTERIP.c            |    7 
 net/ipv4/netfilter/ipt_DSCP.c                 |   96 -----------
 net/ipv4/netfilter/ipt_ECN.c                  |   26 +--
 net/ipv4/netfilter/ipt_LOG.c                  |    4 
 net/ipv4/netfilter/ipt_MASQUERADE.c           |    4 
 net/ipv4/netfilter/ipt_NETMAP.c               |    4 
 net/ipv4/netfilter/ipt_REDIRECT.c             |    4 
 net/ipv4/netfilter/ipt_REJECT.c               |    4 
 net/ipv4/netfilter/ipt_SAME.c                 |    7 
 net/ipv4/netfilter/ipt_TCPMSS.c               |    4 
 net/ipv4/netfilter/ipt_TOS.c                  |   26 +--
 net/ipv4/netfilter/ipt_TTL.c                  |   12 -
 net/ipv4/netfilter/ipt_ULOG.c                 |    3 
 net/ipv4/netfilter/ipt_ah.c                   |    1 
 net/ipv4/netfilter/ipt_dscp.c                 |   54 ------
 net/ipv4/netfilter/ipt_ecn.c                  |    3 
 net/ipv4/netfilter/ipt_hashlimit.c            |    4 
 net/ipv4/netfilter/ipt_owner.c                |    1 
 net/ipv4/netfilter/ipt_recent.c               |   13 +
 net/ipv4/netfilter/iptable_filter.c           |    4 
 net/ipv4/netfilter/iptable_mangle.c           |    4 
 net/ipv4/netfilter/iptable_raw.c              |    2 
 net/ipv6/netfilter/Makefile                   |    2 
 net/ipv6/netfilter/ip6_tables.c               |   19 --
 net/ipv6/netfilter/ip6t_HL.c                  |    3 
 net/ipv6/netfilter/ip6t_LOG.c                 |    4 
 net/ipv6/netfilter/ip6t_REJECT.c              |    8 
 net/ipv6/netfilter/ip6t_ah.c                  |    1 
 net/ipv6/netfilter/ip6t_dst.c                 |  220 --------------------------
 net/ipv6/netfilter/ip6t_frag.c                |    1 
 net/ipv6/netfilter/ip6t_hbh.c                 |   49 ++---
 net/ipv6/netfilter/ip6t_ipv6header.c          |    1 
 net/ipv6/netfilter/ip6t_owner.c               |    1 
 net/ipv6/netfilter/ip6t_rt.c                  |    1 
 net/ipv6/netfilter/ip6table_filter.c          |    4 
 net/ipv6/netfilter/ip6table_mangle.c          |    4 
 net/ipv6/netfilter/ip6table_raw.c             |    2 
 net/netfilter/Kconfig                         |   23 ++
 net/netfilter/Makefile                        |    2 
 net/netfilter/nf_conntrack_netlink.c          |   13 -
 net/netfilter/nfnetlink_queue.c               |    4 
 net/netfilter/x_tables.c                      |   60 +++++++
 net/netfilter/xt_CLASSIFY.c                   |   63 +++----
 net/netfilter/xt_CONNMARK.c                   |  128 +++++++--------
 net/netfilter/xt_CONNSECMARK.c                |   61 ++-----
 net/netfilter/xt_DSCP.c                       |  188 ++++++++++++++++++----
 net/netfilter/xt_MARK.c                       |   92 ++++------
 net/netfilter/xt_NFQUEUE.c                    |   71 +++-----
 net/netfilter/xt_NOTRACK.c                    |   50 ++---
 net/netfilter/xt_SECMARK.c                    |   59 ++----
 net/netfilter/xt_comment.c                    |   45 ++---
 net/netfilter/xt_connbytes.c                  |   50 ++---
 net/netfilter/xt_connmark.c                   |   56 ++----
 net/netfilter/xt_conntrack.c                  |    8 
 net/netfilter/xt_dccp.c                       |   52 ++----
 net/netfilter/xt_dscp.c                       |  161 +++++++++++++++----
 net/netfilter/xt_esp.c                        |   52 ++----
 net/netfilter/xt_helper.c                     |   55 ++----
 net/netfilter/xt_length.c                     |   43 ++---
 net/netfilter/xt_limit.c                      |   48 ++---
 net/netfilter/xt_mac.c                        |   52 ++----
 net/netfilter/xt_mark.c                       |   48 ++---
 net/netfilter/xt_multiport.c                  |  115 ++++---------
 net/netfilter/xt_physdev.c                    |   50 ++---
 net/netfilter/xt_pkttype.c                    |   44 ++---
 net/netfilter/xt_policy.c                     |   54 ++----
 net/netfilter/xt_quota.c                      |   53 ++----
 net/netfilter/xt_sctp.c                       |   52 ++----
 net/netfilter/xt_state.c                      |   56 ++----
 net/netfilter/xt_statistic.c                  |   55 ++----
 net/netfilter/xt_string.c                     |   54 ++----
 net/netfilter/xt_tcpmss.c                     |   97 ++++-------
 net/netfilter/xt_tcpudp.c                     |  109 ++++--------
 net/sched/act_ipt.c                           |    7 
 94 files changed, 1292 insertions(+), 1748 deletions(-)

Daniel De Graaf:
[NETFILTER]: ipt_recent: add module parameter for changing ownership of /proc/net/ipt_recent/*

Pablo Neira Ayuso:
[NETFILTER]: conntrack: introduce connection mark event [NETFILTER]: ctnetlink: dump connection mark
[NETFILTER]: ctnetlink: check for listeners before sending expectation events [NETFILTER]: ctnetlink: remove impossible events tests for updates

Patrick McHardy:
[NETFILTER]: nfnetlink_queue: fix typo in error message [NETFILTER]: replace open coded checksum updates
[NETFILTER]: xt_CONNMARK: use tabs for indentation
[NETFILTER]: x_tables: add helpers for mass match/target registration [NETFILTER]: x_tables: make use of mass registation helpers [NETFILTER]: x_tables: remove unused argument to target functions [NETFILTER]: x_tables: remove unused size argument to check/destroy functions [NETFILTER]: nfnetlink: remove unnecessary packed attributes [NETFILTER]: x_tables: add data member to struct xt_match [NETFILTER]: ip6_tables: consolidate dst and hbh matches [NETFILTER]: xt_tcpmss: minor cleanups

Yasuyuki Kozakai:
[NETFILTER]: x_tables: replace IPv4 dscp match by address family independent version [NETFILTER]: x_tables: replace IPv4 DSCP target by address family independent version