CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index b8e16d599544e8ad88a9d431d086b46e38100d1f..6019cd798eec9e37d8a50776c43cdb54a02b6e7f 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,102 +19,95 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
-#endif
+/* \summary: IPv6 routing header printer */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

-#ifdef INET6
+#include "netdissect-stdinc.h"

 
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "netdissect.h"
+#include "addrtoname.h"
+#include "extract.h"

 
 

-#include <net/if.h>
+#include "ip6.h"

 
 

-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+int
+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;
+       u_int i, len, type;
+       const u_char *p;

 
 

-#include <stdio.h>
+       ndo->ndo_protocol = "rt6";

 
 

-#include <netinet/ip6.h>
+       nd_print_protocol_caps(ndo);
+       dp = (const struct ip6_rthdr *)bp;

 
 

-#include "interface.h"
-#include "addrtoname.h"
+       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));

 
 

-int
-rt6_print(register const u_char *bp, register const u_char *bp2)
-{
-       register const struct ip6_rthdr0 *dp;
-       register const struct ip6_hdr *ip;
-       register const u_char *ep;
-       u_long bitmap = 0x0800;
-       u_long slmap;
-       int i, len;
-
-#if 0
-#define TCHECK(var) if ((u_char *)&(var) >= ep - sizeof(var)) goto trunc
-#endif
-
-       dp = (struct ip6_rthdr0 *)bp;
-       ip = (struct ip6_hdr *)bp2;
-       len = dp->ip6r0_len;
-
-       /* 'ep' points to the end of avaible data. */
-       ep = snapend;
-
-        printf("%s > %s: ",
-              ip6addr_string(&ip->ip6_src),
-              ip6addr_string(&ip->ip6_dst));
-       
-       TCHECK(dp->ip6r0_slmap[2]);
-       printf("srcrt (len=%d, ", dp->ip6r0_len);
-       printf("type=%d, ", dp->ip6r0_type);
-       printf("segleft=%d, ", dp->ip6r0_segleft);
-       if (dp->ip6r0_type != 0)
-               goto trunc;
-       slmap = (dp->ip6r0_slmap[0] << 16)
-             | (dp->ip6r0_slmap[1] <<  8)
-             | (dp->ip6r0_slmap[2]);
-       printf("bitmap=");
-       for (i = 24; i > 0; i--) {
-               if (slmap & bitmap)
-                       printf("S");
-               else
-                       printf("L");
-               bitmap >>= 1;
-       }
-       if (len % 2 == 1)
-               goto trunc;
-       len >>= 1;
-       printf(", ");
-       for (i = 0; i < len; i++) {
-               if ((((u_char *)&(dp->ip6r0_reserved)) + sizeof(u_long)
-                    + (i<<4)) > ep) goto trunc;
-               printf(" [%d]%s", i,
-                      ip6addr_string(((u_char *)&(dp->ip6r0_reserved)) +
-                                     sizeof(u_long) + (i<<4)));
-               if (i != len - 1)
-                       printf(", ");
-                  
+       switch (type) {
+       case IPV6_RTHDR_TYPE_0:
+       case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
+               dp0 = (const struct ip6_rthdr0 *)dp;
+
+               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) {
+                       ND_PRINT(" [length %u]", len);
+                       goto invalid;
+               }
+               len >>= 1;
+               p = (const u_char *) dp0->ip6r0_addr;
+               for (i = 0; i < len; i++) {
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
+                       p += 16;
+               }
+               /*(*/
+               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(", last-entry=%u", GET_U_1(srh->srh_last_ent));
+
+               if (GET_U_1(srh->srh_flags) || ndo->ndo_vflag) {
+                       ND_PRINT(", flags=0x%0x",
+                               GET_U_1(srh->srh_flags));
+               }
+
+               ND_PRINT(", tag=%x", GET_BE_U_2(srh->srh_tag));
+
+               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_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
+                       p += 16;
+               }
+               /*(*/
+               ND_PRINT(") ");
+               return((GET_U_1(srh->srh_len) + 1) << 3);
+               break;
+       default:
+               ND_PRINT(" (unknown type)");
+               goto invalid;

        }
        }

-       printf(")");
-       return((dp->ip6r0_len + 1) << 3);
- trunc:
-       fputs("[|srcrt]", stdout);
-       return 65535;
-#undef TCHECK
+
+invalid:
+       nd_print_invalid(ndo);
+       return -1;

 }
 }

-#endif /* INET6 */