[netfilter-cvslog] r6332 - in trunk/libnetfilter_conntrack:
include/libnetfilter_conntrack src utils
pablo at netfilter.org
pablo at netfilter.org
Mon Dec 19 21:29:59 CET 2005
Author: pablo at netfilter.org
Date: 2005-12-19 21:29:58 +0100 (Mon, 19 Dec 2005)
New Revision: 6332
Modified:
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
trunk/libnetfilter_conntrack/utils/ctnl_test.c
Log:
Slightly API changes required for the upcoming ipv6 support
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2005-12-19 17:53:58 UTC (rev 6331)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2005-12-19 20:29:58 UTC (rev 6332)
@@ -263,8 +263,9 @@
/*
* Conntrack table dumping & zeroing
*/
-extern int nfct_dump_conntrack_table(struct nfct_handle *cth);
-extern int nfct_dump_conntrack_table_reset_counters(struct nfct_handle *cth);
+extern int nfct_dump_conntrack_table(struct nfct_handle *cth, int family);
+extern int nfct_dump_conntrack_table_reset_counters(struct nfct_handle *cth,
+ int family);
/*
* Conntrack event notification
@@ -301,7 +302,7 @@
/*
* Expectations
*/
-extern int nfct_dump_expect_list(struct nfct_handle *cth);
+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_get_expectation(struct nfct_handle *cth,
struct nfct_tuple *tuple,
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h 2005-12-19 17:53:58 UTC (rev 6331)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h 2005-12-19 20:29:58 UTC (rev 6332)
@@ -64,6 +64,9 @@
CTA_PROTO_ICMP_ID,
CTA_PROTO_ICMP_TYPE,
CTA_PROTO_ICMP_CODE,
+ CTA_PROTO_ICMPV6_ID,
+ CTA_PROTO_ICMPV6_TYPE,
+ CTA_PROTO_ICMPV6_CODE,
__CTA_PROTO_MAX
};
#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1)
Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c 2005-12-19 17:53:58 UTC (rev 6331)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c 2005-12-19 20:29:58 UTC (rev 6332)
@@ -932,7 +932,8 @@
return nfnl_listen(&cth->nfnlh, &callback_handler, cth);
}
-static int __nfct_dump_conntrack_table(struct nfct_handle *cth, int zero)
+static int __nfct_dump_conntrack_table(struct nfct_handle *cth, int zero,
+ int family)
{
int err, msg;
struct nfnlhdr req;
@@ -945,7 +946,7 @@
else
msg = IPCTNL_MSG_CT_GET;
- nfnl_fill_hdr(&cth->nfnlh, &req.nlh, 0, AF_INET, 0,
+ nfnl_fill_hdr(&cth->nfnlh, &req.nlh, 0, family, 0,
msg, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_DUMP);
err = nfnl_send(&cth->nfnlh, &req.nlh);
@@ -955,14 +956,15 @@
return nfnl_listen(&cth->nfnlh, &callback_handler, cth);
}
-int nfct_dump_conntrack_table(struct nfct_handle *cth)
+int nfct_dump_conntrack_table(struct nfct_handle *cth, int family)
{
- return(__nfct_dump_conntrack_table(cth, 0));
+ return(__nfct_dump_conntrack_table(cth, 0, family));
}
-int nfct_dump_conntrack_table_reset_counters(struct nfct_handle *cth)
+int nfct_dump_conntrack_table_reset_counters(struct nfct_handle *cth,
+ int family)
{
- return(__nfct_dump_conntrack_table(cth, 1));
+ return(__nfct_dump_conntrack_table(cth, 1, family));
}
int nfct_event_conntrack(struct nfct_handle *cth)
@@ -987,7 +989,7 @@
list_add(&h->head, &proto_list);
}
-int nfct_dump_expect_list(struct nfct_handle *cth)
+int nfct_dump_expect_list(struct nfct_handle *cth, int family)
{
int err;
struct nfnlhdr req;
@@ -995,7 +997,7 @@
memset(&req, 0, sizeof(req));
cth->handler = nfct_expect_netlink_handler;
- nfnl_fill_hdr(&cth->nfnlh, &req.nlh, 0, AF_INET, 0,
+ nfnl_fill_hdr(&cth->nfnlh, &req.nlh, 0, family, 0,
IPCTNL_MSG_EXP_GET, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
err = nfnl_send(&cth->nfnlh, &req.nlh);
Modified: trunk/libnetfilter_conntrack/utils/ctnl_test.c
===================================================================
--- trunk/libnetfilter_conntrack/utils/ctnl_test.c 2005-12-19 17:53:58 UTC (rev 6331)
+++ trunk/libnetfilter_conntrack/utils/ctnl_test.c 2005-12-19 20:29:58 UTC (rev 6332)
@@ -96,12 +96,12 @@
"you have NET_CAPABILITIES");
nfct_register_callback(cth, nfct_default_conntrack_display, NULL);
- ret = nfct_dump_conntrack_table_reset_counters(cth);
+ ret = nfct_dump_conntrack_table_reset_counters(cth, AF_INET);
fprintf(stdout, "TEST 2: dump conntrack table and reset (%d)\n", ret);
if (ret < 0)
errors++;
- ret = nfct_dump_conntrack_table(cth);
+ ret = nfct_dump_conntrack_table(cth, AF_INET);
fprintf(stdout, "TEST 3: dump conntrack table (%d)\n", ret);
if (ret < 0)
errors++;
More information about the netfilter-cvslog
mailing list