diff options
Diffstat (limited to 'contrib/tcpdump/ip.h')
| -rw-r--r-- | contrib/tcpdump/ip.h | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/contrib/tcpdump/ip.h b/contrib/tcpdump/ip.h index 72c8972..8179061 100644 --- a/contrib/tcpdump/ip.h +++ b/contrib/tcpdump/ip.h @@ -33,10 +33,8 @@ * @(#)ip.h 8.2 (Berkeley) 6/1/94 */ -#ifndef TCPDUMP_IP_H -#define TCPDUMP_IP_H - -#include "tcpdump-stdinc.h" +#ifndef netdissect_ip_h +#define netdissect_ip_h /* * Definitions for internet protocol version 4. @@ -52,21 +50,21 @@ * against negative integers quite easily, and fail in subtle ways. */ struct ip { - uint8_t ip_vhl; /* header length, version */ + nd_uint8_t ip_vhl; /* header length, version */ #define IP_V(ip) (((ip)->ip_vhl & 0xf0) >> 4) #define IP_HL(ip) ((ip)->ip_vhl & 0x0f) - uint8_t ip_tos; /* type of service */ - uint16_t ip_len; /* total length */ - uint16_t ip_id; /* identification */ - uint16_t ip_off; /* fragment offset field */ + nd_uint8_t ip_tos; /* type of service */ + nd_uint16_t ip_len; /* total length */ + nd_uint16_t ip_id; /* identification */ + nd_uint16_t ip_off; /* fragment offset field */ #define IP_DF 0x4000 /* dont fragment flag */ #define IP_MF 0x2000 /* more fragments flag */ #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - uint8_t ip_ttl; /* time to live */ - uint8_t ip_p; /* protocol */ - uint16_t ip_sum; /* checksum */ - struct in_addr ip_src,ip_dst; /* source and dest address */ -} UNALIGNED; + nd_uint8_t ip_ttl; /* time to live */ + nd_uint8_t ip_p; /* protocol */ + nd_uint16_t ip_sum; /* checksum */ + nd_ipv4 ip_src,ip_dst; /* source and dest address */ +}; #define IP_MAXPACKET 65535 /* maximum packet size */ @@ -125,20 +123,20 @@ struct ip { * Time stamp option structure. */ struct ip_timestamp { - uint8_t ipt_code; /* IPOPT_TS */ - uint8_t ipt_len; /* size of structure (variable) */ - uint8_t ipt_ptr; /* index of current entry */ - uint8_t ipt_oflwflg; /* flags, overflow counter */ + nd_uint8_t ipt_code; /* IPOPT_TS */ + nd_uint8_t ipt_len; /* size of structure (variable) */ + nd_uint8_t ipt_ptr; /* index of current entry */ + nd_uint8_t ipt_oflwflg; /* flags, overflow counter */ #define IPTS_OFLW(ip) (((ipt)->ipt_oflwflg & 0xf0) >> 4) #define IPTS_FLG(ip) ((ipt)->ipt_oflwflg & 0x0f) union ipt_timestamp { - uint32_t ipt_time[1]; + nd_uint32_t ipt_time[1]; struct ipt_ta { - struct in_addr ipt_addr; - uint32_t ipt_time; + nd_ipv4 ipt_addr; + nd_uint32_t ipt_time; } ipt_ta[1]; } ipt_timestamp; -} UNALIGNED; +}; /* flag bits for ipt_flg */ #define IPOPT_TS_TSONLY 0 /* timestamps only */ @@ -163,4 +161,4 @@ struct ip_timestamp { #define IPTTLDEC 1 /* subtracted when forwarding */ #define IP_MSS 576 /* default maximum segment size */ -#endif /* TCPDUMP_IP_H */ +#endif /* netdissect_ip_h */ |
