Skip to content

: nf_conntrack: proc/sysctl compatibility

Patrick McHardy netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5: nf_conntrack: move extern declaration to header filesinclude/net/netfilter/ipv4/nf_conntrack_ipv4.h include/net/netfilter/ipv6/nf_conntrack_ipv6.h include/net/netfilter/nf_conntrack.h +6 more+34 -330 replies
2/5: nf_conntrack: automatic sysctl registation for conntrack protocolsinclude/linux/netfilter.h include/net/netfilter/nf_conntrack_l3proto.h include/net/netfilter/nf_conntrack_l4proto.h +4 more+254 -43 replies
3/5: nf_conntrack: move conntrack protocol sysctls to individual modulesnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c net/ipv4/netfilter/nf_conntrack_proto_icmp.c net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +8 more+293 -3272 replies
4/5: nf_conntrack: sysctl compatibility with old connection trackinginclude/net/netfilter/nf_conntrack_l4proto.h net/ipv4/netfilter/Kconfig net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +7 more+342 -10 replies
5/5: nf_conntrack: /proc compatibility with old connection trackinginclude/net/netfilter/ipv4/nf_conntrack_ipv4.h net/ipv4/netfilter/Makefile net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +3 more+434 -10 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/05]: nf_conntrack: proc/sysctl compatibility

These patches are a new attempt at proc and sysctl compatibility. The first three patches clean up the old sysctls a bit (move all protocol specific sysctls to the individual source files and perform automatic registration), the third and fourth patch introduce the actual compatibilty.

 include/linux/netfilter.h                             |    8 
 include/net/netfilter/ipv4/nf_conntrack_ipv4.h        |    7 
 include/net/netfilter/ipv6/nf_conntrack_ipv6.h        |   25 +
 include/net/netfilter/nf_conntrack.h                  |    5 
 include/net/netfilter/nf_conntrack_l3proto.h          |    6 
 include/net/netfilter/nf_conntrack_l4proto.h          |   12 
 net/ipv4/netfilter/Kconfig                            |   11 
 net/ipv4/netfilter/Makefile                           |    5 
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c        |  130 +++--
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c |  412 ++++++++++++++++++
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c          |   43 +
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c        |   73 ---
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c        |   26 -
 net/netfilter/Makefile                                |    1 
 net/netfilter/nf_conntrack_core.c                     |   10 
 net/netfilter/nf_conntrack_expect.c                   |    1 
 net/netfilter/nf_conntrack_l3proto_generic.c          |    3 
 net/netfilter/nf_conntrack_proto.c                    |  133 +++++
 net/netfilter/nf_conntrack_proto_generic.c            |   43 +
 net/netfilter/nf_conntrack_proto_sctp.c               |  170 ++++---
 net/netfilter/nf_conntrack_proto_tcp.c                |  249 ++++++++++
 net/netfilter/nf_conntrack_proto_udp.c                |   68 ++
 net/netfilter/nf_conntrack_standalone.c               |  150 ------
 net/netfilter/nf_sysctl.c                             |  132 +++++
 25 files changed, 1358 insertions(+), 366 deletions(-)

Patrick McHardy:
[NETFILTER]: nf_conntrack: move extern declaration to header files [NETFILTER]: nf_conntrack: automatic sysctl registation for conntrack protocols [NETFILTER]: nf_conntrack: move conntrack protocol sysctls to individual modules [NETFILTER]: nf_conntrack: sysctl compatibility with old connection tracking [NETFILTER]: nf_conntrack: /proc compatibility with old connection tracking