[netfilter-cvslog] r4382 - in trunk/conntrack: . src

pablo at netfilter.org pablo at netfilter.org
Mon Oct 24 00:15:32 CEST 2005


Author: pablo at netfilter.org
Date: 2005-10-24 00:15:29 +0200 (Mon, 24 Oct 2005)
New Revision: 4382

Modified:
   trunk/conntrack/ChangeLog
   trunk/conntrack/src/conntrack.c
Log:
See ChangeLog



Modified: trunk/conntrack/ChangeLog
===================================================================
--- trunk/conntrack/ChangeLog	2005-10-23 22:14:05 UTC (rev 4381)
+++ trunk/conntrack/ChangeLog	2005-10-23 22:15:29 UTC (rev 4382)
@@ -1,3 +1,7 @@
+2005-10-24
+<pablo at eurodev.net>
+	o use NFCT_ANY_GROUP flag in nfct_open()
+
 2005-10-21
 <pablo at eurodev.net>
 	o Bumped version to 0.90

Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-10-23 22:14:05 UTC (rev 4381)
+++ trunk/conntrack/src/conntrack.c	2005-10-23 22:15:29 UTC (rev 4382)
@@ -911,7 +911,7 @@
 		retry--;
 		switch(command) {
 		case CT_LIST:
-			cth = nfct_open(CONNTRACK, 0);
+			cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			nfct_set_callback(cth, nfct_default_conntrack_display);
@@ -923,7 +923,7 @@
 			nfct_close(cth);
 
 		case EXP_LIST:
-			cth = nfct_open(EXPECT, 0);
+			cth = nfct_open(EXPECT, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			nfct_set_callback(cth, nfct_default_expect_display);
@@ -954,7 +954,7 @@
 			if (!ct)
 				exit_error(OTHER_PROBLEM, "Not Enough memory");
 			
-			cth = nfct_open(CONNTRACK, 0);
+			cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 			if (!cth) {
 				nfct_conntrack_free(ct);
 				exit_error(OTHER_PROBLEM, "Not enough memory");
@@ -974,7 +974,7 @@
 			if (!exp)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 
-			cth = nfct_open(EXPECT, 0);
+			cth = nfct_open(EXPECT, NFCT_ANY_GROUP);
 			if (!cth) {
 				nfct_expect_free(exp);
 				exit_error(OTHER_PROBLEM, "Not enough memory");
@@ -1000,7 +1000,7 @@
 			if (!ct)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			
-			cth = nfct_open(CONNTRACK, 0);
+			cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 			if (!cth) {
 				nfct_conntrack_free(ct);
 				exit_error(OTHER_PROBLEM, "Not enough memory");
@@ -1011,7 +1011,7 @@
 			break;
 			
 		case CT_DELETE:
-			cth = nfct_open(CONNTRACK, 0);
+			cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			if (options & CT_OPT_ORIG)
@@ -1026,7 +1026,7 @@
 			break;
 
 		case EXP_DELETE:
-			cth = nfct_open(EXPECT, 0);
+			cth = nfct_open(EXPECT, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			if (options & CT_OPT_ORIG)
@@ -1037,7 +1037,7 @@
 			break;
 
 		case CT_GET:
-			cth = nfct_open(CONNTRACK, 0);
+			cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			nfct_set_callback(cth, nfct_default_conntrack_display);
@@ -1051,7 +1051,7 @@
 			break;
 
 		case EXP_GET:
-			cth = nfct_open(EXPECT, 0);
+			cth = nfct_open(EXPECT, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			nfct_set_callback(cth, nfct_default_expect_display);
@@ -1063,7 +1063,7 @@
 			break;
 
 		case CT_FLUSH:
-			cth = nfct_open(CONNTRACK, 0);
+			cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			res = nfct_flush_conntrack_table(cth);
@@ -1071,7 +1071,7 @@
 			break;
 
 		case EXP_FLUSH:
-			cth = nfct_open(EXPECT, 0);
+			cth = nfct_open(EXPECT, NFCT_ANY_GROUP);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Not enough memory");
 			res = nfct_flush_expectation_table(cth);
@@ -1088,7 +1088,7 @@
 				nfct_set_callback(cth, nfct_default_conntrack_display);
 				res = nfct_event_conntrack(cth);
 			} else {
-				cth = nfct_open(CONNTRACK, ~0U);
+				cth = nfct_open(CONNTRACK, NFCT_ANY_GROUP);
 				if (!cth)
 					exit_error(OTHER_PROBLEM, 
 						   "Not enough memory");
@@ -1109,7 +1109,7 @@
 				nfct_set_callback(cth, nfct_default_expect_display);
 				res = nfct_event_expectation(cth);
 			} else {
-				cth = nfct_open(EXPECT, ~0U);
+				cth = nfct_open(EXPECT, NFCT_ANY_GROUP);
 				if (!cth)
 					exit_error(OTHER_PROBLEM, 
 						   "Not enough memory");




More information about the netfilter-cvslog mailing list