Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 8b249788213acea2b7f45d64c2f142165fe105b7..dc196b4e766a7e16125bc7111b936b6d879a6d4d 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.18 2001-06-15 22:17:34 fenner Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.27 2005-04-20 22:34:57 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -30,13 +30,7 @@ static const char rcsid[] =
 
 #ifdef INET6
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 
@@ -44,19 +38,18 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 
 int
-rt6_print(register const u_char *bp, register const u_char *bp2)
+rt6_print(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_hdr *ip;
        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;
 
        /* 'ep' points to the end of available data. */
@@ -71,14 +64,18 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        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
        case IPV6_RTHDR_TYPE_0:
+       case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
                dp0 = (struct ip6_rthdr0 *)dp;
 
                TCHECK(dp0->ip6r0_reserved);
                if (dp0->ip6r0_reserved || vflag) {
                        printf(", rsv=0x%0x",
-                           (u_int32_t)ntohl(dp0->ip6r0_reserved));
+                           EXTRACT_32BITS(&dp0->ip6r0_reserved));
                }
 
                if (len % 2 == 1)
@@ -88,7 +85,7 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
                for (i = 0; i < len; i++) {
                        if ((u_char *)(addr + 1) > ep)
                                goto trunc;
-               
+
                        printf(", [%d]%s", i, ip6addr_string(addr));
                        addr++;
                }
@@ -103,6 +100,6 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
 
  trunc:
        fputs("[|srcrt]", stdout);
-       return 65535;           /* XXX */
+       return -1;
 }
 #endif /* INET6 */