[netfilter-cvslog] r4424 - trunk/libnetfilter_conntrack/extensions

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2005-11-02 16:54:00 +0100 (Wed, 02 Nov 2005)
New Revision: 4424

Modified:
   trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c
Log:
o Display similar ICMP output as cat /proc/net/ip_conntrack



Modified: trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c
===================================================================
--- trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c	2005-11-02 13:52:04 UTC (rev 4423)
+++ trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c	2005-11-02 15:54:00 UTC (rev 4424)
@@ -46,15 +46,11 @@
 
 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 = {