diff options
| author | fenner <fenner@FreeBSD.org> | 2001-04-03 07:45:48 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2001-04-03 07:45:48 +0000 |
| commit | ace14a2b50f2cc05c079d0b9137b49066dbb1206 (patch) | |
| tree | 4953fdd47c44b8ec88d34a4db7b698841365e22f /contrib/tcpdump/print-rt6.c | |
| parent | 54c4a9c9f2aca2e032cbf41f5eb012e2e9628dd4 (diff) | |
| download | FreeBSD-src-ace14a2b50f2cc05c079d0b9137b49066dbb1206.zip FreeBSD-src-ace14a2b50f2cc05c079d0b9137b49066dbb1206.tar.gz | |
Virgin import of tcpdump.org tcpdump v3.6.2
Diffstat (limited to 'contrib/tcpdump/print-rt6.c')
| -rw-r--r-- | contrib/tcpdump/print-rt6.c | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/contrib/tcpdump/print-rt6.c b/contrib/tcpdump/print-rt6.c index f8a7fcb..ea464e2 100644 --- a/contrib/tcpdump/print-rt6.c +++ b/contrib/tcpdump/print-rt6.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.3.2.1 2000/01/11 06:58:26 fenner Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.17 2000/12/13 07:57:05 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" @@ -62,50 +53,53 @@ 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; - printf("%s > %s: ", +#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); - 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) 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)); - if (i != len - 1) - printf(", "); - + + printf(", [%d]%s", i, ip6addr_string(addr)); + addr++; } - printf(")"); + /*(*/ + printf(") "); return((dp0->ip6r0_len + 1) << 3); break; default: |
