From 36c57d73475c39d4f84ab12fb3e6f769ebd8305c Mon Sep 17 00:00:00 2001
From: "/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>
Date: Sat, 30 Jul 2005 21:14:47 +0000
Subject: fix up include path names

---
 _conntrack/autogen.sh                                   | 17 +++++++++++++++++
 .../libnfnetlink_conntrack/libnfnetlink_conntrack.h     |  3 ++-
 _conntrack/src/libnfnetlink_conntrack.c                 |  4 +++-
 _conntrack/utils/ctnl_test.c                            | 10 +++++-----
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100755 _conntrack/autogen.sh

(limited to '_conntrack')

diff --git a/_conntrack/autogen.sh b/_conntrack/autogen.sh
new file mode 100755
index 0000000..f6cdc76
--- /dev/null
+++ b/_conntrack/autogen.sh
@@ -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
diff --git a/_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h b/_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h
index 7f66510..f5dfa8c 100644
--- a/_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h
+++ b/_conntrack/include/libnfnetlink_conntrack/libnfnetlink_conntrack.h
@@ -16,7 +16,8 @@
 #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
 
diff --git a/_conntrack/src/libnfnetlink_conntrack.c b/_conntrack/src/libnfnetlink_conntrack.c
index 1039e25..08f8a08 100644
--- a/_conntrack/src/libnfnetlink_conntrack.c
+++ b/_conntrack/src/libnfnetlink_conntrack.c
@@ -24,7 +24,9 @@
 #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
 
diff --git a/_conntrack/utils/ctnl_test.c b/_conntrack/utils/ctnl_test.c
index bd3173f..47c6a8d 100644
--- a/_conntrack/utils/ctnl_test.c
+++ b/_conntrack/utils/ctnl_test.c
@@ -112,14 +112,14 @@ int print_msg(struct nfgenmsg *cm, size_t len)
 
 	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;
-- 
cgit v1.2.3