summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-12-02 22:05:25 -0800
committerDavid S. Miller <davem@davemloft.net>2006-12-02 22:05:25 -0800
commit9457d851fc5df54522d733f72cbb1f02ab59272e (patch)
tree42a460d65cbb45b100c43f97ba8a7490df844bb8 /include/net
parentbff9a89bcac5b68ac0a1ea856b1726a35ae1eabb (diff)
downloadkernel-crypto-9457d851fc5df54522d733f72cbb1f02ab59272e.tar.gz
kernel-crypto-9457d851fc5df54522d733f72cbb1f02ab59272e.tar.xz
kernel-crypto-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 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_expect.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 2d335f024c8..5d853e826d1 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -22,6 +22,9 @@ struct nf_conntrack_expect
void (*expectfn)(struct nf_conn *new,
struct nf_conntrack_expect *this);
+ /* Helper to assign to new connection */
+ struct nf_conntrack_helper *helper;
+
/* The conntrack of the master connection */
struct nf_conn *master;