CMake: Fix the comment about versions. [skip ci]

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 703011064c116c47d3c9812cc2ba707651278ccd..6019cd798eec9e37d8a50776c43cdb54a02b6e7f 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -21,14 +21,10 @@
 
 /* \summary: IPv6 routing header printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -45,14 +41,16 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
        const u_char *p;
 
        ndo->ndo_protocol = "rt6";
-       dp = (const struct ip6_rthdr *)bp;
 
-       ND_TCHECK_1(dp->ip6r_segleft);
+       nd_print_protocol_caps(ndo);
+       dp = (const struct ip6_rthdr *)bp;
 
        len = GET_U_1(dp->ip6r_len);
-       ND_PRINT("srcrt (len=%u", len); /*)*/
+       ND_PRINT(" (len=%u", len);      /*)*/
        type = GET_U_1(dp->ip6r_type);
        ND_PRINT(", type=%u", type);
+       if (type == IPV6_RTHDR_TYPE_0)
+               ND_PRINT(" [Deprecated]");
        ND_PRINT(", segleft=%u", GET_U_1(dp->ip6r_segleft));
 
        switch (type) {
@@ -60,19 +58,19 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
        case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
                dp0 = (const struct ip6_rthdr0 *)dp;
 
-               ND_TCHECK_4(dp0->ip6r0_reserved);
                if (GET_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
                        ND_PRINT(", rsv=0x%0x",
                            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++) {
-                       ND_TCHECK_16(p);
-                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }
                /*(*/
@@ -81,25 +79,23 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                break;
        case IPV6_RTHDR_TYPE_4:
                srh = (const struct ip6_srh *)dp;
-               ND_TCHECK_1(srh->srh_last_ent);
                ND_PRINT(", last-entry=%u", GET_U_1(srh->srh_last_ent));
 
-               ND_TCHECK_1(srh->srh_flags);
                if (GET_U_1(srh->srh_flags) || ndo->ndo_vflag) {
                        ND_PRINT(", flags=0x%0x",
                                GET_U_1(srh->srh_flags));
                }
 
-               ND_TCHECK_2(srh->srh_tag);
                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++) {
-                       ND_TCHECK_16(p);
-                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }
                /*(*/
@@ -107,11 +103,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("[|srcrt]");
+invalid:
+       nd_print_invalid(ndo);
        return -1;
 }