[netfilter-cvslog] r4446 - trunk/conntrack/src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-04 15:35:18 +0100 (Fri, 04 Nov 2005)
New Revision: 4446

Modified:
   trunk/conntrack/src/conntrack.c
Log:
add extra argument to nfct_register_callback() to accomodate change in libnetfilter_conntrack


Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-11-04 14:32:50 UTC (rev 4445)
+++ trunk/conntrack/src/conntrack.c	2005-11-04 14:35:18 UTC (rev 4446)
@@ -803,10 +803,12 @@
 
 		if (options & CT_OPT_ID)
 			nfct_register_callback(cth, 
-					nfct_default_conntrack_display_id);
+					nfct_default_conntrack_display_id,
+					NULL);
 		else
 			nfct_register_callback(cth,
-					nfct_default_conntrack_display);
+					nfct_default_conntrack_display,
+					NULL);
 			
 		if (options & CT_OPT_ZERO)
 			res = nfct_dump_conntrack_table_reset_counters(cth);
@@ -821,10 +823,12 @@
 			exit_error(OTHER_PROBLEM, "Can't open handler");
 		if (options & CT_OPT_ID)
 			nfct_register_callback(cth, 
-					nfct_default_expect_display_id);
+					nfct_default_expect_display_id,
+					NULL);
 		else
 			nfct_register_callback(cth,
-					nfct_default_expect_display);
+					nfct_default_expect_display,
+					NULL);
 		res = nfct_dump_expect_list(cth);
 		nfct_close(cth);
 		break;
@@ -939,7 +943,8 @@
 		cth = nfct_open(CONNTRACK, 0);
 		if (!cth)
 			exit_error(OTHER_PROBLEM, "Can't open handler");
-		nfct_register_callback(cth, nfct_default_conntrack_display);
+		nfct_register_callback(cth, nfct_default_conntrack_display,
+					NULL);
 		if (options & CT_OPT_ORIG)
 			res = nfct_get_conntrack(cth, &orig,
 						 NFCT_DIR_ORIGINAL, id);
@@ -953,7 +958,8 @@
 		cth = nfct_open(EXPECT, 0);
 		if (!cth)
 			exit_error(OTHER_PROBLEM, "Can't open handler");
-		nfct_register_callback(cth, nfct_default_expect_display);
+		nfct_register_callback(cth, nfct_default_expect_display,
+					NULL);
 		if (options & CT_OPT_ORIG)
 			res = nfct_get_expectation(cth, &orig, id);
 		else if (options & CT_OPT_REPL)
@@ -984,14 +990,16 @@
 				exit_error(OTHER_PROBLEM, "Can't open handler");
 			signal(SIGINT, event_sighandler);
 			nfct_register_callback(cth, 
-					nfct_default_conntrack_display);
+					nfct_default_conntrack_display, NULL);
 			res = nfct_event_conntrack(cth);
 		} else {
 			cth = nfct_open(CONNTRACK, NFCT_ALL_CT_GROUPS);
 			if (!cth)
 				exit_error(OTHER_PROBLEM, "Can't open handler");
 			signal(SIGINT, event_sighandler);
-			nfct_register_callback(cth, nfct_default_conntrack_display);
+			nfct_register_callback(cth,
+					       nfct_default_conntrack_display,
+					       NULL);
 			res = nfct_event_conntrack(cth);
 		}
 		nfct_close(cth);
@@ -1002,7 +1010,8 @@
 		if (!cth)
 			exit_error(OTHER_PROBLEM, "Can't open handler");
 		signal(SIGINT, event_sighandler);
-		nfct_register_callback(cth, nfct_default_expect_display);
+		nfct_register_callback(cth, nfct_default_expect_display,
+					NULL);
 		res = nfct_event_expectation(cth);
 		nfct_close(cth);
 		break;