[netfilter-cvslog] r6774 - in trunk/libnetfilter_conntrack: include/libnetfilter_conntrack src/conntrack

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2007-03-17 12:52:57 +0100 (Sat, 17 Mar 2007)
New Revision: 6774

Modified:
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
   trunk/libnetfilter_conntrack/src/conntrack/setter.c
Log:
[PATCH] Fix icmp_id setter and doc (Phil Dibowitz <phil at ipom.com>)

ICMP ID is stored as a u_int16_t, but its setter function derefs it's
arguement as a u_int8_t. Additionally the api "doc" claims it's a u8, when
it's not.

This patch fixes both.


Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2007-03-16 17:53:26 UTC (rev 6773)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2007-03-17 11:52:57 UTC (rev 6774)
@@ -359,7 +359,7 @@
 	ATTR_REPL_PORT_DST,		/* u16 bits */
 	ATTR_ICMP_TYPE = 12,		/* u8 bits */
 	ATTR_ICMP_CODE,			/* u8 bits */
-	ATTR_ICMP_ID,			/* u8 bits */
+	ATTR_ICMP_ID,			/* u16 bits */
 	ATTR_ORIG_L3PROTO,		/* u8 bits */
 	ATTR_REPL_L3PROTO = 16,		/* u8 bits */
 	ATTR_ORIG_L4PROTO,		/* u8 bits */

Modified: trunk/libnetfilter_conntrack/src/conntrack/setter.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/setter.c	2007-03-16 17:53:26 UTC (rev 6773)
+++ trunk/libnetfilter_conntrack/src/conntrack/setter.c	2007-03-17 11:52:57 UTC (rev 6774)
@@ -79,7 +79,7 @@
 
 static void set_attr_icmp_id(struct nf_conntrack *ct, const void *value)
 {
-	ct->tuple[__DIR_ORIG].l4src.icmp.id = *((u_int8_t *) value);
+	ct->tuple[__DIR_ORIG].l4src.icmp.id = *((u_int16_t *) value);
 }
 
 static void set_attr_orig_l3proto(struct nf_conntrack *ct, const void *value)