Skip to content

: Netfilter Update

Patrick McHardy netfilter-devel 1 version Applied

Status from this message: Applied, thanks.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest12 patches 16 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/12: Add helper functions for mass hook registration/unregistrationinclude/linux/netfilter.h net/netfilter/core.c+30 -03 replies
2/12: Clean up hook registrationnet/ipv4/netfilter/arptable_filter.c net/ipv4/netfilter/ip_conntrack_standalone.c net/ipv4/netfilter/ip_nat_standalone.c +8 more+253 -5791 reply
3/12: Fix section mismatch warningsnet/ipv4/netfilter/ip_conntrack_standalone.c net/ipv4/netfilter/ip_nat_standalone.c net/ipv4/netfilter/ip_queue.c +7 more+204 -2492 replies
4/12: H.323 helper: move some function prototypes to ip_conntrack_h323.hinclude/linux/netfilter_ipv4/ip_conntrack_h323.h include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h +5 more+1089 -10921 reply
5/12: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPLnet/ipv4/netfilter/ip_conntrack_helper_h323.c+11 -121 reply
6/12: H.323 helper: make get_h245_addr() staticnet/ipv4/netfilter/ip_conntrack_helper_h323.c+2 -21 reply
7/12: H.323 helper: add parameter 'default_rrq_ttl'net/ipv4/netfilter/ip_conntrack_helper_h323.c+5 -11 reply
8/12: H.323 helper: update Changelognet/ipv4/netfilter/ip_conntrack_helper_h323.c net/ipv4/netfilter/ip_nat_helper_h323.c+20 -02 replies
9/12: Fix IP_NF_CONNTRACK_NETLINK dependencynet/ipv4/netfilter/Kconfig+1 -01 reply
10/12: Introduce infrastructure for address family specific operationsinclude/linux/netfilter.h net/ipv4/netfilter.c net/ipv6/netfilter.c +2 more+70 -591 reply
11/12: Add address family specific checksum helpersinclude/linux/netfilter.h include/linux/netfilter_ipv4.h include/linux/netfilter_ipv6.h +2 more+89 -01 reply
12/12: Convert conntrack/ipt_REJECT to new checksumming functionsnet/ipv4/netfilter/ip_conntrack_proto_icmp.c net/ipv4/netfilter/ip_conntrack_proto_tcp.c net/ipv4/netfilter/ip_conntrack_proto_udp.c +5 more+25 -1531 reply

Reviews trailers per patch

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

Read the v1 thread

Cover letter [NETFILTER 00/12]: Netfilter Update

Hi Dave,

following are a couple of netfilter fixes and enhancements: a couple of patches to fix the section mismatch warnings and clean up the netfilter hook registration, checksumming consolidation with better HW checksum error handling and some cleanup patches for the H.323 helper. The diffstat is a bit misleading, there is a lot of noise from the renaming of two large H.323 header files and a lot of reindentation of netfilter structures, its not as bad as it looks :) If you think its too large for -rc1 I can hold on to the checksumming patches, the others should go in as they actually fix stuff. Thanks.

 include/linux/netfilter.h                                     |   42 
 include/linux/netfilter_ipv4.h                                |    2 
 include/linux/netfilter_ipv4/ip_conntrack_h323.h              |   52 
 include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h  |   98 +
 include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h |  938 ++++++++++
 include/linux/netfilter_ipv6.h                                |    3 
 net/ipv4/netfilter.c                                          |   50 
 net/ipv4/netfilter/Kconfig                                    |    1 
 net/ipv4/netfilter/arptable_filter.c                          |   19 
 net/ipv4/netfilter/ip_conntrack_helper_h323.c                 |   50 
 net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c            |    2 
 net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.h            |   98 -
 net/ipv4/netfilter/ip_conntrack_helper_h323_types.h           |  938 ----------
 net/ipv4/netfilter/ip_conntrack_proto_icmp.c                  |   23 
 net/ipv4/netfilter/ip_conntrack_proto_tcp.c                   |    7 
 net/ipv4/netfilter/ip_conntrack_proto_udp.c                   |    7 
 net/ipv4/netfilter/ip_conntrack_standalone.c                  |  270 +-
 net/ipv4/netfilter/ip_nat_helper_h323.c                       |   58 
 net/ipv4/netfilter/ip_nat_standalone.c                        |  161 -
 net/ipv4/netfilter/ip_queue.c                                 |   31 
 net/ipv4/netfilter/ipt_CLUSTERIP.c                            |   40 
 net/ipv4/netfilter/ipt_REJECT.c                               |    9 
 net/ipv4/netfilter/iptable_filter.c                           |   21 
 net/ipv4/netfilter/iptable_mangle.c                           |   33 
 net/ipv4/netfilter/iptable_raw.c                              |   35 
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c                |  227 --
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c                  |   20 
 net/ipv6/netfilter.c                                          |   51 
 net/ipv6/netfilter/ip6_queue.c                                |   31 
 net/ipv6/netfilter/ip6table_filter.c                          |   21 
 net/ipv6/netfilter/ip6table_mangle.c                          |   33 
 net/ipv6/netfilter/ip6table_raw.c                             |   15 
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c                |  181 -
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c                |   12 
 net/netfilter/core.c                                          |   51 
 net/netfilter/nf_conntrack_proto_tcp.c                        |   50 
 net/netfilter/nf_conntrack_proto_udp.c                        |   50 
 net/netfilter/nf_conntrack_standalone.c                       |  115 -
 net/netfilter/nf_queue.c                                      |   49 
 net/netfilter/nfnetlink_log.c                                 |   25 
 net/netfilter/nfnetlink_queue.c                               |   27 
 41 files changed, 1799 insertions(+), 2147 deletions(-)

Jing Min Zhao:
[NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL [NETFILTER]: H.323 helper: make get_h245_addr() static [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl' [NETFILTER]: H.323 helper: update Changelog

Patrick McHardy:
[NETFILTER]: Add helper functions for mass hook registration/unregistration [NETFILTER]: Clean up hook registration
[NETFILTER]: Fix section mismatch warnings
[NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency [NETFILTER]: Introduce infrastructure for address family specific operations [NETFILTER]: Add address family specific checksum helpers [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions