1 | --- src/decode.h.orig Sat Jul 21 12:05:05 2007 |
---|
2 | +++ src/decode.h Sat Jul 21 12:07:57 2007 |
---|
3 | @@ -879,9 +879,9 @@ |
---|
4 | { |
---|
5 | union |
---|
6 | { |
---|
7 | - uint8_t u6_addr8[16]; |
---|
8 | - uint16_t u6_addr16[8]; |
---|
9 | - uint32_t u6_addr32[4]; |
---|
10 | + u_int8_t u6_addr8[16]; |
---|
11 | + u_int16_t u6_addr16[8]; |
---|
12 | + u_int32_t u6_addr32[4]; |
---|
13 | } in6_u; |
---|
14 | #define s6_addr in6_u.u6_addr8 |
---|
15 | #define s6_addr16 in6_u.u6_addr16 |
---|
16 | @@ -896,13 +896,13 @@ |
---|
17 | { |
---|
18 | struct _IP6HdrCtl |
---|
19 | { |
---|
20 | - uint32_t ip6_un1_flow; /* 4 bits version, 8 bits TC, |
---|
21 | + u_int32_t ip6_un1_flow; /* 4 bits version, 8 bits TC, |
---|
22 | 20 bits flow-ID */ |
---|
23 | - uint16_t ip6_un1_plen; /* payload length */ |
---|
24 | - uint8_t ip6_un1_nxt; /* next header */ |
---|
25 | - uint8_t ip6_un1_hlim; /* hop limit */ |
---|
26 | + u_int16_t ip6_un1_plen; /* payload length */ |
---|
27 | + u_int8_t ip6_un1_nxt; /* next header */ |
---|
28 | + u_int8_t ip6_un1_hlim; /* hop limit */ |
---|
29 | } IP6HdrCtl; |
---|
30 | - uint8_t ip6_un2_vfc; /* 4 bits version, top 4 bits tclass */ |
---|
31 | + u_int8_t ip6_un2_vfc; /* 4 bits version, top 4 bits tclass */ |
---|
32 | } IP6Ctl; |
---|
33 | |
---|
34 | struct in6_addr ip6_src; /* source address */ |
---|
35 | @@ -919,10 +919,10 @@ |
---|
36 | /* Fragment header */ |
---|
37 | typedef struct _IP6Frag |
---|
38 | { |
---|
39 | - uint8_t ip6f_nxt; /* next header */ |
---|
40 | - uint8_t ip6f_reserved; /* reserved field */ |
---|
41 | - uint16_t ip6f_offlg; /* offset, reserved, and flag */ |
---|
42 | - uint32_t ip6f_ident; /* identification */ |
---|
43 | + u_int8_t ip6f_nxt; /* next header */ |
---|
44 | + u_int8_t ip6f_reserved; /* reserved field */ |
---|
45 | + u_int16_t ip6f_offlg; /* offset, reserved, and flag */ |
---|
46 | + u_int32_t ip6f_ident; /* identification */ |
---|
47 | } IP6Frag; |
---|
48 | |
---|
49 | typedef struct _IP6HdrChain{ |
---|