More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index adfe1249b0b4471219a64d9b74178bbd288e3a40..b3064eb8624a85695005024e6226530f9d3bf747 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,95 +19,73 @@
  * 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.7 2000-04-24 12:59:40 itojun Exp $";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef INET6
 
 #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 <tcpdump-stdinc.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

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

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

+#include "extract.h"

 
 int
 
 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_rthdr *dp;
        register const struct ip6_rthdr0 *dp0;

-       register const struct ip6_hdr *ip;

        register const u_char *ep;
        int i, len;
        register const u_char *ep;
        int i, len;

+       register const struct in6_addr *addr;

 
        dp = (struct ip6_rthdr *)bp;
 
        dp = (struct ip6_rthdr *)bp;

-       ip = (struct ip6_hdr *)bp2;

        len = dp->ip6r_len;
 
        len = dp->ip6r_len;
 

-       /* 'ep' points to the end of avaible data. */
+       /* 'ep' points to the end of available data. */

        ep = snapend;
 
        ep = snapend;
 

-#if 0
-       printf("%s > %s: ",
-              ip6addr_string(&ip->ip6_src),
-              ip6addr_string(&ip->ip6_dst));
-#endif
-

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

-       printf("srcrt (len=%d, ", dp->ip6r_len);
-       printf("type=%d, ", dp->ip6r_type);
-       printf("segleft=%d, ", dp->ip6r_segleft);
+       printf("srcrt (len=%d", dp->ip6r_len);  /*)*/
+       printf(", type=%d", dp->ip6r_type);
+       printf(", 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
+#ifndef IPV6_RTHDR_TYPE_2
+#define IPV6_RTHDR_TYPE_2 2
+#endif

        case IPV6_RTHDR_TYPE_0:
        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) {
                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));
+                       printf(", rsv=0x%0x",
+                           EXTRACT_32BITS(&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 ((u_char *)(addr + 1) > ep)

                                goto trunc;
 
                                goto trunc;
 

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

                }
                }

-               printf(")");
+               /*(*/
+               printf(") ");

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


@@ -117,6 +95,6 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
 
  trunc:
        fputs("[|srcrt]", stdout);
 
  trunc:
        fputs("[|srcrt]", stdout);

-       return 65535;           /* XXX */
+       return -1;

 }
 #endif /* INET6 */
 }
 #endif /* INET6 */