X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/83bec9d56c6af5614a7ab3abd077aed239c26b85..refs/pull/482/head:/print-ip6.c diff --git a/print-ip6.c b/print-ip6.c index b06e9360..45508ced 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -23,14 +23,11 @@ #include "config.h" #endif -#ifdef INET6 - -#include +#include #include #include "netdissect.h" -#include "interface.h" #include "addrtoname.h" #include "extract.h" @@ -41,15 +38,15 @@ * Compute a V6-style checksum by building a pseudoheader. */ int -nextproto6_cksum(const struct ip6_hdr *ip6, const u_int8_t *data, +nextproto6_cksum(const struct ip6_hdr *ip6, const uint8_t *data, u_int len, u_int covlen, u_int next_proto) { struct { struct in6_addr ph_src; struct in6_addr ph_dst; - u_int32_t ph_len; - u_int8_t ph_zero[3]; - u_int8_t ph_nxt; + uint32_t ph_len; + uint8_t ph_zero[3]; + uint8_t ph_nxt; } ph; struct cksum_vec vec[2]; @@ -60,7 +57,7 @@ nextproto6_cksum(const struct ip6_hdr *ip6, const u_int8_t *data, ph.ph_len = htonl(len); ph.ph_nxt = next_proto; - vec[0].ptr = (const u_int8_t *)(void *)&ph; + vec[0].ptr = (const uint8_t *)(void *)&ph; vec[0].len = sizeof(ph); vec[1].ptr = data; vec[1].len = covlen; @@ -86,9 +83,9 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) ip6 = (const struct ip6_hdr *)bp; - TCHECK(*ip6); + ND_TCHECK(*ip6); if (length < sizeof (struct ip6_hdr)) { - (void)ND_PRINT((ndo, "truncated-ip6 %u", length)); + ND_PRINT((ndo, "truncated-ip6 %u", length)); return; } @@ -103,7 +100,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) payload_len = EXTRACT_16BITS(&ip6->ip6_plen); len = payload_len + sizeof(struct ip6_hdr); if (length < len) - (void)ND_PRINT((ndo, "truncated-ip6 - %u bytes missing!", + ND_PRINT((ndo, "truncated-ip6 - %u bytes missing!", len - length)); if (ndo->ndo_vflag) { @@ -112,18 +109,18 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) #if 0 /* rfc1883 */ if (flow & 0x0f000000) - (void)ND_PRINT((ndo, "pri 0x%02x, ", (flow & 0x0f000000) >> 24)); + ND_PRINT((ndo, "pri 0x%02x, ", (flow & 0x0f000000) >> 24)); if (flow & 0x00ffffff) - (void)ND_PRINT((ndo, "flowlabel 0x%06x, ", flow & 0x00ffffff)); + ND_PRINT((ndo, "flowlabel 0x%06x, ", flow & 0x00ffffff)); #else /* RFC 2460 */ if (flow & 0x0ff00000) - (void)ND_PRINT((ndo, "class 0x%02x, ", (flow & 0x0ff00000) >> 20)); + ND_PRINT((ndo, "class 0x%02x, ", (flow & 0x0ff00000) >> 20)); if (flow & 0x000fffff) - (void)ND_PRINT((ndo, "flowlabel 0x%05x, ", flow & 0x000fffff)); + ND_PRINT((ndo, "flowlabel 0x%05x, ", flow & 0x000fffff)); #endif - (void)ND_PRINT((ndo, "hlim %u, next-header %s (%u) payload length: %u) ", + ND_PRINT((ndo, "hlim %u, next-header %s (%u) payload length: %u) ", ip6->ip6_hlim, tok2str(ipproto_values,"unknown",ip6->ip6_nxt), ip6->ip6_nxt, @@ -147,17 +144,17 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) if (cp == (const u_char *)(ip6 + 1) && nh != IPPROTO_TCP && nh != IPPROTO_UDP && nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) { - (void)ND_PRINT((ndo, "%s > %s: ", ip6addr_string(&ip6->ip6_src), - ip6addr_string(&ip6->ip6_dst))); + ND_PRINT((ndo, "%s > %s: ", ip6addr_string(ndo, &ip6->ip6_src), + ip6addr_string(ndo, &ip6->ip6_dst))); } switch (nh) { case IPPROTO_HOPOPTS: - advance = hbhopt_print(cp); + advance = hbhopt_print(ndo, cp); nh = *cp; break; case IPPROTO_DSTOPTS: - advance = dstopt_print(cp); + advance = dstopt_print(ndo, cp); nh = *cp; break; case IPPROTO_FRAGMENT: @@ -180,30 +177,30 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) * which payload can be piggybacked atop a * mobility header. */ - advance = mobility_print(cp, (const u_char *)ip6); + advance = mobility_print(ndo, cp, (const u_char *)ip6); nh = *cp; return; case IPPROTO_ROUTING: - advance = rt6_print(cp, (const u_char *)ip6); + advance = rt6_print(ndo, cp, (const u_char *)ip6); nh = *cp; break; case IPPROTO_SCTP: - sctp_print(cp, (const u_char *)ip6, len); + sctp_print(ndo, cp, (const u_char *)ip6, len); return; case IPPROTO_DCCP: - dccp_print(cp, (const u_char *)ip6, len); + dccp_print(ndo, cp, (const u_char *)ip6, len); return; case IPPROTO_TCP: - tcp_print(cp, len, (const u_char *)ip6, fragmented); + tcp_print(ndo, cp, len, (const u_char *)ip6, fragmented); return; case IPPROTO_UDP: - udp_print(cp, len, (const u_char *)ip6, fragmented); + udp_print(ndo, cp, len, (const u_char *)ip6, fragmented); return; case IPPROTO_ICMPV6: icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented); return; case IPPROTO_AH: - advance = ah_print(gndo, cp); + advance = ah_print(ndo, cp); nh = *cp; break; case IPPROTO_ESP: @@ -223,12 +220,11 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) } case IPPROTO_PIM: - pim_print(cp, len, nextproto6_cksum(ip6, cp, len, len, - IPPROTO_PIM)); + pim_print(ndo, cp, len, (const u_char *)ip6); return; case IPPROTO_OSPF: - ospf6_print(cp, len); + ospf6_print(ndo, cp, len); return; case IPPROTO_IPV6: @@ -240,7 +236,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) return; case IPPROTO_PGM: - pgm_print(cp, len, (const u_char *)ip6); + pgm_print(ndo, cp, len, (const u_char *)ip6); return; case IPPROTO_GRE: @@ -248,22 +244,20 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length) return; case IPPROTO_RSVP: - rsvp_print(cp, len); + rsvp_print(ndo, cp, len); return; case IPPROTO_NONE: - (void)ND_PRINT((ndo, "no next header")); + ND_PRINT((ndo, "no next header")); return; default: - (void)ND_PRINT((ndo, "ip-proto-%d %d", nh, len)); + ND_PRINT((ndo, "ip-proto-%d %d", nh, len)); return; } } return; trunc: - (void)ND_PRINT((ndo, "[|ip6]")); + ND_PRINT((ndo, "[|ip6]")); } - -#endif /* INET6 */