Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 8b249788213acea2b7f45d64c2f142165fe105b7..0ba3ba6616e381e31afe934cf7e247dc2d24ca28 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,66 +19,52 @@
  * 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.18 2001-06-15 22:17:34 fenner 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 <netdissect-stdinc.h>

 
 

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

 
 

-#include <stdio.h>
+#include "netdissect.h"
+#include "addrtoname.h"
+#include "extract.h"

 
 #include "ip6.h"
 
 
 #include "ip6.h"
 

-#include "interface.h"
-#include "addrtoname.h"
-

 int
 int

-rt6_print(register const u_char *bp, register const u_char *bp2)
+rt6_print(netdissect_options *ndo, register 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_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;
 
        register const u_char *ep;
        int i, len;
        register 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' points to the end of available data. */

-       ep = snapend;
+       ep = ndo->ndo_snapend;

 
 

-       TCHECK(dp->ip6r_segleft);
+       ND_TCHECK(dp->ip6r_segleft);

 
 

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

 
        switch (dp->ip6r_type) {
 
        switch (dp->ip6r_type) {

-#ifndef IPV6_RTHDR_TYPE_0
-#define IPV6_RTHDR_TYPE_0 0
-#endif

        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)
                }
 
                if (len % 2 == 1)


@@ -86,14 +72,14 @@ 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++) {
                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;
                                goto trunc;

-               
-                       printf(", [%d]%s", i, ip6addr_string(addr));
+
+                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));

                        addr++;
                }
                /*(*/
                        addr++;
                }
                /*(*/

-               printf(") ");
+               ND_PRINT((ndo, ") "));

                return((dp0->ip6r0_len + 1) << 3);
                break;
        default:
                return((dp0->ip6r0_len + 1) << 3);
                break;
        default:


@@ -102,7 +88,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 */