Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 1290952885587d9971339c03b93f2d80f9fd252f..fe8f3cf774b47600ff1088cb28bebca81d7ddd71 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,18 +19,18 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: IPv6 fragmentation header printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
+#include <netdissect-stdinc.h>
 
-#include <tcpdump-stdinc.h>
+#include "netdissect.h"
+#include "extract.h"
 
 #include "ip6.h"
-#include "interface.h"
-#include "extract.h"
 
 int
 frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
@@ -41,23 +41,23 @@ frag6_print(netdissect_options *ndo, register const u_char *bp, register const u
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 
-       ND_TCHECK(dp->ip6f_offlg);
+       ND_TCHECK(*dp);
 
        if (ndo->ndo_vflag) {
                ND_PRINT((ndo, "frag (0x%08x:%d|%ld)",
-                      EXTRACT_32BITS(&dp->ip6f_ident),
-                      EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-                      sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
-                              (long)(bp - bp2) - sizeof(struct ip6_frag)));
+                      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)));
        } else {
                ND_PRINT((ndo, "frag (%d|%ld)",
-                      EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-                      sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
-                              (long)(bp - bp2) - sizeof(struct ip6_frag)));
+                      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)));
        }
 
        /* it is meaningless to decode non-first fragment */
-       if ((EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+       if ((EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
                return -1;
        else
        {
@@ -68,4 +68,3 @@ trunc:
        ND_PRINT((ndo, "[|frag]"));
        return -1;
 }
-#endif /* INET6 */