diff options
author | Patrick McHardy <kaber@trash.net> | 2006-12-02 22:05:25 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-12-02 22:05:25 -0800 |
commit | 9457d851fc5df54522d733f72cbb1f02ab59272e (patch) | |
tree | 42a460d65cbb45b100c43f97ba8a7490df844bb8 /net/netfilter/nf_conntrack_ftp.c | |
parent | bff9a89bcac5b68ac0a1ea856b1726a35ae1eabb (diff) | |
download | linux-stable-9457d851fc5df54522d733f72cbb1f02ab59272e.tar.gz linux-stable-9457d851fc5df54522d733f72cbb1f02ab59272e.tar.bz2 linux-stable-9457d851fc5df54522d733f72cbb1f02ab59272e.zip |
[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>
Diffstat (limited to 'net/netfilter/nf_conntrack_ftp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_ftp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index fdac52beeb8c..e96c41d17ee3 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -516,6 +516,7 @@ static int help(struct sk_buff **pskb, } exp->expectfn = NULL; + exp->helper = NULL; exp->flags = 0; /* Now, NAT might want to mangle the packet, and register the |