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-30 14:58:23 +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-30 14:58:23 +0000 |
| commit | 8dbd12018152683d253ff59ca22f646a410c1a82 (patch) | |
| tree | e4e4d961ec5af57b560fd3ea35b762fc248228d5 /extensions/libnetfilter_conntrack_icmp.c | |
| parent | 62b2c282232df3407b966198a3cbd1292edb4913 (diff) | |
o make static protocol handler functions
o move build_tuple_proto and build_protoinfo to the extensions where it
really belongs to.
o Reworked the conntrack and expect netlink handlers
o Fix expectation table output, now it's similar to the /proc output
o Bumped version to 0.2.1
Diffstat (limited to 'extensions/libnetfilter_conntrack_icmp.c')
| -rw-r--r-- | extensions/libnetfilter_conntrack_icmp.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/extensions/libnetfilter_conntrack_icmp.c b/extensions/libnetfilter_conntrack_icmp.c index 747fedf..07997d1 100644 --- a/extensions/libnetfilter_conntrack_icmp.c +++ b/extensions/libnetfilter_conntrack_icmp.c @@ -16,7 +16,7 @@ #include <libnetfilter_conntrack/libnetfilter_conntrack.h> #include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h> -void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple) +static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple) { if (cda[CTA_PROTO_ICMP_TYPE-1]) tuple->l4dst.icmp.type = @@ -31,7 +31,20 @@ void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple) *(u_int16_t *)NFA_DATA(cda[CTA_PROTO_ICMP_ID-1]); } -int print_proto(char *buf, struct nfct_tuple *t) +static void build_tuple_proto(struct nfnlhdr *req, int size, + struct nfct_tuple *t) +{ + nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_CODE, + &t->l4dst.icmp.code, sizeof(u_int8_t)); + nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_TYPE, + &t->l4dst.icmp.type, sizeof(u_int8_t)); + /* This is an ICMP echo */ + if (t->l4dst.icmp.type == 8) + nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_ID, + &t->l4src.icmp.id, sizeof(u_int16_t)); +} + +static int print_proto(char *buf, struct nfct_tuple *t) { int size = 0; @@ -48,13 +61,14 @@ static struct nfct_proto icmp = { .name = "icmp", .protonum = IPPROTO_ICMP, .parse_proto = parse_proto, + .build_tuple_proto = build_tuple_proto, .print_proto = print_proto, .version = LIBNETFILTER_CONNTRACK_VERSION }; -void __attribute__ ((constructor)) init(void); +static void __attribute__ ((constructor)) init(void); -void init(void) +static void init(void) { nfct_register_proto(&icmp); } |