Get rid of unneeded includes of <netinet/in_systm.h> and <netinet/ip.h>.

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index ecf58f1a2fb2f55f48454e54b61aae81a2bc853a..8b249788213acea2b7f45d64c2f142165fe105b7 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.8 2000-05-10 05:13:20 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.18 2001-06-15 22:17:34 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,21 +35,12 @@ static const char rcsid[] =
 #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 <netinet/ip6.h>
+#include "ip6.h"
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -62,20 +53,15 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        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 avaible data. */
+       /* 'ep' points to the end of available data. */
        ep = snapend;
 
-#if 0
-       printf("%s > %s: ",
-              ip6addr_string(&ip->ip6_src),
-              ip6addr_string(&ip->ip6_dst));
-#endif
-
        TCHECK(dp->ip6r_segleft);
 
        printf("srcrt (len=%d", dp->ip6r_len);  /*)*/
@@ -83,6 +69,9 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        printf(", segleft=%d", dp->ip6r_segleft);
 
        switch (dp->ip6r_type) {
+#ifndef IPV6_RTHDR_TYPE_0
+#define IPV6_RTHDR_TYPE_0 0
+#endif
        case IPV6_RTHDR_TYPE_0:
                dp0 = (struct ip6_rthdr0 *)dp;
 
@@ -95,14 +84,13 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
                if (len % 2 == 1)
                        goto trunc;
                len >>= 1;
+               addr = &dp0->ip6r0_addr[0];
                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;
-
-                       printf(", [%d]%s", i, ip6addr_string((u_char *)addr));
+               
+                       printf(", [%d]%s", i, ip6addr_string(addr));
+                       addr++;
                }
                /*(*/
                printf(") ");