]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
[NETFILTER]: nf_conntrack: automatic helper assignment for expectations
authorPatrick McHardy <kaber@trash.net>
Sun, 3 Dec 2006 06:05:25 +0000 (22:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 3 Dec 2006 06:05:25 +0000 (22:05 -0800)
commit9457d851fc5df54522d733f72cbb1f02ab59272e
tree42a460d65cbb45b100c43f97ba8a7490df844bb8
parentbff9a89bcac5b68ac0a1ea856b1726a35ae1eabb
[NETFILTER]: nf_conntrack: automatic helper assignment for expectations

Some helpers (namely H.323) manually assign further helpers to expected
connections. This is not possible with nf_conntrack anymore since we
need to know whether a helper is used at allocation time.

Handle the helper assignment centrally, which allows to perform the
correct allocation and as a nice side effect eliminates the need
for the H.323 helper to fiddle with nf_conntrack_lock.

Mid term the allocation scheme really needs to be redesigned since
we do both the helper and expectation lookup _twice_ for every new
connection.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netfilter/nf_conntrack_expect.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_ftp.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_netlink.c