diff options
| author | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | 661b9d94414ea6d11d5b7960aef1f172975ce52b (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/ip.h | |
| parent | 63ab347efe2621fc79f689a92c4bbda531593626 (diff) | |
| parent | d36dcecdb3228d24b199eb51cfd7ac666f5b8eb8 (diff) | |
| download | FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.zip FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.tar.gz | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/ip.h')
| -rw-r--r-- | contrib/tcpdump/ip.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/ip.h b/contrib/tcpdump/ip.h index a01d0f0..8a97632 100644 --- a/contrib/tcpdump/ip.h +++ b/contrib/tcpdump/ip.h @@ -62,7 +62,7 @@ struct ip { u_int8_t ip_p; /* protocol */ u_int16_t ip_sum; /* checksum */ struct in_addr ip_src,ip_dst; /* source and dest address */ -}; +} UNALIGNED; #define IP_MAXPACKET 65535 /* maximum packet size */ @@ -134,7 +134,7 @@ struct ip_timestamp { u_int32_t ipt_time; } ipt_ta[1]; } ipt_timestamp; -}; +} UNALIGNED; /* flag bits for ipt_flg */ #define IPOPT_TS_TSONLY 0 /* timestamps only */ @@ -161,4 +161,4 @@ struct ip_timestamp { #define IP_MSS 576 /* default maximum segment size */ /* in print-ip.c */ -extern u_int32_t ip_finddst(const struct ip *); +extern int nextproto4_cksum(const struct ip *, const u_int8_t *, u_int, u_int); |
