[netfilter-cvslog] r6857 - trunk/libnetfilter_conntrack/src/conntrack

pablo at netfilter.org pablo at netfilter.org
Mon Jun 4 15:57:36 CEST 2007


Author: pablo at netfilter.org
Date: 2007-06-04 15:57:36 +0200 (Mon, 04 Jun 2007)
New Revision: 6857

Modified:
   trunk/libnetfilter_conntrack/src/conntrack/objopt.c
Log:
fix silly bug in nfct_getobjopt(..., NFCT_GOPT_IS_*NAT), always return 1 if status flags are set


Modified: trunk/libnetfilter_conntrack/src/conntrack/objopt.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/objopt.c	2007-06-04 11:38:34 UTC (rev 6856)
+++ trunk/libnetfilter_conntrack/src/conntrack/objopt.c	2007-06-04 13:57:36 UTC (rev 6857)
@@ -46,26 +46,26 @@
 
 	switch(option) {
 	case NFCT_GOPT_IS_SNAT:
-		ret = (test_bit(ATTR_STATUS, ct->set) ? 
-		       ct->status & IPS_SRC_NAT_DONE : 1 &&
+		ret = ((test_bit(ATTR_STATUS, ct->set) ? 
+		        ct->status & IPS_SRC_NAT_DONE : 1) &&
 		       ct->tuple[__DIR_REPL].dst.v4 != 
 		       ct->tuple[__DIR_ORIG].src.v4);
 		break;
 	case NFCT_GOPT_IS_DNAT:
-		ret = (test_bit(ATTR_STATUS, ct->set) ? 
-		       ct->status & IPS_DST_NAT_DONE : 1 &&
+		ret = ((test_bit(ATTR_STATUS, ct->set) ? 
+		        ct->status & IPS_DST_NAT_DONE : 1) &&
 		       ct->tuple[__DIR_REPL].src.v4 !=
 		       ct->tuple[__DIR_ORIG].dst.v4);
 		break;
 	case NFCT_GOPT_IS_SPAT:
-		ret = (test_bit(ATTR_STATUS, ct->set) ? 
-		       ct->status & IPS_SRC_NAT_DONE : 1 &&
+		ret = ((test_bit(ATTR_STATUS, ct->set) ? 
+		        ct->status & IPS_SRC_NAT_DONE : 1) &&
 		       ct->tuple[__DIR_REPL].l4dst.tcp.port !=
 		       ct->tuple[__DIR_ORIG].l4src.tcp.port);
 		break;
 	case NFCT_GOPT_IS_DPAT:
-		ret = (test_bit(ATTR_STATUS, ct->set) ? 
-		       ct->status & IPS_DST_NAT_DONE : 1 &&
+		ret = ((test_bit(ATTR_STATUS, ct->set) ? 
+		        ct->status & IPS_DST_NAT_DONE : 1) &&
 		       ct->tuple[__DIR_REPL].l4src.tcp.port !=
 		       ct->tuple[__DIR_ORIG].l4dst.tcp.port);
 		break;




More information about the netfilter-cvslog mailing list