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

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 0395791d763864ea34f0b91c9dbc2e3ebdcedb5b..0ba3ba6616e381e31afe934cf7e247dc2d24ca28 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_)
 {
@@ -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_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
                        ND_PRINT((ndo, ", rsv=0x%0x",
-                           EXTRACT_32BITS(&dp0->ip6r0_reserved)));
+                           EXTRACT_BE_U_4(&dp0->ip6r0_reserved)));
                }
 
                if (len % 2 == 1)