Fix warnings when building for 32-bit and defining _TIME_BITS=64

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index e7d9fbde8ca259ac3cefd6237f865cd957e60291..e1b27268e6f4f555f0951d3797b0d72f5614f66c 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -27,8 +27,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -67,8 +65,10 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                            GET_BE_U_4(dp0->ip6r0_reserved));
                }
 
-               if (len % 2 == 1)
-                       goto trunc;
+               if (len % 2 == 1) {
+                       ND_PRINT(" [length %u]", len);
+                       goto invalid;
+               }
                len >>= 1;
                p = (const u_char *) dp0->ip6r0_addr;
                for (i = 0; i < len; i++) {
@@ -90,8 +90,10 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 
                ND_PRINT(", tag=%x", GET_BE_U_2(srh->srh_tag));
 
-               if (len % 2 == 1)
-                       goto trunc;
+               if (len % 2 == 1) {
+                       ND_PRINT(" (invalid length %u)", len);
+                       goto invalid;
+               }
                len >>= 1;
                p  = (const u_char *) srh->srh_segments;
                for (i = 0; i < len; i++) {
@@ -103,11 +105,11 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                return((GET_U_1(srh->srh_len) + 1) << 3);
                break;
        default:
-               goto trunc;
-               break;
+               ND_PRINT(" (unknown type)");
+               goto invalid;
        }
 
- trunc:
-       nd_print_trunc(ndo);
+invalid:
+       nd_print_invalid(ndo);
        return -1;
 }