Revert partially the commit 21b1273

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index f1728f0c530f51693a62f13baf160d2e5ae5e82c..818cce2ac53c17242fd2e054376e7e9ebe1dd943 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -22,10 +22,10 @@
 /* \summary: IPv6 fragmentation header printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -38,33 +38,34 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
        const struct ip6_frag *dp;
        const struct ip6_hdr *ip6;
 
+       ndo->ndo_protocol = "frag6";
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 
-       ND_TCHECK(*dp);
+       ND_TCHECK_SIZE(dp);
 
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, "frag (0x%08x:%d|%ld)",
-                      EXTRACT_BE_U_4(&dp->ip6f_ident),
-                      EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-                      sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen) -
-                      (long)(bp - bp2) - sizeof(struct ip6_frag)));
+               ND_PRINT("frag (0x%08x:%u|%u)",
+                      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((ndo, "frag (%d|%ld)",
-                      EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-                      sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen) -
-                      (long)(bp - bp2) - sizeof(struct ip6_frag)));
+               ND_PRINT("frag (%u|%u)",
+                      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
        {
-               ND_PRINT((ndo, " "));
+               ND_PRINT(" ");
                return sizeof(struct ip6_frag);
        }
 trunc:
-       ND_PRINT((ndo, "[|frag]"));
+       nd_print_trunc(ndo);
        return -1;
 }