Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index cd875db7006494eef607556326f8730683c2a467..096a96286c95e0ce8a7275fd7589d6d2bccb17f2 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -27,8 +27,6 @@
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

-#include <string.h>
-

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"


@@ -45,14 +43,16 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
        const u_char *p;
 
        ndo->ndo_protocol = "rt6";
        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);
 
        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);
        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) {
        ND_PRINT(", segleft=%u", GET_U_1(dp->ip6r_segleft));
 
        switch (type) {


@@ -65,12 +65,13 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                            GET_BE_U_4(dp0->ip6r0_reserved));
                }
 
                            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++) {
                len >>= 1;
                p = (const u_char *) dp0->ip6r0_addr;
                for (i = 0; i < len; i++) {

-                       ND_TCHECK_16(p);

                        ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }
                        ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }


@@ -89,12 +90,13 @@ 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));
 
 
                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++) {
                len >>= 1;
                p  = (const u_char *) srh->srh_segments;
                for (i = 0; i < len; i++) {

-                       ND_TCHECK_16(p);

                        ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }
                        ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }


@@ -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:
                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;
 }
        return -1;
 }