netfilter: netns nf_conntrack: per-netns expectations

Browse source

Make per-netns a) expectation hash and b) expectations count.

Expectations always belongs to netns to which it's master conntrack belong.
This is natural and doesn't bloat expectation.

Proc files and leaf users are stubbed to init_net, this is temporary.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

...

This commit is contained in:

Alexey Dobriyan 2008-10-08 11:35:03 +02:00 • committed by Patrick McHardy

parent b21f890193

commit 9b03f38d04

11 changed files with 66 additions and 51 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

20

include/net/netfilter/nf_conntrack_expect.h

View file

3

include/net/netns/conntrack.h

View file

6

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

View file

2

net/ipv4/netfilter/nf_nat_pptp.c

View file

8

net/netfilter/nf_conntrack_core.c

View file

55

net/netfilter/nf_conntrack_expect.c

View file

2

net/netfilter/nf_conntrack_h323_main.c

View file

2

net/netfilter/nf_conntrack_helper.c

View file

13

net/netfilter/nf_conntrack_netlink.c

View file

4

net/netfilter/nf_conntrack_pptp.c

View file

2

net/netfilter/nf_conntrack_sip.c

View file