Use more the ND_TTEST_1() macro

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index e23d61f2f3a040d677a7699b6501b49402d68167..269496aaecfc98ccfd107b626e4cf83be2a03a95 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,96 +19,69 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.5 2000-04-20 15:49:57 itojun Exp $";
-#endif
+/* \summary: IPv6 routing header printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifdef INET6
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.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>
-
-#include <stdio.h>
+#include <netdissect-stdinc.h>

 
 

-#include <netinet/ip6.h>
+#include <string.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

+#include "extract.h"
+
+#include "ip6.h"

 
 int
 
 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;
-
-       dp = (struct ip6_rthdr *)bp;
-       ip = (struct ip6_hdr *)bp2;
-       len = dp->ip6r_len;
-
-       /* 'ep' points to the end of avaible data. */
-       ep = snapend;
-
-#if 0
-        printf("%s > %s: ",
-              ip6addr_string(&ip->ip6_src),
-              ip6addr_string(&ip->ip6_dst));
-#endif
+       const struct ip6_rthdr *dp;
+       const struct ip6_rthdr0 *dp0;
+       const u_char *ep;
+       u_int i, len, type;
+       const struct in6_addr *addr;
+
+       dp = (const struct ip6_rthdr *)bp;

 
 

-       TCHECK(dp->ip6r_segleft);
+       /* 'ep' points to the end of available data. */
+       ep = ndo->ndo_snapend;

 
 

-       printf("srcrt (len=%d, ", dp->ip6r_len);
-       printf("type=%d, ", dp->ip6r_type);
-       printf("segleft=%d, ", dp->ip6r_segleft);
+       ND_TCHECK(dp->ip6r_segleft);

 
 

-       switch(dp->ip6r_type) {
+       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)));
+
+       switch (type) {

        case IPV6_RTHDR_TYPE_0:
        case IPV6_RTHDR_TYPE_0:

-               dp0 = (struct ip6_rthdr0 *)dp;
+       case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
+               dp0 = (const struct ip6_rthdr0 *)dp;

 
 

-               TCHECK(dp0->ip6r0_reserved);
-               if (dp0->ip6r0_reserved || vflag) {
-                       printf("rsv=0x%0x, ",
-                               (u_int32_t)ntohl(dp0->ip6r0_reserved));
+               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 (len % 2 == 1)
                        goto trunc;
                len >>= 1;
                }
 
                if (len % 2 == 1)
                        goto trunc;
                len >>= 1;

+               addr = &dp0->ip6r0_addr[0];

                for (i = 0; i < len; i++) {
                for (i = 0; i < len; i++) {

-                       struct in6_addr *addr;
-
-                       addr = ((struct in6_addr *)(dp0 + 1)) + i;
-                       if ((u_char *)addr > ep - sizeof(*addr))
+                       if ((const u_char *)(addr + 1) > ep)

                                goto trunc;
 
                                goto trunc;
 

-                       printf("[%d]%s", i, ip6addr_string((u_char *)addr));
-                       if (i != len - 1)
-                               printf(", ");
-                  
+                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
+                       addr++;

                }
                }

-               printf(")");
-               return((dp0->ip6r0_len + 1) << 3);
+               /*(*/
+               ND_PRINT((ndo, ") "));
+               return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);

                break;
        default:
                goto trunc;
                break;
        default:
                goto trunc;


@@ -116,7 +89,6 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        }
 
  trunc:
        }
 
  trunc:

-       fputs("[|srcrt]", stdout);
-       return 65535;           /* XXX */
+       ND_PRINT((ndo, "[|srcrt]"));
+       return -1;

 }
 }

-#endif /* INET6 */