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

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 7323c72dc0dab8d8cd5c17e7b152ae417b4c8efa..0ba3ba6616e381e31afe934cf7e247dc2d24ca28 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,6 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPv6 routing header printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,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_)
 {
@@ -43,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));
@@ -60,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)