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

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2005-12-19 21:31:12 +0100 (Mon, 19 Dec 2005)
New Revision: 6333

Modified:
   trunk/conntrack/ChangeLog
   trunk/conntrack/src/conntrack.c
Log:
More changes to prepare upcoming ipv4 support



Modified: trunk/conntrack/ChangeLog
===================================================================
--- trunk/conntrack/ChangeLog	2005-12-19 20:29:58 UTC (rev 6332)
+++ trunk/conntrack/ChangeLog	2005-12-19 20:31:12 UTC (rev 6333)
@@ -1,6 +1,7 @@
 2005-12-19
 <pablo at netfilter.org>
 	o We only support ipv4 at the moment: set l3protonum to AF_INET
+	o Minor changes to prepare upcoming ipv6 support
 
 2005-12-03
 <pablo at netfilter.org>

Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-12-19 20:29:58 UTC (rev 6332)
+++ trunk/conntrack/src/conntrack.c	2005-12-19 20:31:12 UTC (rev 6333)
@@ -849,9 +849,9 @@
 					NULL);
 			
 		if (options & CT_OPT_ZERO)
-			res = nfct_dump_conntrack_table_reset_counters(cth);
+			res = nfct_dump_conntrack_table_reset_counters(cth, AF_INET);
 		else
-			res = nfct_dump_conntrack_table(cth);
+			res = nfct_dump_conntrack_table(cth, AF_INET);
 		nfct_close(cth);
 		break;
 
@@ -867,7 +867,7 @@
 			nfct_register_callback(cth,
 					nfct_default_expect_display,
 					NULL);
-		res = nfct_dump_expect_list(cth);
+		res = nfct_dump_expect_list(cth, AF_INET);
 		nfct_close(cth);
 		break;
 			
@@ -1009,7 +1009,7 @@
 		cth = nfct_open(CONNTRACK, 0);
 		if (!cth)
 			exit_error(OTHER_PROBLEM, "Can't open handler");
-		res = nfct_flush_conntrack_table(cth);
+		res = nfct_flush_conntrack_table(cth, AF_INET);
 		nfct_close(cth);
 		break;
 
@@ -1017,7 +1017,7 @@
 		cth = nfct_open(EXPECT, 0);
 		if (!cth)
 			exit_error(OTHER_PROBLEM, "Can't open handler");
-		res = nfct_flush_expectation_table(cth);
+		res = nfct_flush_expectation_table(cth, AF_INET);
 		nfct_close(cth);
 		break;