update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / net / ipv4 / netfilter / ip_nat_helper.c

diff --git a/net/ipv4/netfilter/ip_nat_helper.c b/net/ipv4/netfilter/ip_nat_helper.c
index a49c722..2e8d021 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_helper.c
+++ b/net/ipv4/netfilter/ip_nat_helper.c
@@ -47,6 +47,7 @@
 #define DUMP_OFFSET(x)
 #endif
 
+static LIST_HEAD(helpers);
 DECLARE_LOCK(ip_nat_seqofs_lock);
 
 /* Setup TCP sequence correction given this change at this sequence */
@@ -419,6 +420,18 @@ int ip_nat_helper_register(struct ip_nat_helper *me)
        return ret;
 }
 
+struct ip_nat_helper *
+ip_nat_find_helper(const struct ip_conntrack_tuple *tuple)
+{
+       struct ip_nat_helper *h;
+
+       READ_LOCK(&ip_nat_lock);
+       h = LIST_FIND(&helpers, helper_cmp, struct ip_nat_helper *, tuple);
+       READ_UNLOCK(&ip_nat_lock);
+
+       return h;
+}
+
 static int
 kill_helper(const struct ip_conntrack *i, void *helper)
 {