diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
| commit | 1e8ad3bd802d66bed71b4c6405ff5d801a913e4a (patch) | |
| tree | df5e0d876c3ec2ff0e3d9c6795cb5c1e20b7d5c4 /contrib/tcpdump/print-ip6.c | |
| parent | 7ab661360c2131496bd3c111b5b3b2462fe3d2be (diff) | |
| parent | 5f4de8e61a87fc21b6ffecf7ef9444827c09ee69 (diff) | |
| download | FreeBSD-src-1e8ad3bd802d66bed71b4c6405ff5d801a913e4a.zip FreeBSD-src-1e8ad3bd802d66bed71b4c6405ff5d801a913e4a.tar.gz | |
Merge tcpdump-4.1.1.
Diffstat (limited to 'contrib/tcpdump/print-ip6.c')
| -rw-r--r-- | contrib/tcpdump/print-ip6.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c index 1793974..659fdad 100644 --- a/contrib/tcpdump/print-ip6.c +++ b/contrib/tcpdump/print-ip6.c @@ -38,6 +38,7 @@ static const char rcsid[] _U_ = #include <stdlib.h> #include <string.h> +#include "netdissect.h" #include "interface.h" #include "addrtoname.h" #include "extract.h" @@ -46,6 +47,31 @@ static const char rcsid[] _U_ = #include "ipproto.h" /* + * Compute a V6-style checksum by building a pseudoheader. + */ +int +nextproto6_cksum(const struct ip6_hdr *ip6, const u_short *data, + u_int len, u_int next_proto) +{ + size_t i; + u_int32_t sum = 0; + union ip6_pseudo_hdr phu; + + /* pseudo-header */ + memset(&phu, 0, sizeof(phu)); + phu.ph.ph_src = ip6->ip6_src; + phu.ph.ph_dst = ip6->ip6_dst; + phu.ph.ph_len = htonl(len); + phu.ph.ph_nxt = next_proto; + + for (i = 0; i < sizeof(phu.pa) / sizeof(phu.pa[0]); i++) { + sum += phu.pa[i]; + } + + return in_cksum(data, len, sum); +} + +/* * print an IP6 datagram. */ void @@ -172,7 +198,7 @@ ip6_print(register const u_char *bp, register u_int length) udp_print(cp, len, (const u_char *)ip6, fragmented); return; case IPPROTO_ICMPV6: - icmp6_print(cp, len, (const u_char *)ip6, fragmented); + icmp6_print(gndo, cp, len, (const u_char *)ip6, fragmented); return; case IPPROTO_AH: advance = ah_print(cp); @@ -195,7 +221,8 @@ ip6_print(register const u_char *bp, register u_int length) } case IPPROTO_PIM: - pim_print(cp, len); + pim_print(cp, len, nextproto6_cksum(ip6, (u_short *)cp, len, + IPPROTO_PIM)); return; case IPPROTO_OSPF: |
