linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 01bd7ca..d4e6d0a 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -4,7 +4,7 @@
  * (C) 2001 by Jay Schulist <jschlst@samba.org>
  * (C) 2002-2005 by Harald Welte <laforge@gnumonks.org>
  * (C) 2003 by Patrick Mchardy <kaber@trash.net>
- * (C) 2005-2006 by Pablo Neira Ayuso <pablo@eurodev.net>
+ * (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net>
  *
  * I've reworked this stuff to use attributes instead of conntrack 
  * structures. 5.44 am. I need more tea. --pablo 05/07/11.
@@ -53,18 +53,20 @@ static char __initdata version[] = "0.90";
 
 static inline int
 ctnetlink_dump_tuples_proto(struct sk_buff *skb, 
-                           const struct ip_conntrack_tuple *tuple,
-                           struct ip_conntrack_protocol *proto)
+                           const struct ip_conntrack_tuple *tuple)
 {
+       struct ip_conntrack_protocol *proto;
        int ret = 0;
-       struct nfattr *nest_parms = NFA_NEST(skb, CTA_TUPLE_PROTO);
 
        NFA_PUT(skb, CTA_PROTO_NUM, sizeof(u_int8_t), &tuple->dst.protonum);
 
+       /* If no protocol helper is found, this function will return the
+        * generic protocol helper, so proto won't *ever* be NULL */
+       proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
        if (likely(proto->tuple_to_nfattr))
                ret = proto->tuple_to_nfattr(skb, tuple);
        
-       NFA_NEST_END(skb, nest_parms);
+       ip_conntrack_proto_put(proto);
 
        return ret;
 
@@ -73,40 +75,27 @@ nfattr_failure:
 }
 
 static inline int
-ctnetlink_dump_tuples_ip(struct sk_buff *skb,
-                        const struct ip_conntrack_tuple *tuple)
+ctnetlink_dump_tuples(struct sk_buff *skb, 
+                     const struct ip_conntrack_tuple *tuple)
 {
-       struct nfattr *nest_parms = NFA_NEST(skb, CTA_TUPLE_IP);
+       struct nfattr *nest_parms;
+       int ret;
        
+       nest_parms = NFA_NEST(skb, CTA_TUPLE_IP);
        NFA_PUT(skb, CTA_IP_V4_SRC, sizeof(u_int32_t), &tuple->src.ip);
        NFA_PUT(skb, CTA_IP_V4_DST, sizeof(u_int32_t), &tuple->dst.ip);
+       NFA_NEST_END(skb, nest_parms);
 
+       nest_parms = NFA_NEST(skb, CTA_TUPLE_PROTO);
+       ret = ctnetlink_dump_tuples_proto(skb, tuple);
        NFA_NEST_END(skb, nest_parms);
 
-       return 0;
+       return ret;
 
 nfattr_failure:
        return -1;
 }
 
-static inline int
-ctnetlink_dump_tuples(struct sk_buff *skb,
-                     const struct ip_conntrack_tuple *tuple)
-{
-       int ret;
-       struct ip_conntrack_protocol *proto;
-
-       ret = ctnetlink_dump_tuples_ip(skb, tuple);
-       if (unlikely(ret < 0))
-               return ret;
-
-       proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
-       ret = ctnetlink_dump_tuples_proto(skb, tuple, proto);
-       ip_conntrack_proto_put(proto);
-
-       return ret;
-}
-
 static inline int
 ctnetlink_dump_status(struct sk_buff *skb, const struct ip_conntrack *ct)
 {
@@ -338,10 +327,9 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
                group = NFNLGRP_CONNTRACK_UPDATE;
        } else 
                return NOTIFY_DONE;
-
-       if (!nfnetlink_has_listeners(group))
-               return NOTIFY_DONE;
-
+       
+  /* FIXME: Check if there are any listeners before, don't hurt performance */
+       
        skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC);
        if (!skb)
                return NOTIFY_DONE;
@@ -1145,33 +1133,6 @@ nfattr_failure:
        return -1;
 }                      
 
-static inline int
-ctnetlink_exp_dump_mask(struct sk_buff *skb,
-                       const struct ip_conntrack_tuple *tuple,
-                       const struct ip_conntrack_tuple *mask)
-{
-       int ret;
-       struct ip_conntrack_protocol *proto;
-       struct nfattr *nest_parms = NFA_NEST(skb, CTA_EXPECT_MASK);
-
-       ret = ctnetlink_dump_tuples_ip(skb, mask);
-       if (unlikely(ret < 0))
-               goto nfattr_failure;
-
-       proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
-       ret = ctnetlink_dump_tuples_proto(skb, mask, proto);
-       ip_conntrack_proto_put(proto);
-       if (unlikely(ret < 0))
-               goto nfattr_failure;
-
-       NFA_NEST_END(skb, nest_parms);
-
-       return 0;
-
-nfattr_failure:
-       return -1;
-}
-
 static inline int
 ctnetlink_exp_dump_expect(struct sk_buff *skb,
                           const struct ip_conntrack_expect *exp)
@@ -1182,7 +1143,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb,
 
        if (ctnetlink_exp_dump_tuple(skb, &exp->tuple, CTA_EXPECT_TUPLE) < 0)
                goto nfattr_failure;
-       if (ctnetlink_exp_dump_mask(skb, &exp->tuple, &exp->mask) < 0)
+       if (ctnetlink_exp_dump_tuple(skb, &exp->mask, CTA_EXPECT_MASK) < 0)
                goto nfattr_failure;
        if (ctnetlink_exp_dump_tuple(skb,
                                 &master->tuplehash[IP_CT_DIR_ORIGINAL].tuple,