[netfilter-cvslog] r4286 - in trunk/libnfnetlink_conntrack: src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-23 21:40:46 +0200 (Fri, 23 Sep 2005)
New Revision: 4286

Modified:
   trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c
   trunk/libnfnetlink_conntrack/utils/ctnl_test.c
Log:
- make ctnl_test compile again (but it still needs to be ported)
- document new 3parameter open function


Modified: trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c
===================================================================
--- trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c	2005-09-23 19:19:03 UTC (rev 4285)
+++ trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c	2005-09-23 19:40:46 UTC (rev 4286)
@@ -90,6 +90,7 @@
  * 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, 

Modified: trunk/libnfnetlink_conntrack/utils/ctnl_test.c
===================================================================
--- trunk/libnfnetlink_conntrack/utils/ctnl_test.c	2005-09-23 19:19:03 UTC (rev 4285)
+++ trunk/libnfnetlink_conntrack/utils/ctnl_test.c	2005-09-23 19:40:46 UTC (rev 4286)
@@ -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 @@
 
         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 len;
 
 	cth = malloc(sizeof(*cth));
-	if (ctnl_open(cth, 0) < 0) {
+	if (ctnl_open(cth, NFNL_SUBSYS_CTNETLINK, 0) < 0) {
 		exit(2);
 	}