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_udp.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'extensions/libnetfilter_conntrack_udp.c') diff --git a/extensions/libnetfilter_conntrack_udp.c b/extensions/libnetfilter_conntrack_udp.c index 21c599a..bd33280 100644 --- a/extensions/libnetfilter_conntrack_udp.c +++ b/extensions/libnetfilter_conntrack_udp.c @@ -15,6 +15,7 @@ #include #include #include +#include static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple) { @@ -36,9 +37,35 @@ static void build_tuple_proto(struct nfnlhdr *req, int size, struct nfct_tuple *t) { nfnl_addattr_l(&req->nlh, size, CTA_PROTO_SRC_PORT, - &t->l4src.tcp.port, sizeof(u_int16_t)); + &t->l4src.udp.port, sizeof(u_int16_t)); nfnl_addattr_l(&req->nlh, size, CTA_PROTO_DST_PORT, - &t->l4dst.tcp.port, sizeof(u_int16_t)); + &t->l4dst.udp.port, sizeof(u_int16_t)); +} + +static int compare(struct nfct_conntrack *ct1, + struct nfct_conntrack *ct2, + unsigned int flags) +{ + int ret = 1; + + if (flags & UDP_ORIG_SPORT) + if (ct1->tuple[NFCT_DIR_ORIGINAL].l4src.udp.port != + ct2->tuple[NFCT_DIR_ORIGINAL].l4src.udp.port) + ret = 0; + if (flags & UDP_ORIG_DPORT) + if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.udp.port != + ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.udp.port) + ret = 0; + if (flags & UDP_REPL_SPORT) + if (ct1->tuple[NFCT_DIR_REPLY].l4src.udp.port != + ct2->tuple[NFCT_DIR_REPLY].l4src.udp.port) + ret = 0; + if (flags & UDP_REPL_DPORT) + if (ct1->tuple[NFCT_DIR_REPLY].l4dst.udp.port != + ct2->tuple[NFCT_DIR_REPLY].l4dst.udp.port) + ret = 0; + + return ret; } static struct nfct_proto udp = { @@ -47,6 +74,7 @@ static struct nfct_proto udp = { .build_tuple_proto = build_tuple_proto, .parse_proto = parse_proto, .print_proto = print_proto, + .compare = compare, .version = VERSION, }; -- cgit v1.2.3