[netfilter-cvslog] r6334 - in trunk/libnetfilter_conntrack: include/libnetfilter_conntrack src

pablo at netfilter.org pablo at netfilter.org
Mon Dec 19 21:46:37 CET 2005


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

Modified:
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
Add support for per-family table flushing. ie. flush just AF_INET entries. Towards ipv6 support.



Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2005-12-19 20:31:12 UTC (rev 6333)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2005-12-19 20:46:36 UTC (rev 6334)
@@ -303,7 +303,7 @@
  * Expectations
  */
 extern int nfct_dump_expect_list(struct nfct_handle *cth, int family);
-extern int nfct_flush_conntrack_table(struct nfct_handle *cth);
+extern int nfct_flush_conntrack_table(struct nfct_handle *cth, int family);
 extern int nfct_get_expectation(struct nfct_handle *cth, 
 				struct nfct_tuple *tuple,
 				u_int32_t id);
@@ -311,7 +311,7 @@
 extern int nfct_delete_expectation(struct nfct_handle *cth,
 				   struct nfct_tuple *tuple, u_int32_t id);
 extern int nfct_event_expectation(struct nfct_handle *cth);
-extern int nfct_flush_expectation_table(struct nfct_handle *cth);
+extern int nfct_flush_expectation_table(struct nfct_handle *cth, int family);
 
 /*
  * expectation printing functions

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-12-19 20:31:12 UTC (rev 6333)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-12-19 20:46:36 UTC (rev 6334)
@@ -1007,14 +1007,14 @@
 	return nfnl_listen(&cth->nfnlh, &callback_handler, cth);
 }
 
-int nfct_flush_conntrack_table(struct nfct_handle *cth)
+int nfct_flush_conntrack_table(struct nfct_handle *cth, int family)
 {
 	struct nfnlhdr req;
 
 	memset(&req, 0, sizeof(req));
 
 	nfnl_fill_hdr(&cth->nfnlh, (struct nlmsghdr *) &req,
-			0, AF_INET, 0, IPCTNL_MSG_CT_DELETE,
+			0, family, 0, IPCTNL_MSG_CT_DELETE,
 			NLM_F_REQUEST|NLM_F_ACK);
 
 	return nfnl_talk(&cth->nfnlh, &req.nlh, 0, 0, NULL, NULL, NULL);
@@ -1139,14 +1139,14 @@
 	return nfnl_listen(&cth->nfnlh, &callback_handler, cth);
 }
 
-int nfct_flush_expectation_table(struct nfct_handle *cth)
+int nfct_flush_expectation_table(struct nfct_handle *cth, int family)
 {
 	struct nfnlhdr req;
 
 	memset(&req, 0, sizeof(req));
 	
 	nfnl_fill_hdr(&cth->nfnlh, (struct nlmsghdr *) &req,
-		      0, AF_INET, 0, IPCTNL_MSG_EXP_DELETE,
+		      0, family, 0, IPCTNL_MSG_EXP_DELETE,
 		      NLM_F_REQUEST|NLM_F_ACK);
 
 	return nfnl_talk(&cth->nfnlh, &req.nlh, 0, 0, NULL, NULL, NULL);




More information about the netfilter-cvslog mailing list