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

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index db4a98edcc3e40bb09bbb2a9cfe7917dac4d113a..fe8f3cf774b47600ff1088cb28bebca81d7ddd71 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -27,10 +27,11 @@
 
 #include <netdissect-stdinc.h>
 
 
 #include <netdissect-stdinc.h>
 

-#include "ip6.h"

 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"
 

+#include "ip6.h"
+

 int
 frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
 {
 int
 frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
 {


@@ -40,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;
 
        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)",
 
        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)",
        } 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 */
        }
 
        /* 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
        {
                return -1;
        else
        {