IPv6 Routing Header: Modernize packet parsing style.

Report an invalid packet as invalid with a reason, not truncated.

diff --git a/print-rt6.c b/print-rt6.c
index fba6467069fba53af1151059f5ffb3086b0fc4bf..096a96286c95e0ce8a7275fd7589d6d2bccb17f2 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -65,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(" (invalid length %u)", len);
+                       goto invalid;
+               }
                len >>= 1;
                p = (const u_char *) dp0->ip6r0_addr;
                for (i = 0; i < len; i++) {
@@ -88,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++) {
@@ -101,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;
 }