Skip to content

: Netfilter patches for 2.6.17

Patrick McHardy netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest13 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13: Fix CID offset bug in PPTP NAT helper debug messagenet/ipv4/netfilter/ip_nat_helper_pptp.c+5 -30 replies
2/13: nf_conntrack: use ipv6_addr_equal in nf_ct_reasmnet/ipv6/netfilter/nf_conntrack_reasm.c+4 -40 replies
3/13: xt_tables: add centralized error checkinginclude/linux/netfilter/x_tables.h net/netfilter/x_tables.c+84 -110 replies
4/13: Change {ip, ip6, arp}_tables to use centralized error checkingnet/ipv4/netfilter/arp_tables.c net/ipv4/netfilter/ip_tables.c net/ipv6/netfilter/ip6_tables.c+50 -130 replies
5/13: Convert ip_tables matches/targets to centralized error checkingnet/ipv4/netfilter/ip_nat_rule.c net/ipv4/netfilter/ip_tables.c net/ipv4/netfilter/ipt_CLUSTERIP.c +25 more+103 -3900 replies
6/13: Convert arp_tables targets to centralized error checkingnet/ipv4/netfilter/arp_tables.c net/ipv4/netfilter/arpt_mangle.c+8 -60 replies
7/13: Convert ip6_tables matches/targets to centralized error checkingnet/ipv6/netfilter/ip6_tables.c net/ipv6/netfilter/ip6t_HL.c net/ipv6/netfilter/ip6t_LOG.c +13 more+47 -1650 replies
8/13: Convert x_tables matches/targets to centralized error checkingnet/netfilter/xt_CLASSIFY.c net/netfilter/xt_CONNMARK.c net/netfilter/xt_MARK.c +20 more+167 -5110 replies
9/13: x_tables: pass registered match/target data to match/target functionsinclude/linux/netfilter/x_tables.h net/ipv4/netfilter/arp_tables.c net/ipv4/netfilter/ip_tables.c +2 more+30 -190 replies
10/13: x_tables: add xt_{match, target} arguments to match/target functionsnet/ipv4/netfilter/arp_tables.c net/ipv4/netfilter/arpt_mangle.c net/ipv4/netfilter/ip_nat_rule.c +66 more+160 -290 replies
11/13: Move ip6_masked_addrcmp to include/net/ipv6.hinclude/net/ipv6.h net/ipv6/netfilter/ip6_tables.c net/ipv6/netfilter/ip6t_policy.c+18 -190 replies
12/13: x_tables: replace IPv4/IPv6 policy match by address family independant versioninclude/linux/netfilter/x_tables.h include/linux/netfilter/xt_policy.h include/linux/netfilter_ipv4/ipt_policy.h +10 more+312 -4740 replies
13/13: ctnetlink: avoid unneccessary event message generationinclude/linux/netfilter/nfnetlink.h net/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c +1 more+15 -60 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/13]: Netfilter patches for 2.6.17

Hi Dave,

these are my netfilter patches for 2.6.17. The last patch (ctnetlink:
avoid unneccessary event message generation) depends on the netlink patch I sent yesterday. Please apply on top of that patch.

 include/linux/netfilter/nfnetlink.h        |    1 
 include/linux/netfilter/x_tables.h         |   37 ++++-
 include/linux/netfilter/xt_policy.h        |   58 ++++++++
 include/linux/netfilter_ipv4/ipt_policy.h  |   67 ++-------
 include/linux/netfilter_ipv6/ip6t_policy.h |   67 ++-------
 include/net/ipv6.h                         |   12 +
 net/ipv4/netfilter/Kconfig                 |   10 -
 net/ipv4/netfilter/Makefile                |    1 
 net/ipv4/netfilter/arp_tables.c            |   19 +-
 net/ipv4/netfilter/arpt_mangle.c           |   23 +--
 net/ipv4/netfilter/ip_conntrack_netlink.c  |    7 
 net/ipv4/netfilter/ip_nat_helper_pptp.c    |    8 -
 net/ipv4/netfilter/ip_nat_rule.c           |   45 +-----
 net/ipv4/netfilter/ip_tables.c             |   67 +++++----
 net/ipv4/netfilter/ipt_CLUSTERIP.c         |   27 +--
 net/ipv4/netfilter/ipt_DSCP.c              |   17 --
 net/ipv4/netfilter/ipt_ECN.c               |   18 --
 net/ipv4/netfilter/ipt_LOG.c               |   11 -
 net/ipv4/netfilter/ipt_MASQUERADE.c        |   18 --
 net/ipv4/netfilter/ipt_NETMAP.c            |   19 --
 net/ipv4/netfilter/ipt_REDIRECT.c          |   17 --
 net/ipv4/netfilter/ipt_REJECT.c            |   24 ---
 net/ipv4/netfilter/ipt_SAME.c              |   19 --
 net/ipv4/netfilter/ipt_TCPMSS.c            |   16 --
 net/ipv4/netfilter/ipt_TOS.c               |   17 --
 net/ipv4/netfilter/ipt_TTL.c               |   25 ---
 net/ipv4/netfilter/ipt_ULOG.c              |   12 -
 net/ipv4/netfilter/ipt_addrtype.c          |   20 --
 net/ipv4/netfilter/ipt_ah.c                |   25 +--
 net/ipv4/netfilter/ipt_dscp.c              |   19 --
 net/ipv4/netfilter/ipt_ecn.c               |   14 -
 net/ipv4/netfilter/ipt_esp.c               |   25 +--
 net/ipv4/netfilter/ipt_hashlimit.c         |   21 +-
 net/ipv4/netfilter/ipt_iprange.c           |   28 ---
 net/ipv4/netfilter/ipt_multiport.c         |   31 ----
 net/ipv4/netfilter/ipt_owner.c             |   21 --
 net/ipv4/netfilter/ipt_policy.c            |  182 -------------------------
 net/ipv4/netfilter/ipt_recent.c            |   22 +--
 net/ipv4/netfilter/ipt_tos.c               |   18 --
 net/ipv4/netfilter/ipt_ttl.c               |   19 --
 net/ipv6/netfilter/Kconfig                 |   10 -
 net/ipv6/netfilter/Makefile                |    1 
 net/ipv6/netfilter/ip6_tables.c            |   85 +++++------
 net/ipv6/netfilter/ip6t_HL.c               |   19 --
 net/ipv6/netfilter/ip6t_LOG.c              |   11 -
 net/ipv6/netfilter/ip6t_REJECT.c           |   25 ---
 net/ipv6/netfilter/ip6t_ah.c               |   12 -
 net/ipv6/netfilter/ip6t_dst.c              |   13 -
 net/ipv6/netfilter/ip6t_esp.c              |   12 -
 net/ipv6/netfilter/ip6t_eui64.c            |   27 ---
 net/ipv6/netfilter/ip6t_frag.c             |   13 -
 net/ipv6/netfilter/ip6t_hbh.c              |   13 -
 net/ipv6/netfilter/ip6t_hl.c               |   22 ---
 net/ipv6/netfilter/ip6t_ipv6header.c       |    8 -
 net/ipv6/netfilter/ip6t_multiport.c        |   11 -
 net/ipv6/netfilter/ip6t_owner.c            |   18 --
 net/ipv6/netfilter/ip6t_policy.c           |  188 --------------------------
 net/ipv6/netfilter/ip6t_rt.c               |   12 -
 net/ipv6/netfilter/nf_conntrack_reasm.c    |    8 -
 net/netfilter/Kconfig                      |   10 +
 net/netfilter/Makefile                     |    1 
 net/netfilter/nf_conntrack_netlink.c       |    7 
 net/netfilter/nfnetlink.c                  |    6 
 net/netfilter/x_tables.c                   |   72 +++++++++
 net/netfilter/xt_CLASSIFY.c                |   42 +----
 net/netfilter/xt_CONNMARK.c                |   27 +--
 net/netfilter/xt_MARK.c                    |   37 +----
 net/netfilter/xt_NFQUEUE.c                 |   24 ---
 net/netfilter/xt_NOTRACK.c                 |   45 +-----
 net/netfilter/xt_comment.c                 |   18 --
 net/netfilter/xt_connbytes.c               |   15 +-
 net/netfilter/xt_connmark.c                |   28 +--
 net/netfilter/xt_conntrack.c               |   18 --
 net/netfilter/xt_dccp.c                    |   45 +-----
 net/netfilter/xt_helper.c                  |   18 +-
 net/netfilter/xt_length.c                  |   24 ---
 net/netfilter/xt_limit.c                   |    7 
 net/netfilter/xt_mac.c                     |   34 +---
 net/netfilter/xt_mark.c                    |   16 +-
 net/netfilter/xt_physdev.c                 |   14 +
 net/netfilter/xt_pkttype.c                 |   23 ---
 net/netfilter/xt_policy.c                  |  209 +++++++++++++++++++++++++++++
 net/netfilter/xt_realm.c                   |   27 ---
 net/netfilter/xt_sctp.c                    |   66 ++-------
 net/netfilter/xt_state.c                   |   21 --
 net/netfilter/xt_string.c                  |   10 -
 net/netfilter/xt_tcpmss.c                  |   52 -------
 net/netfilter/xt_tcpudp.c                  |  112 +++------------
 net/sched/act_ipt.c                        |   10 -
 89 files changed, 1003 insertions(+), 1650 deletions(-)

Holger Eitzenberger:
[NETFILTER]: Fix CID offset bug in PPTP NAT helper debug message

Patrick McHardy:
[NETFILTER]: xt_tables: add centralized error checking
[NETFILTER]: Change {ip,ip6,arp}_tables to use centralized error checking [NETFILTER]: Convert ip_tables matches/targets to centralized error checking [NETFILTER]: Convert arp_tables targets to centralized error checking [NETFILTER]: Convert ip6_tables matches/targets to centralized error checking [NETFILTER]: Convert x_tables matches/targets to centralized error checking [NETFILTER]: x_tables: pass registered match/target data to match/target functions [NETFILTER]: x_tables: add xt_{match,target} arguments to match/target functions [NETFILTER]: Move ip6_masked_addrcmp to include/net/ipv6.h
[NETFILTER]: x_tables: replace IPv4/IPv6 policy match by address family independant version [NETFILTER]: ctnetlink: avoid unneccessary event message generation

Yasuyuki Kozakai:
[NETFILTER]: nf_conntrack: use ipv6_addr_equal in nf_ct_reasm