netfilter: conntrack: remove l3proto abstraction
This unifies ipv4 and ipv6 protocol trackers and removes the l3proto abstraction. This gets rid of all l3proto indirect calls and the need to do a lookup on the function to call for l3 demux. It increases module size by only a small amount (12kbyte), so this reduces size because nf_conntrack.ko is useless without either nf_conntrack_ipv4 or nf_conntrack_ipv6 module. before: text data bss dec hex filename 7357 1088 0 8445 20fd nf_conntrack_ipv4.ko 7405 1084 4 8493 212d nf_conntrack_ipv6.ko 72614 13689 236 86539 1520b nf_conntrack.ko 19K nf_conntrack_ipv4.ko 19K nf_conntrack_ipv6.ko 179K nf_conntrack.ko after: text data bss dec hex filename 79277 13937 236 93450 16d0a nf_conntrack.ko 191K nf_conntrack.ko Signed-off-by:Florian Westphal <fw@strlen.de> Signed-off-by:
Pablo Neira Ayuso <pablo@netfilter.org>
Showing
- include/net/netfilter/ipv4/nf_conntrack_ipv4.h 0 additions, 3 deletionsinclude/net/netfilter/ipv4/nf_conntrack_ipv4.h
- include/net/netfilter/nf_conntrack.h 5 additions, 0 deletionsinclude/net/netfilter/nf_conntrack.h
- include/net/netfilter/nf_conntrack_core.h 0 additions, 1 deletioninclude/net/netfilter/nf_conntrack_core.h
- include/net/netfilter/nf_conntrack_l3proto.h 0 additions, 54 deletionsinclude/net/netfilter/nf_conntrack_l3proto.h
- include/net/netfilter/nf_conntrack_l4proto.h 0 additions, 4 deletionsinclude/net/netfilter/nf_conntrack_l4proto.h
- net/ipv4/netfilter/Kconfig 3 additions, 19 deletionsnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/Makefile 0 additions, 6 deletionsnet/ipv4/netfilter/Makefile
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 0 additions, 368 deletionsnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
- net/ipv6/netfilter/Kconfig 4 additions, 23 deletionsnet/ipv6/netfilter/Kconfig
- net/ipv6/netfilter/Makefile 0 additions, 6 deletionsnet/ipv6/netfilter/Makefile
- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c 0 additions, 355 deletionsnet/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
- net/netfilter/Kconfig 2 additions, 0 deletionsnet/netfilter/Kconfig
- net/netfilter/Makefile 6 additions, 1 deletionnet/netfilter/Makefile
- net/netfilter/nf_conntrack_core.c 4 additions, 7 deletionsnet/netfilter/nf_conntrack_core.c
- net/netfilter/nf_conntrack_proto.c 617 additions, 230 deletionsnet/netfilter/nf_conntrack_proto.c
- net/netfilter/nf_conntrack_proto_icmp.c 0 additions, 0 deletionsnet/netfilter/nf_conntrack_proto_icmp.c
- net/netfilter/nf_conntrack_proto_icmpv6.c 0 additions, 0 deletionsnet/netfilter/nf_conntrack_proto_icmpv6.c
- net/netfilter/nf_conntrack_standalone.c 4 additions, 10 deletionsnet/netfilter/nf_conntrack_standalone.c
- net/netfilter/nf_nat_core.c 0 additions, 8 deletionsnet/netfilter/nf_nat_core.c
Loading
Please register or sign in to comment