Skip to content

: Netfilter update for 2.6.18

Patrick McHardy netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest17 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17: x_tables: remove some unnecessary castsnet/ipv4/netfilter/ipt_hashlimit.c net/netfilter/xt_connmark.c net/netfilter/xt_dccp.c +3 more+6 -90 replies
2/17: x_tables: add SCTP/DCCP support where missingnet/ipv4/netfilter/ipt_CLUSTERIP.c net/ipv4/netfilter/ipt_hashlimit.c net/netfilter/xt_multiport.c+26 -650 replies
3/17: x_tables: add quota matchinclude/linux/netfilter/xt_quota.h net/netfilter/Kconfig net/netfilter/Makefile +1 more+123 -00 replies
4/17: x_tables: add statistic matchinclude/linux/netfilter/xt_statistic.h net/netfilter/Kconfig net/netfilter/Makefile +1 more+151 -00 replies
5/17: recent match: replace by rewritten versionnet/ipv4/netfilter/ipt_recent.c+377 -8914 replies
6/17: conntrack: don't call helpers for related ICMP messagesnet/ipv4/netfilter/ip_conntrack_standalone.c net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c+3 -30 replies
7/17: conntrack: add sysctl to disable checksumminginclude/linux/netfilter_ipv4/ip_conntrack.h include/linux/sysctl.h include/net/netfilter/nf_conntrack.h +9 more+36 -80 replies
8/17: conntrack: add fixed timeout flag in connection trackinginclude/linux/netfilter/nf_conntrack_common.h net/ipv4/netfilter/ip_conntrack_core.c net/netfilter/nf_conntrack_core.c+16 -00 replies
9/17: ctnetlink: fix NAT configurationinclude/linux/netfilter/nfnetlink_conntrack.h net/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c+47 -630 replies
10/17: ctnetlink: change table dumping not to require an unique IDnet/ipv4/netfilter/ip_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c+48 -160 replies
11/17: SNMP helper: fix debug module param typenet/ipv4/netfilter/ip_nat_snmp_basic.c+1 -10 replies
12/17: FTP helper: search optimizationnet/ipv4/netfilter/ip_conntrack_ftp.c net/netfilter/nf_conntrack_ftp.c+86 -680 replies
13/17: amanda helper: convert to textsearch infrastructurenet/ipv4/netfilter/Kconfig net/ipv4/netfilter/ip_conntrack_amanda.c+96 -490 replies
14/17: H.323 helper: Add support for Call Forwardinginclude/linux/netfilter_ipv4/ip_conntrack.h include/linux/netfilter_ipv4/ip_conntrack_h323.h include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h +4 more+206 -80 replies
15/17: H.323 helper: replace internal_net_addr parameter by routing-based heuristicnet/ipv4/netfilter/ip_conntrack_helper_h323.c+27 -300 replies
16/17: Add SIP connection tracking helperinclude/linux/netfilter_ipv4/ip_conntrack_sip.h net/ipv4/netfilter/Kconfig net/ipv4/netfilter/Makefile +2 more+784 -00 replies
17/17: PPTP helper: fixup gre_keymap_lookup() return typenet/ipv4/netfilter/ip_conntrack_proto_gre.c+3 -30 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/17]: Netfilter update for 2.6.18

Hi Dave,

following is a large netfilter update for 2.6.18 with changes all over the place, most noteworthy is the replacement of the recent match, a new SIP connection tracking helper and two new matches.

Please apply to net-2.6.18, thanks.

 include/linux/netfilter/nf_conntrack_common.h                 |    4 
 include/linux/netfilter/nfnetlink_conntrack.h                 |    4 
 include/linux/netfilter/xt_quota.h                            |   16 
 include/linux/netfilter/xt_statistic.h                        |   32 
 include/linux/netfilter_ipv4/ip_conntrack.h                   |    2 
 include/linux/netfilter_ipv4/ip_conntrack_h323.h              |    7 
 include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h |    3 
 include/linux/netfilter_ipv4/ip_conntrack_sip.h               |   44 
 include/linux/sysctl.h                                        |    2 
 include/net/netfilter/nf_conntrack.h                          |    1 
 net/ipv4/netfilter/Kconfig                                    |   28 
 net/ipv4/netfilter/Makefile                                   |    2 
 net/ipv4/netfilter/ip_conntrack_amanda.c                      |  143 -
 net/ipv4/netfilter/ip_conntrack_core.c                        |    6 
 net/ipv4/netfilter/ip_conntrack_ftp.c                         |   77 
 net/ipv4/netfilter/ip_conntrack_helper_h323.c                 |  169 +
 net/ipv4/netfilter/ip_conntrack_helper_h323_types.c           |    6 
 net/ipv4/netfilter/ip_conntrack_netlink.c                     |   85 
 net/ipv4/netfilter/ip_conntrack_proto_gre.c                   |    6 
 net/ipv4/netfilter/ip_conntrack_proto_icmp.c                  |    2 
 net/ipv4/netfilter/ip_conntrack_proto_tcp.c                   |    2 
 net/ipv4/netfilter/ip_conntrack_proto_udp.c                   |    2 
 net/ipv4/netfilter/ip_conntrack_sip.c                         |  471 +++
 net/ipv4/netfilter/ip_conntrack_standalone.c                  |   13 
 net/ipv4/netfilter/ip_nat_helper_h323.c                       |   77 
 net/ipv4/netfilter/ip_nat_sip.c                               |  249 +
 net/ipv4/netfilter/ip_nat_snmp_basic.c                        |    2 
 net/ipv4/netfilter/ipt_CLUSTERIP.c                            |   20 
 net/ipv4/netfilter/ipt_hashlimit.c                            |   66 
 net/ipv4/netfilter/ipt_recent.c                               | 1268 ++--------
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c                |    2 
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c                  |    2 
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c                |    2 
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c                |    2 
 net/netfilter/Kconfig                                         |   16 
 net/netfilter/Makefile                                        |    2 
 net/netfilter/nf_conntrack_core.c                             |    6 
 net/netfilter/nf_conntrack_ftp.c                              |   77 
 net/netfilter/nf_conntrack_netlink.c                          |   85 
 net/netfilter/nf_conntrack_proto_tcp.c                        |    5 
 net/netfilter/nf_conntrack_proto_udp.c                        |    3 
 net/netfilter/nf_conntrack_standalone.c                       |   11 
 net/netfilter/xt_connmark.c                                   |    2 
 net/netfilter/xt_dccp.c                                       |    3 
 net/netfilter/xt_mark.c                                       |    2 
 net/netfilter/xt_multiport.c                                  |    7 
 net/netfilter/xt_quota.c                                      |   96 
 net/netfilter/xt_sctp.c                                       |    4 
 net/netfilter/xt_statistic.c                                  |  112 
 net/netfilter/xt_string.c                                     |    2 
 50 files changed, 2036 insertions(+), 1214 deletions(-)

Alexey Dobriyan:
[NETFILTER]: PPTP helper: fixup gre_keymap_lookup() return type

Eric Leblond:
[NETFILTER]: conntrack: add fixed timeout flag in connection tracking

Jing Min Zhao:
[NETFILTER]: H.323 helper: Add support for Call Forwarding

Patrick McHardy:
[NETFILTER]: x_tables: remove some unnecessary casts
[NETFILTER]: x_tables: add SCTP/DCCP support where missing
[NETFILTER]: x_tables: add quota match
[NETFILTER]: x_tables: add statistic match
[NETFILTER]: recent match: replace by rewritten version
[NETFILTER]: conntrack: don't call helpers for related ICMP messages [NETFILTER]: conntrack: add sysctl to disable checksumming
[NETFILTER]: ctnetlink: fix NAT configuration
[NETFILTER]: ctnetlink: change table dumping not to require an unique ID [NETFILTER]: SNMP helper: fix debug module param type
[NETFILTER]: FTP helper: search optimization
[NETFILTER]: amanda helper: convert to textsearch infrastructure [NETFILTER]: H.323 helper: replace internal_net_addr parameter by routing-based heuristic [NETFILTER]: Add SIP connection tracking helper