[netfilter-cvslog] r3857 - trunk/patch-o-matic-ng/connlimit/linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-12 15:07:02 +0200 (Tue, 12 Apr 2005)
New Revision: 3857

Modified:
   trunk/patch-o-matic-ng/connlimit/linux-2.6.11/net/ipv4/netfilter/ipt_connlimit.c
Log:
improve connlimit coding style (Henrik Nordstrom)


Modified: trunk/patch-o-matic-ng/connlimit/linux-2.6.11/net/ipv4/netfilter/ipt_connlimit.c
===================================================================
--- trunk/patch-o-matic-ng/connlimit/linux-2.6.11/net/ipv4/netfilter/ipt_connlimit.c	2005-04-12 13:03:29 UTC (rev 3856)
+++ trunk/patch-o-matic-ng/connlimit/linux-2.6.11/net/ipv4/netfilter/ipt_connlimit.c	2005-04-12 13:07:02 UTC (rev 3857)
@@ -67,12 +67,12 @@
 
 	/* check the saved connections */
 	for (lh = hash->next; lh != hash; lh = lh->next) {
-	     conn = list_entry(lh,struct ipt_connlimit_conn,list);
-	     found = ip_conntrack_find_get(&conn->tuple,ct);
-	        struct ip_conntrack *ct = NULL;
+		struct ip_conntrack *found_ct = NULL;
+		conn = list_entry(lh,struct ipt_connlimit_conn,list);
+		found = ip_conntrack_find_get(&conn->tuple,ct);
 		if (0 == memcmp(&conn->tuple,&tuple,sizeof(tuple)) &&
-		    found != NULL && (ct = tuplehash_to_ctrack(found)) &&
-		    ct->proto.tcp.state != TCP_CONNTRACK_TIME_WAIT) {
+		    found != NULL && (found_ct = tuplehash_to_ctrack(found)) != NULL &&
+		    found_ct->proto.tcp.state != TCP_CONNTRACK_TIME_WAIT) {
 			/* Just to be sure we have it only once in the list.
 			   We should'nt see tuples twice unless someone hooks this
 			   into a table without "-p tcp --syn" */
@@ -83,7 +83,7 @@
 		       ipt_iphash(addr & mask),
 		       NIPQUAD(conn->tuple.src.ip), ntohs(conn->tuple.src.u.tcp.port),
 		       NIPQUAD(conn->tuple.dst.ip), ntohs(conn->tuple.dst.u.tcp.port),
-		       (NULL != found) ? tcp[ct->proto.tcp.state] : "gone");
+		       (NULL != found) ? tcp[found_ct->proto.tcp.state] : "gone");
 #endif
 		if (NULL == found) {
 			/* this one is gone */
@@ -92,20 +92,20 @@
 			kfree(conn);
 			continue;
 		}
-		if (ct->proto.tcp.state == TCP_CONNTRACK_TIME_WAIT) {
+		if (found_ct->proto.tcp.state == TCP_CONNTRACK_TIME_WAIT) {
 			/* we don't care about connections which are
 			   closed already -> ditch it */
 			lh = lh->prev;
 			list_del(lh->next);
 			kfree(conn);
-			nf_conntrack_put(&ct->ct_general);
+			nf_conntrack_put(&found_ct->ct_general);
 			continue;
 		}
 		if ((addr & mask) == (conn->tuple.src.ip & mask)) {
 			/* same source IP address -> be counted! */
 			matches++;
 		}
-		nf_conntrack_put(&ct->ct_general);
+		nf_conntrack_put(&found_ct->ct_general);
 	}
 	if (addit) {
 		/* save the new connection in our list */