summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-04-13 21:59:46 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-04-13 21:59:46 +0000
commitebb9a1aa3813d71b99d7508c88b9cbf525e15b4a (patch)
tree9df4a1f35b09de313094bf3d61bd1feab2109211 /extensions
parent3ce7643c221878785ed0390cdc65e69054887f08 (diff)
downloadconntrack-tools-ebb9a1aa3813d71b99d7508c88b9cbf525e15b4a.tar.gz
conntrack-tools-ebb9a1aa3813d71b99d7508c88b9cbf525e15b4a.zip
fix conntrack -U -p tcp [...]
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libct_proto_icmp.c9
-rw-r--r--extensions/libct_proto_icmpv6.c9
-rw-r--r--extensions/libct_proto_tcp.c20
-rw-r--r--extensions/libct_proto_udp.c20
4 files changed, 58 insertions, 0 deletions
diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c
index f81c3b4..62ad00f 100644
--- a/extensions/libct_proto_icmp.c
+++ b/extensions/libct_proto_icmp.c
@@ -74,6 +74,9 @@ static int parse(char c,
nfct_set_attr_u8(ct,
ATTR_ICMP_TYPE,
atoi(optarg));
+
+ nfct_set_attr_u8(ct, ATTR_L4PROTO, IPPROTO_ICMP);
+
*flags |= ICMP_TYPE;
break;
case '2':
@@ -83,6 +86,9 @@ static int parse(char c,
nfct_set_attr_u8(ct,
ATTR_ICMP_CODE,
atoi(optarg));
+
+ nfct_set_attr_u8(ct, ATTR_L4PROTO, IPPROTO_ICMP);
+
*flags |= ICMP_CODE;
break;
case '3':
@@ -92,6 +98,9 @@ static int parse(char c,
nfct_set_attr_u16(ct,
ATTR_ICMP_ID,
htons(atoi(optarg)));
+
+ nfct_set_attr_u8(ct, ATTR_L4PROTO, IPPROTO_ICMP);
+
*flags |= ICMP_ID;
break;
}
diff --git a/extensions/libct_proto_icmpv6.c b/extensions/libct_proto_icmpv6.c
index 6c1c358..5346b59 100644
--- a/extensions/libct_proto_icmpv6.c
+++ b/extensions/libct_proto_icmpv6.c
@@ -77,6 +77,9 @@ static int parse(char c,
nfct_set_attr_u8(ct,
ATTR_ICMP_TYPE,
atoi(optarg));
+
+ nfct_set_attr_u8(ct, ATTR_L4PROTO, IPPROTO_ICMPV6);
+
*flags |= ICMP_TYPE;
break;
@@ -87,6 +90,9 @@ static int parse(char c,
nfct_set_attr_u8(ct,
ATTR_ICMP_CODE,
atoi(optarg));
+
+ nfct_set_attr_u8(ct, ATTR_L4PROTO, IPPROTO_ICMPV6);
+
*flags |= ICMP_CODE;
break;
@@ -97,6 +103,9 @@ static int parse(char c,
nfct_set_attr_u16(ct,
ATTR_ICMP_ID,
htons(atoi(optarg)));
+
+ nfct_set_attr_u8(ct, ATTR_L4PROTO, IPPROTO_ICMPV6);
+
*flags |= ICMP_ID;
break;
}
diff --git a/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c
index dc48d09..0246758 100644
--- a/extensions/libct_proto_tcp.c
+++ b/extensions/libct_proto_tcp.c
@@ -103,6 +103,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_TCP);
+
*flags |= TCP_ORIG_SPORT;
break;
case '2':
@@ -113,6 +115,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_TCP);
+
*flags |= TCP_ORIG_DPORT;
break;
case '3':
@@ -123,6 +127,8 @@ static int parse_options(char c,
ATTR_REPL_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_TCP);
+
*flags |= TCP_REPL_SPORT;
break;
case '4':
@@ -133,6 +139,8 @@ static int parse_options(char c,
ATTR_REPL_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_TCP);
+
*flags |= TCP_REPL_DPORT;
break;
case '5':
@@ -143,6 +151,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(mask, ATTR_ORIG_L4PROTO, IPPROTO_TCP);
+
*flags |= TCP_MASK_SPORT;
break;
case '6':
@@ -153,6 +163,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(mask, ATTR_ORIG_L4PROTO, IPPROTO_TCP);
+
*flags |= TCP_MASK_DPORT;
break;
case '7':
@@ -180,6 +192,10 @@ static int parse_options(char c,
ATTR_ORIG_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(exptuple,
+ ATTR_ORIG_L4PROTO,
+ IPPROTO_TCP);
+
*flags |= TCP_EXPTUPLE_SPORT;
break;
case '9':
@@ -190,6 +206,10 @@ static int parse_options(char c,
ATTR_ORIG_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(exptuple,
+ ATTR_ORIG_L4PROTO,
+ IPPROTO_TCP);
+
*flags |= TCP_EXPTUPLE_DPORT;
break;
}
diff --git a/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c
index d74def5..f9793d0 100644
--- a/extensions/libct_proto_udp.c
+++ b/extensions/libct_proto_udp.c
@@ -85,6 +85,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_UDP);
+
*flags |= UDP_ORIG_SPORT;
break;
case '2':
@@ -95,6 +97,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_UDP);
+
*flags |= UDP_ORIG_DPORT;
break;
case '3':
@@ -105,6 +109,8 @@ static int parse_options(char c,
ATTR_REPL_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_UDP);
+
*flags |= UDP_REPL_SPORT;
break;
case '4':
@@ -115,6 +121,8 @@ static int parse_options(char c,
ATTR_REPL_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_UDP);
+
*flags |= UDP_REPL_DPORT;
break;
case '5':
@@ -125,6 +133,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(mask, ATTR_ORIG_L4PROTO, IPPROTO_UDP);
+
*flags |= UDP_MASK_SPORT;
break;
case '6':
@@ -135,6 +145,8 @@ static int parse_options(char c,
ATTR_ORIG_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(mask, ATTR_ORIG_L4PROTO, IPPROTO_UDP);
+
*flags |= UDP_MASK_DPORT;
break;
case '7':
@@ -145,6 +157,10 @@ static int parse_options(char c,
ATTR_ORIG_PORT_SRC,
htons(atoi(optarg)));
+ nfct_set_attr_u8(exptuple,
+ ATTR_ORIG_L4PROTO,
+ IPPROTO_UDP);
+
*flags |= UDP_EXPTUPLE_SPORT;
break;
case '8':
@@ -155,6 +171,10 @@ static int parse_options(char c,
ATTR_ORIG_PORT_DST,
htons(atoi(optarg)));
+ nfct_set_attr_u8(exptuple,
+ ATTR_ORIG_L4PROTO,
+ IPPROTO_UDP);
+
*flags |= UDP_EXPTUPLE_DPORT;
break;
}