[netfilter-cvslog] r4200 - in trunk/libnfnetlink_conntrack: . include/libnfnetlink_conntrack src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-30 23:14:47 +0200 (Sat, 30 Jul 2005)
New Revision: 4200

Added:
   trunk/libnfnetlink_conntrack/autogen.sh
Modified:
   trunk/libnfnetlink_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h
   trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c
   trunk/libnfnetlink_conntrack/utils/ctnl_test.c
Log:
fix up include path names


Added: trunk/libnfnetlink_conntrack/autogen.sh
===================================================================
--- trunk/libnfnetlink_conntrack/autogen.sh	2005-07-30 21:10:38 UTC (rev 4199)
+++ trunk/libnfnetlink_conntrack/autogen.sh	2005-07-30 21:14:47 UTC (rev 4200)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+run ()
+{
+    echo "running: $*"
+    eval $*
+
+    if test $? != 0 ; then
+	echo "error: while running '$*'"
+	exit 1
+    fi
+}
+
+run aclocal
+#run autoheader
+run automake -a
+run autoconf


Property changes on: trunk/libnfnetlink_conntrack/autogen.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/libnfnetlink_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h
===================================================================
--- trunk/libnfnetlink_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h	2005-07-30 21:10:38 UTC (rev 4199)
+++ trunk/libnfnetlink_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h	2005-07-30 21:14:47 UTC (rev 4200)
@@ -16,8 +16,9 @@
 #include <linux/if.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_conntrack.h> 
-#include "libnfnetlink.h"
 
+#include <libnfnetlink/libnfnetlink.h>
+
 #define CTNL_BUFFSIZE	4096
 
 union ctnl_l4 {

Modified: trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c
===================================================================
--- trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c	2005-07-30 21:10:38 UTC (rev 4199)
+++ trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c	2005-07-30 21:14:47 UTC (rev 4200)
@@ -24,8 +24,10 @@
 #include <linux/if.h>
 #include <linux/netlink.h>
 #include <linux/netfilter/nfnetlink_conntrack.h>
-#include "libctnetlink.h"
 
+#include <libnfnetlink/libnfnetlink.h>
+#include <libnfnetlink_conntrack/libnfnetlink_conntrack.h>
+
 #define ctnl_error printf
 
 /***********************************************************************

Modified: trunk/libnfnetlink_conntrack/utils/ctnl_test.c
===================================================================
--- trunk/libnfnetlink_conntrack/utils/ctnl_test.c	2005-07-30 21:10:38 UTC (rev 4199)
+++ trunk/libnfnetlink_conntrack/utils/ctnl_test.c	2005-07-30 21:14:47 UTC (rev 4200)
@@ -112,14 +112,14 @@
 
 	ctnl_parse_attr(cb, CTA_MAX, NFM_NFA(cm), len);
 
-	if (cb[CTA_ORIG]) {
+	if (cb[CTA_TUPLE_ORIG]) {
 		printf("orig: %s\n", 
-				display_tuple_flat(NFA_DATA(cb[CTA_ORIG])));
-		ctnl_del_conntrack(cth, NFA_DATA(cb[CTA_ORIG]), CTA_ORIG);
+				display_tuple_flat(NFA_DATA(cb[CTA_TUPLE_ORIG])));
+		ctnl_del_conntrack(cth, NFA_DATA(cb[CTA_TUPLE_ORIG]), CTA_TUPLE_ORIG);
 	}
-	if (cb[CTA_RPLY])
+	if (cb[CTA_TUPLE_REPLY])
 		printf("rply: %s\n", 
-				display_tuple_flat(NFA_DATA(cb[CTA_RPLY])));
+				display_tuple_flat(NFA_DATA(cb[CTA_TUPLE_REPLY])));
 
 
 	return 0;