netfilter: conntrack: remove ctnetlink callbacks from l3 protocol trackers

Browse source

handle everything from ctnetlink directly.

After all these years we still only support ipv4 and ipv6, so it
seems reasonable to remove l3 protocol tracker support and instead
handle ipv4/ipv6 from a common, always builtin inet tracker.

Step 1: Get rid of all the l3proto->func() calls.

Start with ctnetlink, then move on to packet-path ones.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Florian Westphal 2018-06-29 07:46:44 +02:00 • committed by Pablo Neira Ayuso

parent 7414d929bc

commit f957be9d34

11 changed files with 79 additions and 149 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

include/net/netfilter/nf_conntrack_core.h

View file

8

include/net/netfilter/nf_conntrack_l3proto.h

View file

47

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

View file

48

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

View file

1

net/ipv6/netfilter/nf_defrag_ipv6_hooks.c

View file

1

net/netfilter/nf_conntrack_expect.c

View file

1

net/netfilter/nf_conntrack_helper.c

View file

96

net/netfilter/nf_conntrack_netlink.c

View file

5

net/netfilter/nf_conntrack_proto.c

View file

14

net/netfilter/nf_conntrack_standalone.c

View file

1

net/netfilter/nfnetlink_cttimeout.c

View file