From cf96e5c1a423cce66d21cbf43e6a1f5e496bab30 Mon Sep 17 00:00:00 2001
From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter
 Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org"
 </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>
Date: Tue, 2 Aug 2005 13:21:25 +0000
Subject: More re-sync to work fine with current ip_conntrack_netlink
 implementation available in Harald's 2.6.14 tree.

---
 extensions/libct_proto_sctp.c | 2 +-
 extensions/libct_proto_tcp.c  | 4 ++--
 extensions/libct_proto_udp.c  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'extensions')

diff --git a/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c
index d5ff298..b519ff1 100644
--- a/extensions/libct_proto_sctp.c
+++ b/extensions/libct_proto_sctp.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h> /* For htons */
-#include <linux/netfilter_ipv4/ip_conntrack_netlink.h>
+#include <linux/netfilter/nfnetlink_conntrack.h>
 #include "libct_proto.h"
 #include "libctnetlink.h"
 
diff --git a/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c
index 973c5ab..65f0fb6 100644
--- a/extensions/libct_proto_tcp.c
+++ b/extensions/libct_proto_tcp.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h> /* For htons */
-#include <linux/netfilter_ipv4/ip_conntrack_netlink.h>
+#include <linux/netfilter/nfnetlink_conntrack.h>
 #include "libct_proto.h"
 #include "libctnetlink.h"
 
@@ -114,7 +114,7 @@ int parse_options(char c, char *argv[],
 			break;
 		case '6':
 			if (optarg) {
-				mask->l4src.tcp.port = htons(atoi(optarg));
+				mask->l4dst.tcp.port = htons(atoi(optarg));
 				*flags |= MASK_DPORT;
 			}
 			break;
diff --git a/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c
index 7821d5b..706f113 100644
--- a/extensions/libct_proto_udp.c
+++ b/extensions/libct_proto_udp.c
@@ -11,7 +11,7 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <netinet/in.h> /* For htons */
-#include <linux/netfilter_ipv4/ip_conntrack_netlink.h>
+#include <linux/netfilter/nfnetlink_conntrack.h>
 #include "libct_proto.h"
 #include "libctnetlink.h"
 
@@ -95,7 +95,7 @@ int parse_options(char c, char *argv[],
 			break;
 		case '6':
 			if (optarg) {
-				mask->l4src.udp.port = htons(atoi(optarg));
+				mask->l4dst.udp.port = htons(atoi(optarg));
 				*flags |= MASK_DPORT;
 			}
 			break;
-- 
cgit v1.2.3