Skip to content

: Netfilter patches for 2.6.21

Patrick McHardy netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15: Add SANE connection tracking helperinclude/linux/netfilter/nf_conntrack_sane.h include/net/netfilter/nf_conntrack.h net/netfilter/Kconfig +2 more+279 -03 replies
2/15: tcp conntrack: do liberal tracking for picked up connectionsinclude/linux/netfilter/nf_conntrack_tcp.h net/ipv4/netfilter/ip_conntrack_proto_tcp.c net/netfilter/nf_conntrack_proto_tcp.c+33 -510 replies
3/15: nf_conntrack_tcp: make sysctl variables static+0 -04 replies
4/15: Remove useless comparisons before assignmentsnet/ipv6/netfilter/ip6t_HL.c net/netfilter/xt_CLASSIFY.c net/netfilter/xt_CONNMARK.c +3 more+9 -210 replies
5/15: nf_nat: remove broken HOOKNAME macronet/ipv4/netfilter/nf_nat_standalone.c+0 -60 replies
6/15: bridge-netfilter: use nf_register_hooks/nf_unregister_hooksnet/bridge/br_netfilter.c+7 -220 replies
7/15: Add UDPLITE support in a few missing spotsnet/bridge/netfilter/ebt_ip.c net/bridge/netfilter/ebt_log.c net/ipv4/netfilter/ipt_CLUSTERIP.c +2 more+6 -00 replies
8/15: add IPv6-capable TCPMSS targetinclude/linux/netfilter/Kbuild include/linux/netfilter/xt_TCPMSS.h include/linux/netfilter_ipv4/ipt_TCPMSS.h +6 more+337 -2380 replies
9/15: NAT: optional source port randomization supportinclude/linux/netfilter_ipv4/ip_nat.h include/net/netfilter/nf_nat.h net/ipv4/netfilter/ip_nat_core.c +7 more+48 -40 replies
10/15: x_tables: fix return values for LOG/ULOGnet/ipv4/netfilter/ipt_LOG.c net/ipv4/netfilter/ipt_ULOG.c net/ipv6/netfilter/ip6t_LOG.c+14 -70 replies
11/15: {ip, ip6}_tables: remove x_tables wrapper functionsinclude/linux/netfilter_ipv4/ip_tables.h include/linux/netfilter_ipv6/ip6_tables.h net/ipv4/netfilter/ip_nat_rule.c +33 more+202 -1710 replies
12/15: {ip, ip6}_tables: use struct xt_table instead of redefined structure namesinclude/linux/netfilter_ipv4/ip_tables.h include/linux/netfilter_ipv6/ip6_tables.h net/ipv4/netfilter/ip_nat_rule.c +8 more+24 -270 replies
13/15: ip6_tables: support MH matchinclude/linux/netfilter_ipv6/ip6t_mh.h net/ipv6/netfilter/Kconfig net/ipv6/netfilter/Makefile +1 more+132 -00 replies
14/15: ip_tables: remove declaration of non-existant ipt_find_target functioninclude/linux/netfilter_ipv4/ip_tables.h+0 -30 replies
15/15: ip6_tables: remove redundant structure definitionsinclude/linux/netfilter_ipv6/ip6_tables.h net/ipv6/netfilter/ip6table_filter.c net/ipv6/netfilter/ip6table_mangle.c +1 more+19 -570 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/15]: Netfilter patches for 2.6.21

Hi Dave,

following is a first batch of my netfilter patches for 2.6.21. Besides some cleanup, the highlights are:

- New SANE connection tracking helper
- New ip6tables Mobility Header match
- x_tables TCPMSS target port with IPv6 support
- Automatic liberal TCP connection tracking for picked up connections
- Optional source port randomization for SNAT

Once again the diffstat is quite huge, but mainly because of some harmless cleanup of x_tables wrappers, touching almost all iptables related files.

Please apply, thanks.

 include/linux/netfilter/Kbuild              |    1 
 include/linux/netfilter/nf_conntrack_sane.h |   21 +
 include/linux/netfilter/nf_conntrack_tcp.h  |    4 
 include/linux/netfilter/xt_TCPMSS.h         |   10 
 include/linux/netfilter_ipv4/ip_nat.h       |    1 
 include/linux/netfilter_ipv4/ip_tables.h    |   24 --
 include/linux/netfilter_ipv4/ipt_TCPMSS.h   |    7 
 include/linux/netfilter_ipv6/ip6_tables.h   |   35 ++-
 include/linux/netfilter_ipv6/ip6t_mh.h      |   15 +
 include/net/netfilter/nf_conntrack.h        |    2 
 include/net/netfilter/nf_nat.h              |    1 
 net/bridge/br_netfilter.c                   |   29 --
 net/bridge/netfilter/ebt_ip.c               |    1 
 net/bridge/netfilter/ebt_log.c              |    1 
 net/ipv4/netfilter/Kconfig                  |   26 --
 net/ipv4/netfilter/Makefile                 |    1 
 net/ipv4/netfilter/ip_conntrack_proto_tcp.c |   40 +--
 net/ipv4/netfilter/ip_nat_core.c            |   12 -
 net/ipv4/netfilter/ip_nat_proto_tcp.c       |    5 
 net/ipv4/netfilter/ip_nat_proto_udp.c       |    5 
 net/ipv4/netfilter/ip_nat_rule.c            |   32 +--
 net/ipv4/netfilter/ip_tables.c              |   40 +--
 net/ipv4/netfilter/ipt_CLUSTERIP.c          |   15 -
 net/ipv4/netfilter/ipt_ECN.c                |   13 -
 net/ipv4/netfilter/ipt_LOG.c                |   18 +
 net/ipv4/netfilter/ipt_MASQUERADE.c         |    9 
 net/ipv4/netfilter/ipt_NETMAP.c             |    8 
 net/ipv4/netfilter/ipt_REDIRECT.c           |    8 
 net/ipv4/netfilter/ipt_REJECT.c             |   10 
 net/ipv4/netfilter/ipt_SAME.c               |    8 
 net/ipv4/netfilter/ipt_TCPMSS.c             |  207 -------------------
 net/ipv4/netfilter/ipt_TOS.c                |   11 -
 net/ipv4/netfilter/ipt_TTL.c                |   11 -
 net/ipv4/netfilter/ipt_ULOG.c               |   20 -
 net/ipv4/netfilter/ipt_addrtype.c           |    9 
 net/ipv4/netfilter/ipt_ah.c                 |   10 
 net/ipv4/netfilter/ipt_ecn.c                |   10 
 net/ipv4/netfilter/ipt_iprange.c            |   10 
 net/ipv4/netfilter/ipt_owner.c              |    9 
 net/ipv4/netfilter/ipt_recent.c             |   12 -
 net/ipv4/netfilter/ipt_tos.c                |   10 
 net/ipv4/netfilter/ipt_ttl.c                |   11 -
 net/ipv4/netfilter/iptable_filter.c         |    2 
 net/ipv4/netfilter/iptable_mangle.c         |    2 
 net/ipv4/netfilter/iptable_raw.c            |    2 
 net/ipv4/netfilter/nf_nat_core.c            |   12 -
 net/ipv4/netfilter/nf_nat_proto_tcp.c       |    4 
 net/ipv4/netfilter/nf_nat_proto_udp.c       |    4 
 net/ipv4/netfilter/nf_nat_rule.c            |    8 
 net/ipv4/netfilter/nf_nat_standalone.c      |    6 
 net/ipv6/netfilter/Kconfig                  |    8 
 net/ipv6/netfilter/Makefile                 |    1 
 net/ipv6/netfilter/ip6_tables.c             |   12 -
 net/ipv6/netfilter/ip6t_HL.c                |   17 -
 net/ipv6/netfilter/ip6t_LOG.c               |   17 +
 net/ipv6/netfilter/ip6t_REJECT.c            |   10 
 net/ipv6/netfilter/ip6t_ah.c                |    8 
 net/ipv6/netfilter/ip6t_eui64.c             |    8 
 net/ipv6/netfilter/ip6t_frag.c              |    8 
 net/ipv6/netfilter/ip6t_hbh.c               |    1 
 net/ipv6/netfilter/ip6t_hl.c                |   11 -
 net/ipv6/netfilter/ip6t_ipv6header.c        |    8 
 net/ipv6/netfilter/ip6t_mh.c                |  108 ++++++++++
 net/ipv6/netfilter/ip6t_owner.c             |    8 
 net/ipv6/netfilter/ip6t_rt.c                |    8 
 net/ipv6/netfilter/ip6table_filter.c        |   21 -
 net/ipv6/netfilter/ip6table_mangle.c        |   21 -
 net/ipv6/netfilter/ip6table_raw.c           |   19 -
 net/netfilter/Kconfig                       |   39 +++
 net/netfilter/Makefile                      |    2 
 net/netfilter/nf_conntrack_proto_tcp.c      |   40 +--
 net/netfilter/nf_conntrack_sane.c           |  242 ++++++++++++++++++++++
 net/netfilter/xt_CLASSIFY.c                 |    4 
 net/netfilter/xt_CONNMARK.c                 |    5 
 net/netfilter/xt_CONNSECMARK.c              |    6 
 net/netfilter/xt_MARK.c                     |    8 
 net/netfilter/xt_SECMARK.c                  |    4 
 net/netfilter/xt_TCPMSS.c                   |  296 ++++++++++++++++++++++++++++
 net/netfilter/xt_hashlimit.c                |    1 
 net/sched/act_ipt.c                         |    2 
 net/sched/sch_sfq.c                         |    2 
 81 files changed, 1110 insertions(+), 607 deletions(-)

Eric Leblond:
[NETFILTER]: NAT: optional source port randomization support

Jan Engelhardt:
[NETFILTER]: Remove useless comparisons before assignments
[NETFILTER]: x_tables: fix return values for LOG/ULOG
[NETFILTER]: {ip,ip6}_tables: remove x_tables wrapper functions [NETFILTER]: {ip,ip6}_tables: use struct xt_table instead of redefined structure names

Masahide NAKAMURA:
[NETFILTER]: ip6_tables: support MH match

Michal Schmidt:
[NETFILTER]: Add SANE connection tracking helper

Patrick McHardy:
[NETFILTER]: tcp conntrack: do liberal tracking for picked up connections [NETFILTER]: nf_conntrack_tcp: make sysctl variables static [NETFILTER]: nf_nat: remove broken HOOKNAME macro
[NETFILTER]: bridge-netfilter: use nf_register_hooks/nf_unregister_hooks [NET]: Add UDPLITE support in a few missing spots
[NETFILTER]: add IPv6-capable TCPMSS target
[NETFILTER]: ip_tables: remove declaration of non-existant ipt_find_target function [NETFILTER]: ip6_tables: remove redundant structure definitions