On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 618e93bbcb25d1b764bde88ddbc4c0e9279c973b..16e8a4b21926b993f7e1c811dd2ff477695dae87 100644 (file)
--- 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_trunc(ndo);
-       return -1;
 }