summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
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-11-02 15:54:00 +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-11-02 15:54:00 +0000
commit6a5a5174344f8b7318489aabc395864b1779db93 (patch)
treed85ddd1bde6294b2682284bfc09a2b9374a25332
parent5930b52c8f71c56b631e9d124b310874b5c0fc8f (diff)
o Display similar ICMP output as cat /proc/net/ip_conntrack
-rw-r--r--extensions/libnetfilter_conntrack_icmp.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/extensions/libnetfilter_conntrack_icmp.c b/extensions/libnetfilter_conntrack_icmp.c
index d1ae1b4..3526c4b 100644
--- a/extensions/libnetfilter_conntrack_icmp.c
+++ b/extensions/libnetfilter_conntrack_icmp.c
@@ -46,15 +46,11 @@ static void build_tuple_proto(struct nfnlhdr *req, int size,
static int print_proto(char *buf, struct nfct_tuple *t)
{
- int size = 0;
-
- size += sprintf(buf, "type=%d code=%d ", t->l4dst.icmp.type,
- t->l4dst.icmp.code);
- /* ID only makes sense with ECHO */
- if (t->l4dst.icmp.type == 8)
- size += sprintf(buf+size, "id=%d ", ntohs(t->l4src.icmp.id));
-
- return size;
+ /* The ID only makes sense for type=8 (ECHO) but we want to
+ * display the same output that /proc/net/ip_conntrack does */
+ return (sprintf(buf, "type=%d code=%d id=%d ",t->l4dst.icmp.type,
+ t->l4dst.icmp.code,
+ ntohs(t->l4src.icmp.id)));
}
static struct nfct_proto icmp = {