RIPng: Use more ND_TCHECK_SIZE() macros

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 822ae7cc3a41111781324b80fadcf43742cd2372..2d3d3a8bf591bc8987182c552593478920b7bfaa 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,65 +19,54 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.26 2003-11-19 00:36:08 guy Exp $";
-#endif
+/* \summary: IPv6 routing header printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef INET6
-
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
+#include "netdissect-stdinc.h"
 
-#include "ip6.h"
+#include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 int
-rt6_print(register const u_char *bp, register const u_char *bp2)
+rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 {
-       register const struct ip6_rthdr *dp;
-       register const struct ip6_rthdr0 *dp0;
-       register const struct ip6_hdr *ip;
-       register const u_char *ep;
-       int i, len;
-       register const struct in6_addr *addr;
+       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 = (struct ip6_rthdr *)bp;
-       ip = (struct ip6_hdr *)bp2;
-       len = dp->ip6r_len;
+       dp = (const struct ip6_rthdr *)bp;
 
        /* 'ep' points to the end of available data. */
-       ep = snapend;
+       ep = ndo->ndo_snapend;
 
-       TCHECK(dp->ip6r_segleft);
+       ND_TCHECK_1(dp->ip6r_segleft);
 
-       printf("srcrt (len=%d", dp->ip6r_len);  /*)*/
-       printf(", type=%d", dp->ip6r_type);
-       printf(", segleft=%d", dp->ip6r_segleft);
+       len = EXTRACT_U_1(dp->ip6r_len);
+       ND_PRINT("srcrt (len=%u", len); /*)*/
+       type = EXTRACT_U_1(dp->ip6r_type);
+       ND_PRINT(", type=%u", type);
+       ND_PRINT(", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft));
 
-       switch (dp->ip6r_type) {
-#ifndef IPV6_RTHDR_TYPE_0
-#define IPV6_RTHDR_TYPE_0 0
-#endif
-#ifndef IPV6_RTHDR_TYPE_2
-#define IPV6_RTHDR_TYPE_2 2
-#endif
+       switch (type) {
        case IPV6_RTHDR_TYPE_0:
        case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
-               dp0 = (struct ip6_rthdr0 *)dp;
+               dp0 = (const struct ip6_rthdr0 *)dp;
 
-               TCHECK(dp0->ip6r0_reserved);
-               if (dp0->ip6r0_reserved || vflag) {
-                       printf(", rsv=0x%0x",
-                           EXTRACT_32BITS(&dp0->ip6r0_reserved));
+               ND_TCHECK_4(dp0->ip6r0_reserved);
+               if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
+                       ND_PRINT(", rsv=0x%0x",
+                           EXTRACT_BE_U_4(dp0->ip6r0_reserved));
                }
 
                if (len % 2 == 1)
@@ -85,15 +74,44 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
                len >>= 1;
                addr = &dp0->ip6r0_addr[0];
                for (i = 0; i < len; i++) {
-                       if ((u_char *)(addr + 1) > ep)
+                       if ((const u_char *)(addr + 1) > ep)
+                               goto trunc;
+
+                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, addr));
+                       addr++;
+               }
+               /*(*/
+               ND_PRINT(") ");
+               return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
+               break;
+       case IPV6_RTHDR_TYPE_4:
+               srh = (const struct ip6_srh *)dp;
+               ND_TCHECK_1(srh->srh_last_ent);
+               ND_PRINT(", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent));
+
+               ND_TCHECK_1(srh->srh_flags);
+               if (EXTRACT_U_1(srh->srh_flags) || ndo->ndo_vflag) {
+                       ND_PRINT(", flags=0x%0x",
+                               EXTRACT_U_1(srh->srh_flags));
+               }
+
+               ND_TCHECK_2(srh->srh_tag);
+               ND_PRINT(", tag=%x", EXTRACT_BE_U_2(srh->srh_tag));
+
+               if (len % 2 == 1)
+                       goto trunc;
+               len >>= 1;
+               addr = &srh->srh_segments[0];
+               for (i = 0; i < len; i++) {
+                       if ((const u_char *)(addr + 1) > ep)
                                goto trunc;
 
-                       printf(", [%d]%s", i, ip6addr_string(addr));
+                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, addr));
                        addr++;
                }
                /*(*/
-               printf(") ");
-               return((dp0->ip6r0_len + 1) << 3);
+               ND_PRINT(") ");
+               return((EXTRACT_U_1(srh->srh_len) + 1) << 3);
                break;
        default:
                goto trunc;
@@ -101,7 +119,6 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        }
 
  trunc:
-       fputs("[|srcrt]", stdout);
+       ND_PRINT("[|srcrt]");
        return -1;
 }
-#endif /* INET6 */