X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/546558eabd81cfc36a81a4df728fdfea0d83b41a..c74314dbf20b639f6743a7865d1bf9fe966cf5d0:/print-frag6.c diff --git a/print-frag6.c b/print-frag6.c index f545d2d5..16e8a4b2 100644 --- a/print-frag6.c +++ b/print-frag6.c @@ -42,30 +42,25 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2) dp = (const struct ip6_frag *)bp; ip6 = (const struct ip6_hdr *)bp2; - ND_TCHECK_SIZE(dp); - if (ndo->ndo_vflag) { - ND_PRINT("frag (0x%08x:%u|%u)", - EXTRACT_BE_U_4(dp->ip6f_ident), - EXTRACT_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK, - (u_int)(sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(ip6->ip6_plen) - - (bp - bp2) - sizeof(struct ip6_frag))); + ND_PRINT("frag (0x%08x:%u|%zu)", + GET_BE_U_4(dp->ip6f_ident), + GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK, + sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) - + (bp - bp2) - sizeof(struct ip6_frag)); } else { - ND_PRINT("frag (%u|%u)", - EXTRACT_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK, - (u_int)(sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(ip6->ip6_plen) - - (bp - bp2) - sizeof(struct ip6_frag))); + ND_PRINT("frag (%u|%zu)", + GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK, + sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) - + (bp - bp2) - sizeof(struct ip6_frag)); } /* it is meaningless to decode non-first fragment */ - if ((EXTRACT_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0) + if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0) return -1; else { ND_PRINT(" "); return sizeof(struct ip6_frag); } -trunc: - ND_PRINT("[|frag]"); - return -1; }