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

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index af74fa0a76ae1de0c1abb078c76c67628faab502..6019cd798eec9e37d8a50776c43cdb54a02b6e7f 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -21,13 +21,9 @@
 
 /* \summary: IPv6 routing header printer */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <netdissect-stdinc.h>
-
-#include <string.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -41,82 +37,77 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
        const struct ip6_rthdr *dp;
        const struct ip6_rthdr0 *dp0;
        const struct ip6_srh *srh;
-       const u_char *ep;
        u_int i, len, type;
-       const struct in6_addr *addr;
-
-       dp = (const struct ip6_rthdr *)bp;
+       const u_char *p;
 
-       /* 'ep' points to the end of available data. */
-       ep = ndo->ndo_snapend;
+       ndo->ndo_protocol = "rt6";
 
-       ND_TCHECK(dp->ip6r_segleft);
+       nd_print_protocol_caps(ndo);
+       dp = (const struct ip6_rthdr *)bp;
 
-       len = EXTRACT_U_1(dp->ip6r_len);
-       ND_PRINT((ndo, "srcrt (len=%u", len));  /*)*/
-       type = EXTRACT_U_1(dp->ip6r_type);
-       ND_PRINT((ndo, ", type=%u", type));
-       ND_PRINT((ndo, ", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft)));
+       len = GET_U_1(dp->ip6r_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) {
        case IPV6_RTHDR_TYPE_0:
        case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
                dp0 = (const struct ip6_rthdr0 *)dp;
 
-               ND_TCHECK(dp0->ip6r0_reserved);
-               if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
-                       ND_PRINT((ndo, ", rsv=0x%0x",
-                           EXTRACT_BE_U_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;
-               addr = &dp0->ip6r0_addr[0];
+               p = (const u_char *) dp0->ip6r0_addr;
                for (i = 0; i < len; i++) {
-                       if ((const u_char *)(addr + 1) > ep)
-                               goto trunc;
-
-                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
-                       addr++;
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
+                       p += 16;
                }
                /*(*/
-               ND_PRINT((ndo, ") "));
-               return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
+               ND_PRINT(") ");
+               return((GET_U_1(dp0->ip6r0_len) + 1) << 3);
                break;
        case IPV6_RTHDR_TYPE_4:
                srh = (const struct ip6_srh *)dp;
-               ND_PRINT((ndo, ", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent)));
+               ND_PRINT(", last-entry=%u", GET_U_1(srh->srh_last_ent));
 
-               ND_TCHECK(srh->srh_flags);
-               if (EXTRACT_U_1(srh->srh_flags) || ndo->ndo_vflag) {
-                       ND_PRINT((ndo, ", flags=0x%0x",
-                               EXTRACT_U_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_PRINT((ndo, ", tag=%x", EXTRACT_BE_U_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;
-               addr = &srh->srh_segments[0];
+               p  = (const u_char *) srh->srh_segments;
                for (i = 0; i < len; i++) {
-                       if ((const u_char *)(addr + 1) > ep)
-                               goto trunc;
-
-                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
-                       addr++;
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
+                       p += 16;
                }
                /*(*/
-               ND_PRINT((ndo, ") "));
-               return((EXTRACT_U_1(srh->srh_len) + 1) << 3);
+               ND_PRINT(") ");
+               return((GET_U_1(srh->srh_len) + 1) << 3);
                break;
        default:
-               goto trunc;
-               break;
+               ND_PRINT(" (unknown type)");
+               goto invalid;
        }
 
- trunc:
-       ND_PRINT((ndo, "[|srcrt]"));
+invalid:
+       nd_print_invalid(ndo);
        return -1;
 }