summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2005-09-23 19:40:46 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2005-09-23 19:40:46 +0000
commit81a2c7845797e2bf5882349cb1db96bd2e427600 (patch)
tree87775d113ce43d2d3ceccdae9fc0ebb3ce39e3bc
parent4f935079509e3b2058ef6b9fedc7e64278a08a5e (diff)
- make ctnl_test compile again (but it still needs to be ported)
- document new 3parameter open function
-rw-r--r--_conntrack/src/libnfnetlink_conntrack.c1
-rw-r--r--_conntrack/utils/ctnl_test.c9
2 files changed, 9 insertions, 1 deletions
diff --git a/_conntrack/src/libnfnetlink_conntrack.c b/_conntrack/src/libnfnetlink_conntrack.c
index e35ad3f..c5f68b8 100644
--- a/_conntrack/src/libnfnetlink_conntrack.c
+++ b/_conntrack/src/libnfnetlink_conntrack.c
@@ -90,6 +90,7 @@ static int list_conntrack_handler(struct sockaddr_nl *nladdr,
* ctnl_open - open a libctnetlink handle
*
* cth: pointer to already allocated library handle
+ * subsys_id: ID of the subsystem
* subscriptions: netlink groups we are interested in
*/
int ctnl_open(struct ctnl_handle *cth, u_int8_t subsys_id,
diff --git a/_conntrack/utils/ctnl_test.c b/_conntrack/utils/ctnl_test.c
index 20693d0..c4baa7b 100644
--- a/_conntrack/utils/ctnl_test.c
+++ b/_conntrack/utils/ctnl_test.c
@@ -16,6 +16,7 @@
static struct ctnl_handle *cth;
+#if 0
char *display_tuple_flat(struct ip_conntrack_tuple *tuple)
{
static char buff[250];
@@ -65,6 +66,12 @@ char *display_tuple_flat(struct ip_conntrack_tuple *tuple)
return (buff);
}
+#else
+char *display_tuple_flat(void *foo)
+{
+ return "not implemented";
+}
+#endif
int ctnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *cta, int len)
{
@@ -165,7 +172,7 @@ int main(int argc, char **argv)
int len;
cth = malloc(sizeof(*cth));
- if (ctnl_open(cth, 0) < 0) {
+ if (ctnl_open(cth, NFNL_SUBSYS_CTNETLINK, 0) < 0) {
exit(2);
}