From 25b2d74cebc9680dde4028f2f50aec396b29559e 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" Date: Sat, 3 Dec 2005 22:50:27 +0000 Subject: o Fixed bugs in UDP and SCTP protocol handlers (parse_proto) o Added the comparison infrastructure for layer-4 protocols o Added libnetfilter_conntrack_[tcp|udp|icmp|sctp].h that contains the protocol flags used by the comparison infrastructure o Added nfct_conntrack_compare to compare two conntracks based on flags o Killed nfct_event_netlink_handler o nfct_event_[conntrack|expect] requires ROOT privileges (reason: netlink multicast) o Bumped version to 0.29 --- extensions/libnetfilter_conntrack_tcp.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'extensions/libnetfilter_conntrack_tcp.c') diff --git a/extensions/libnetfilter_conntrack_tcp.c b/extensions/libnetfilter_conntrack_tcp.c index 95503ec..dc50315 100644 --- a/extensions/libnetfilter_conntrack_tcp.c +++ b/extensions/libnetfilter_conntrack_tcp.c @@ -15,6 +15,7 @@ #include #include #include +#include static const char *states[] = { "NONE", @@ -93,6 +94,35 @@ static int print_proto(char *buf, struct nfct_tuple *tuple) htons(tuple->l4dst.tcp.port))); } +static int compare(struct nfct_conntrack *ct1, + struct nfct_conntrack *ct2, + unsigned int flags) +{ + int ret = 1; + + if (flags & TCP_ORIG_SPORT) + if (ct1->tuple[NFCT_DIR_ORIGINAL].l4src.tcp.port != + ct2->tuple[NFCT_DIR_ORIGINAL].l4src.tcp.port) + ret = 0; + if (flags & TCP_ORIG_DPORT) + if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.tcp.port != + ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.tcp.port) + ret = 0; + if (flags & TCP_REPL_SPORT) + if (ct1->tuple[NFCT_DIR_REPLY].l4src.tcp.port != + ct2->tuple[NFCT_DIR_REPLY].l4src.tcp.port) + ret = 0; + if (flags & TCP_REPL_DPORT) + if (ct1->tuple[NFCT_DIR_REPLY].l4dst.tcp.port != + ct2->tuple[NFCT_DIR_REPLY].l4dst.tcp.port) + ret = 0; + if (flags & TCP_STATE) + if (ct1->protoinfo.tcp.state != ct2->protoinfo.tcp.state) + ret = 0; + + return ret; +} + static struct nfct_proto tcp = { .name = "tcp", .protonum = IPPROTO_TCP, @@ -102,6 +132,7 @@ static struct nfct_proto tcp = { .build_protoinfo = build_protoinfo, .print_protoinfo = print_protoinfo, .print_proto = print_proto, + .compare = compare, .version = VERSION }; -- cgit v1.2.3