[PATCH 6/8] Fix ICMP id type

[PATCH 6/8] Fix ICMP id type

[Pablo Neira]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

ICMP_ID is u_int16_t not u_int8_t. Handle this properly.

Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[-- Attachment #2: 05-fix-type-icmp-id.patch --]
[-- Type: text/plain, Size: 813 bytes --]

ICMP_ID is u_int16_t not u_int8_t. Handle this properly.

Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Index: netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
===================================================================
--- netfilter-2.6.14.git.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2005-11-06 19:59:55.000000000 +0100
+++ netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2005-11-06 19:59:56.000000000 +0100
@@ -305,7 +305,7 @@ static int icmp_nfattr_to_tuple(struct n
 	tuple->dst.u.icmp.code =
 			*(u_int8_t *)NFA_DATA(tb[CTA_PROTO_ICMP_CODE-1]);
 	tuple->src.u.icmp.id =
-			*(u_int8_t *)NFA_DATA(tb[CTA_PROTO_ICMP_ID-1]);
+			*(u_int16_t *)NFA_DATA(tb[CTA_PROTO_ICMP_ID-1]);
 
 	return 0;
 }

Re: [PATCH 6/8] Fix ICMP id type

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

On Tue, Nov 08, 2005 at 02:44:53AM +0100, Pablo Neira wrote:
> ICMP_ID is u_int16_t not u_int8_t. Handle this properly.

thanks, applied.

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]