Revert partially the commit 21b1273

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index f545d2d5b6e701d5382e1480e7269d6755a980fc..818cce2ac53c17242fd2e054376e7e9ebe1dd943 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -46,19 +46,19 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 
        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)));
+                      GET_BE_U_4(dp->ip6f_ident),
+                      GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+                      (u_int)(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)));
+                      GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+                      (u_int)(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
        {
@@ -66,6 +66,6 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
                return sizeof(struct ip6_frag);
        }
 trunc:
-       ND_PRINT("[|frag]");
+       nd_print_trunc(ndo);
        return -1;
 }