vserver 1.9.5.x5

[linux-2.6.git] / net / ipv4 / netfilter / ipt_helper.c

diff --git a/net/ipv4/netfilter/ipt_helper.c b/net/ipv4/netfilter/ipt_helper.c
index bed83c7..33fdf36 100644 (file)
--- a/net/ipv4/netfilter/ipt_helper.c
+++ b/net/ipv4/netfilter/ipt_helper.c
@@ -38,41 +38,36 @@ match(const struct sk_buff *skb,
       int *hotdrop)
 {
        const struct ipt_helper_info *info = matchinfo;
-       struct ip_conntrack_expect *exp;
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
-       int ret = 0;
+       int ret = info->invert;
        
        ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo);
        if (!ct) {
                DEBUGP("ipt_helper: Eek! invalid conntrack?\n");
-               return 0;
+               return ret;
        }
 
        if (!ct->master) {
                DEBUGP("ipt_helper: conntrack %p has no master\n", ct);
-               return 0;
+               return ret;
        }
 
-       exp = ct->master;
        READ_LOCK(&ip_conntrack_lock);
-       if (!exp->expectant) {
-               DEBUGP("ipt_helper: expectation %p without expectant !?!\n", 
-                       exp);
-               goto out_unlock;
-       }
-
-       if (!exp->expectant->helper) {
+       if (!ct->master->helper) {
                DEBUGP("ipt_helper: master ct %p has no helper\n", 
                        exp->expectant);
                goto out_unlock;
        }
 
        DEBUGP("master's name = %s , info->name = %s\n", 
-               exp->expectant->helper->name, info->name);
+               ct->master->helper->name, info->name);
 
-       ret = !strncmp(exp->expectant->helper->name, info->name, 
-                      strlen(exp->expectant->helper->name)) ^ info->invert;
+       if (info->name[0] == '\0')
+               ret ^= 1;
+       else
+               ret ^= !strncmp(ct->master->helper->name, info->name, 
+                               strlen(ct->master->helper->name));
 out_unlock:
        READ_UNLOCK(&ip_conntrack_lock);
        return ret;
@@ -92,10 +87,6 @@ static int check(const char *tablename,
        if (matchsize != IPT_ALIGN(sizeof(struct ipt_helper_info)))
                return 0;
 
-       /* verify that we actually should match anything */
-       if ( strlen(info->name) == 0 )
-               return 0;
-       
        return 1;
 }