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_icmp.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'extensions/libnetfilter_conntrack_icmp.c') diff --git a/extensions/libnetfilter_conntrack_icmp.c b/extensions/libnetfilter_conntrack_icmp.c index a6cfe77..a69f43d 100644 --- a/extensions/libnetfilter_conntrack_icmp.c +++ b/extensions/libnetfilter_conntrack_icmp.c @@ -15,6 +15,7 @@ #include #include #include +#include static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple) { @@ -51,12 +52,35 @@ static int print_proto(char *buf, struct nfct_tuple *t) ntohs(t->l4src.icmp.id))); } +static int compare(struct nfct_conntrack *ct1, + struct nfct_conntrack *ct2, + unsigned int flags) +{ + int ret = 1; + + if (flags & ICMP_TYPE) + if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.type != + ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.type) + ret = 0; + if (flags & ICMP_CODE) + if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.code != + ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.code) + ret = 0; + if (flags & ICMP_ID) + if (ct1->tuple[NFCT_DIR_REPLY].l4src.icmp.id != + ct2->tuple[NFCT_DIR_REPLY].l4src.icmp.id) + ret = 0; + + return ret; +} + static struct nfct_proto icmp = { .name = "icmp", .protonum = IPPROTO_ICMP, .parse_proto = parse_proto, .build_tuple_proto = build_tuple_proto, .print_proto = print_proto, + .compare = compare, .version = VERSION }; -- cgit v1.2.3