[NETFILTER]: ctnetlink: Remove debugging messages

Remove (compilation-breaking) debugging messages introduced at early
development stage.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 69 deletions

diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 53b6dffea6c2..262d0d44ec1b 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -44,13 +44,6 @@ MODULE_LICENSE("GPL");
 
 static char __initdata version[] = "0.90";
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-
 static inline int
 ctnetlink_dump_tuples_proto(struct sk_buff *skb, 
                             const struct ip_conntrack_tuple *tuple,
@@ -398,7 +391,6 @@ nfattr_failure:
 
 static int ctnetlink_done(struct netlink_callback *cb)
 {
-        DEBUGP("entered %s\n", __FUNCTION__);
         if (cb->args[1])
                 ip_conntrack_put((struct ip_conntrack *)cb->args[1]);
         return 0;
@@ -411,9 +403,6 @@ ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
         struct ip_conntrack_tuple_hash *h;
         struct list_head *i;
 
-        DEBUGP("entered %s, last bucket=%lu id=%u\n", __FUNCTION__, 
-                        cb->args[0], *id);
-
         read_lock_bh(&ip_conntrack_lock);
         last = (struct ip_conntrack *)cb->args[1];
         for (; cb->args[0] < ip_conntrack_htable_size; cb->args[0]++) {
@@ -452,7 +441,6 @@ out:
         if (last)
                 ip_conntrack_put(last);
 
-        DEBUGP("leaving, last bucket=%lu id=%u\n", cb->args[0], *id);
         return skb->len;
 }
 
@@ -466,8 +454,6 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple)
 {
         struct nfattr *tb[CTA_IP_MAX];
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         nfattr_parse_nested(tb, CTA_IP_MAX, attr);
 
         if (nfattr_bad_size(tb, CTA_IP_MAX, cta_min_ip))
@@ -481,8 +467,6 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple)
                 return -EINVAL;
         tuple->dst.ip = *(__be32 *)NFA_DATA(tb[CTA_IP_V4_DST-1]);
 
-        DEBUGP("leaving\n");
-
         return 0;
 }
 
@@ -503,8 +487,6 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr,
         struct ip_conntrack_protocol *proto;
         int ret = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         nfattr_parse_nested(tb, CTA_PROTO_MAX, attr);
 
         if (nfattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto))
@@ -531,8 +513,6 @@ ctnetlink_parse_tuple(struct nfattr *cda[], struct ip_conntrack_tuple *tuple,
         struct nfattr *tb[CTA_TUPLE_MAX];
         int err;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         memset(tuple, 0, sizeof(*tuple));
 
         nfattr_parse_nested(tb, CTA_TUPLE_MAX, cda[type-1]);
@@ -557,10 +537,6 @@ ctnetlink_parse_tuple(struct nfattr *cda[], struct ip_conntrack_tuple *tuple,
         else
                 tuple->dst.dir = IP_CT_DIR_ORIGINAL;
 
-        DUMP_TUPLE(tuple);
-
-        DEBUGP("leaving\n");
-
         return 0;
 }
 
@@ -577,8 +553,6 @@ static int ctnetlink_parse_nat_proto(struct nfattr *attr,
         struct nfattr *tb[CTA_PROTONAT_MAX];
         struct ip_nat_protocol *npt;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         nfattr_parse_nested(tb, CTA_PROTONAT_MAX, attr);
 
         if (nfattr_bad_size(tb, CTA_PROTONAT_MAX, cta_min_protonat))
@@ -597,7 +571,6 @@ static int ctnetlink_parse_nat_proto(struct nfattr *attr,
 
         ip_nat_proto_put(npt);
 
-        DEBUGP("leaving\n");
         return 0;
 }
 
@@ -613,8 +586,6 @@ ctnetlink_parse_nat(struct nfattr *nat,
         struct nfattr *tb[CTA_NAT_MAX];
         int err;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         memset(range, 0, sizeof(*range));
         
         nfattr_parse_nested(tb, CTA_NAT_MAX, nat);
@@ -640,7 +611,6 @@ ctnetlink_parse_nat(struct nfattr *nat,
         if (err < 0)
                 return err;
 
-        DEBUGP("leaving\n");
         return 0;
 }
 #endif
@@ -650,8 +620,6 @@ ctnetlink_parse_help(struct nfattr *attr, char **helper_name)
 {
         struct nfattr *tb[CTA_HELP_MAX];
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         nfattr_parse_nested(tb, CTA_HELP_MAX, attr);
 
         if (!tb[CTA_HELP_NAME-1])
@@ -679,8 +647,6 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
         struct ip_conntrack *ct;
         int err = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         if (nfattr_bad_size(cda, CTA_MAX, cta_min))
                 return -EINVAL;
 
@@ -698,10 +664,8 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
                 return err;
 
         h = ip_conntrack_find_get(&tuple, NULL);
-        if (!h) {
-                DEBUGP("tuple not found in conntrack hash\n");
+        if (!h)
                 return -ENOENT;
-        }
 
         ct = tuplehash_to_ctrack(h);
         
@@ -716,7 +680,6 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
                 ct->timeout.function((unsigned long)ct);
 
         ip_conntrack_put(ct);
-        DEBUGP("leaving\n");
 
         return 0;
 }
@@ -731,8 +694,6 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
         struct sk_buff *skb2 = NULL;
         int err = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         if (nlh->nlmsg_flags & NLM_F_DUMP) {
                 struct nfgenmsg *msg = NLMSG_DATA(nlh);
                 u32 rlen;
@@ -770,11 +731,9 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
                 return err;
 
         h = ip_conntrack_find_get(&tuple, NULL);
-        if (!h) {
-                DEBUGP("tuple not found in conntrack hash");
+        if (!h)
                 return -ENOENT;
-        }
-        DEBUGP("tuple found\n");
+
         ct = tuplehash_to_ctrack(h);
 
         err = -ENOMEM;
@@ -795,7 +754,6 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
         if (err < 0)
                 goto out;
 
-        DEBUGP("leaving\n");
         return 0;
 
 free:
@@ -866,8 +824,6 @@ ctnetlink_change_helper(struct ip_conntrack *ct, struct nfattr *cda[])
         char *helpname;
         int err;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         /* don't change helper of sibling connections */
         if (ct->master)
                 return -EINVAL;
@@ -938,8 +894,6 @@ ctnetlink_change_conntrack(struct ip_conntrack *ct, struct nfattr *cda[])
 {
         int err;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         if (cda[CTA_HELP-1]) {
                 err = ctnetlink_change_helper(ct, cda);
                 if (err < 0)
@@ -969,7 +923,6 @@ ctnetlink_change_conntrack(struct ip_conntrack *ct, struct nfattr *cda[])
                 ct->mark = ntohl(*(__be32 *)NFA_DATA(cda[CTA_MARK-1]));
 #endif
 
-        DEBUGP("all done\n");
         return 0;
 }
 
@@ -981,8 +934,6 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
         struct ip_conntrack *ct;
         int err = -EINVAL;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         ct = ip_conntrack_alloc(otuple, rtuple);
         if (ct == NULL || IS_ERR(ct))
                 return -ENOMEM; 
@@ -1017,7 +968,6 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
         if (ct->helper)
                 ip_conntrack_helper_put(ct->helper);
 
-        DEBUGP("conntrack with id %u inserted\n", ct->id);
         return 0;
 
 err:    
@@ -1033,8 +983,6 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
         struct ip_conntrack_tuple_hash *h = NULL;
         int err = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         if (nfattr_bad_size(cda, CTA_MAX, cta_min))
                 return -EINVAL;
 
@@ -1058,7 +1006,6 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
 
         if (h == NULL) {
                 write_unlock_bh(&ip_conntrack_lock);
-                DEBUGP("no such conntrack, create new\n");
                 err = -ENOENT;
                 if (nlh->nlmsg_flags & NLM_F_CREATE)
                         err = ctnetlink_create_conntrack(cda, &otuple, &rtuple);
@@ -1074,7 +1021,6 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
 
         /* We manipulate the conntrack inside the global conntrack table lock,
          * so there's no need to increase the refcount */
-        DEBUGP("conntrack found\n");
         err = -EEXIST;
         if (!(nlh->nlmsg_flags & NLM_F_EXCL))
                 err = ctnetlink_change_conntrack(tuplehash_to_ctrack(h), cda);
@@ -1249,8 +1195,6 @@ ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
         struct list_head *i;
         u_int32_t *id = (u_int32_t *) &cb->args[0];
 
-        DEBUGP("entered %s, last id=%llu\n", __FUNCTION__, *id);
-
         read_lock_bh(&ip_conntrack_lock);
         list_for_each_prev(i, &ip_conntrack_expect_list) {
                 exp = (struct ip_conntrack_expect *) i;
@@ -1266,8 +1210,6 @@ ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
 out:    
         read_unlock_bh(&ip_conntrack_lock);
 
-        DEBUGP("leaving, last id=%llu\n", *id);
-
         return skb->len;
 }
 
@@ -1285,8 +1227,6 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
         struct sk_buff *skb2;
         int err = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp))
                 return -EINVAL;
 
@@ -1437,8 +1377,6 @@ ctnetlink_create_expect(struct nfattr *cda[])
         struct ip_conntrack *ct;
         int err = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);
-
         /* caller guarantees that those three CTA_EXPECT_* exist */
         err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_TUPLE);
         if (err < 0)
@@ -1490,8 +1428,6 @@ ctnetlink_new_expect(struct sock *ctnl, struct sk_buff *skb,
         struct ip_conntrack_expect *exp;
         int err = 0;
 
-        DEBUGP("entered %s\n", __FUNCTION__);   
-
         if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp))
                 return -EINVAL;
 
@@ -1520,8 +1456,6 @@ ctnetlink_new_expect(struct sock *ctnl, struct sk_buff *skb,
                 err = ctnetlink_change_expect(exp, cda);
         write_unlock_bh(&ip_conntrack_lock);
 
-        DEBUGP("leaving\n");
-        
         return err;
 }