Remove EXTRACT_LE_8BITS() macro, use EXTRACT_8BITS() macro

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 35dbed981b0e448497f5f3ff272a99319094820b..146a84b2ea38334863deae8f5435ce7e032086ae 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -29,12 +29,12 @@
 
 #include <string.h>
 
-#include "ip6.h"
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 int
 rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 _U_)
 {
@@ -45,13 +45,13 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
        register const struct in6_addr *addr;
 
        dp = (const struct ip6_rthdr *)bp;
-       len = dp->ip6r_len;
 
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
 
        ND_TCHECK(dp->ip6r_segleft);
 
+       len = dp->ip6r_len;
        ND_PRINT((ndo, "srcrt (len=%d", dp->ip6r_len)); /*)*/
        ND_PRINT((ndo, ", type=%d", dp->ip6r_type));
        ND_PRINT((ndo, ", segleft=%d", dp->ip6r_segleft));
@@ -62,9 +62,9 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
                dp0 = (const struct ip6_rthdr0 *)dp;
 
                ND_TCHECK(dp0->ip6r0_reserved);
-               if (dp0->ip6r0_reserved || ndo->ndo_vflag) {
+               if (EXTRACT_BE_32BITS(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
                        ND_PRINT((ndo, ", rsv=0x%0x",
-                           EXTRACT_32BITS(&dp0->ip6r0_reserved)));
+                           EXTRACT_BE_32BITS(&dp0->ip6r0_reserved)));
                }
 
                if (len % 2 == 1)