diff options
author | /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> | 2005-10-16 21:46:30 +0000 |
---|---|---|
committer | /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> | 2005-10-16 21:46:30 +0000 |
commit | bc7c1f1a4a6a5e003f66df2bab082fa521e9bb5e (patch) | |
tree | a063aa8451d6dd1db54b52c67d9bf4c2f632c99d /extensions | |
parent | da9b980f8d34c436b31d5a0a09b4ea27849c9c82 (diff) | |
download | conntrack-tools-bc7c1f1a4a6a5e003f66df2bab082fa521e9bb5e.tar.gz conntrack-tools-bc7c1f1a4a6a5e003f66df2bab082fa521e9bb5e.zip |
See ChangeLog
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/libct_proto_icmp.c | 2 | ||||
-rw-r--r-- | extensions/libct_proto_sctp.c | 31 | ||||
-rw-r--r-- | extensions/libct_proto_tcp.c | 2 | ||||
-rw-r--r-- | extensions/libct_proto_udp.c | 2 |
4 files changed, 4 insertions, 33 deletions
diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c index 7142fa7..d7d9d5a 100644 --- a/extensions/libct_proto_icmp.c +++ b/extensions/libct_proto_icmp.c @@ -14,7 +14,7 @@ #include <netinet/in.h> /* For htons */ #include <netinet/ip_icmp.h> #include <libnetfilter_conntrack/libnetfilter_conntrack.h> -#include "libct_proto.h" +#include "conntrack.h" static struct option opts[] = { {"icmp-type", 1, 0, '1'}, diff --git a/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c index bc91966..5e96dc1 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 "libct_proto.h" +#include "conntrack.h" #include <libnetfilter_conntrack/libnetfilter_conntrack.h> static struct option opts[] = { @@ -136,35 +136,6 @@ int final_check(unsigned int flags, return 0; } -void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple) -{ - if (cda[CTA_PROTO_SRC_PORT-1]) - tuple->l4src.sctp.port = - *(u_int16_t *)NFA_DATA(cda[CTA_PROTO_SRC_PORT-1]); - if (cda[CTA_PROTO_DST_PORT-1]) - tuple->l4dst.sctp.port = - *(u_int16_t *)NFA_DATA(cda[CTA_PROTO_DST_PORT-1]); -} - -void parse_protoinfo(struct nfattr *cda[], struct nfct_conntrack *ct) -{ -/* if (cda[CTA_PROTOINFO_SCTP_STATE-1]) - ct->protoinfo.sctp.state = - *(u_int8_t *)NFA_DATA(cda[CTA_PROTOINFO_SCTP_STATE-1]); -*/ -} - -void print_protoinfo(union nfct_protoinfo *protoinfo) -{ -/* fprintf(stdout, "%s ", states[protoinfo->sctp.state]); */ -} - -void print_proto(struct nfct_tuple *tuple) -{ - fprintf(stdout, "sport=%u dport=%u ", htons(tuple->l4src.sctp.port), - htons(tuple->l4dst.sctp.port)); -} - static struct ctproto_handler sctp = { .name = "sctp", .protonum = IPPROTO_SCTP, diff --git a/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c index 3b06aa2..97646ab 100644 --- a/extensions/libct_proto_tcp.c +++ b/extensions/libct_proto_tcp.c @@ -14,7 +14,7 @@ #include <netinet/in.h> /* For htons */ #include <libnetfilter_conntrack/libnetfilter_conntrack.h> -#include "libct_proto.h" +#include "conntrack.h" static struct option opts[] = { {"orig-port-src", 1, 0, '1'}, diff --git a/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c index 8e77f0c..0da7bb5 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 "libct_proto.h" +#include "conntrack.h" #include <libnetfilter_conntrack/libnetfilter_conntrack.h> static struct option opts[] = { |