Allow tcpdump to work with earlier libpcaps.

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index e23d61f2f3a040d677a7699b6501b49402d68167..122531374f5ef01c23eb288682438d2ecff1fca6 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.5 2000-04-20 15:49:57 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.16 2000-10-07 05:53:13 itojun 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"
@@ -67,29 +58,32 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        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: ",
+       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);
-       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
        case IPV6_RTHDR_TYPE_0:
                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",
+                           (u_int32_t)ntohl(dp0->ip6r0_reserved));
                }
 
                if (len % 2 == 1)
@@ -102,12 +96,10 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
                        if ((u_char *)addr > ep - sizeof(*addr))
                                goto trunc;
 
-                       printf("[%d]%s", i, ip6addr_string((u_char *)addr));
-                       if (i != len - 1)
-                               printf(", ");
-                  
+                       printf(", [%d]%s", i, ip6addr_string((u_char *)addr));
                }
-               printf(")");
+               /*(*/
+               printf(") ");
                return((dp0->ip6r0_len + 1) << 3);
                break;
        default: