kern/125003: incorrect EtherIP header format.

[Shunsuke SHINOMIYA]

Hi,

>  Could you let me know if the following patch solves your symptom or
>  not?  It can be applied to 8.x and 7.x:
> 
>  http://people.allbsd.org/~hrs/FreeBSD/gif.diff

 Thank you.

 I applied your patch to RELENG_6_3 and modified netinet6/in6_gif.c
 manually(because of tab expansion?).

 I had 2 problems.
 One is syntax error around `eip_ver:4,' when BYTE_ORDER is LITTELE_ENDIAN.
 
 Another one is 2 octet padding for struct etherip_header. To solve this,
 I specified __packed attribute for this structure.

 Attached patch based on yours is for RELENG_6_3.

Patched implementation works well with IX2015.

192.168.2.37: FreeBSD box
192.168.2.128: IX2015

20:22:55.540804 IP 192.168.2.128 > 192.168.2.37:  etherip 76
        0x0000:  4500 0060 076b 0000 4061 ecdc c0a8 0280
        0x0010:  c0a8 0225 3000 **** **** **** **** ****
        0x0020:  **** 0800 4500 003c 0cc0 0000 8001 a82e
        0x0030:  c0a8 0281 c0a8 0201 0800 4753 0001 0608
        0x0040:  6162 6364 6566 6768 696a 6b6c 6d6e 6f70
        0x0050:  7172
20:22:55.541815 IP 192.168.2.37 > 192.168.2.128:  etherip 76
        0x0000:  4500 0060 3511 0000 1e61 e136 c0a8 0225
        0x0010:  c0a8 0280 3000 **** **** **** **** ****
        0x0020:  **** 0800 4500 003c 319b 0000 4001 c353
        0x0030:  c0a8 0201 c0a8 0281 0000 4f53 0001 0608
        0x0040:  6162 6364 6566 6768 696a 6b6c 6d6e 6f70
        0x0050:  7172

-- 
Shunsuke SHINOMIYA <shino at fornext.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gif6.diff
Type: application/octet-stream
Size: 1827 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-bugs/attachments/20080629/1d2a3ae7/gif6.obj