X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4f56a7066b4c87d609b9772413abc945c88267f4..fb8b947488c7f22b518de1df1a91e663dc7ab33c:/print-ip6.c diff --git a/print-ip6.c b/print-ip6.c index ec964f1f..d1a84985 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -20,8 +20,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.5 2000-04-09 19:15:14 assar Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.43 2004-05-01 10:15:33 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -30,202 +30,193 @@ static const char rcsid[] = #ifdef INET6 -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include #include -#ifdef __STDC__ #include -#endif -#include +#include #include "interface.h" #include "addrtoname.h" +#include "extract.h" -#include +#include "ip6.h" +#include "ipproto.h" /* * print an IP6 datagram. */ void -ip6_print(register const u_char *bp, register int length) +ip6_print(register const u_char *bp, register u_int length) { register const struct ip6_hdr *ip6; - register int hlen; - register int len; + register int advance; + u_int len; + const u_char *ipend; register const u_char *cp; + register u_int payload_len; int nh; + int fragmented = 0; u_int flow; - + ip6 = (const struct ip6_hdr *)bp; -#ifdef TCPDUMP_ALIGN - /* - * The IP header is not word aligned, so copy into abuf. - * This will never happen with BPF. It does happen raw packet - * dumps from -r. - */ - if ((int)ip & (sizeof(long)-1)) { - static u_char *abuf; - - if (abuf == 0) - abuf = (u_char *)malloc(snaplen); - bcopy((char *)ip, (char *)abuf, min(length, snaplen)); - snapend += abuf - (u_char *)ip; - packetp = abuf; - ip = (struct ip6_hdr *)abuf; - } -#endif - if ((u_char *)(ip6 + 1) > snapend) { - printf("[|ip6]"); - return; - } + TCHECK(*ip6); if (length < sizeof (struct ip6_hdr)) { (void)printf("truncated-ip6 %d", length); return; } - hlen = sizeof(struct ip6_hdr); - len = ntohs(ip6->ip6_plen); - if (length < len + hlen) + if (!eflag) + printf("IP6 "); + + payload_len = EXTRACT_16BITS(&ip6->ip6_plen); + len = payload_len + sizeof(struct ip6_hdr); + if (length < len) (void)printf("truncated-ip6 - %d bytes missing!", - len + hlen - length); + len - length); + + if (vflag) { + flow = EXTRACT_32BITS(&ip6->ip6_flow); + printf("("); +#if 0 + /* rfc1883 */ + if (flow & 0x0f000000) + (void)printf("pri 0x%02x, ", (flow & 0x0f000000) >> 24); + if (flow & 0x00ffffff) + (void)printf("flowlabel 0x%06x, ", flow & 0x00ffffff); +#else + /* RFC 2460 */ + if (flow & 0x0ff00000) + (void)printf("class 0x%02x, ", (flow & 0x0ff00000) >> 20); + if (flow & 0x000fffff) + (void)printf("flowlabel 0x%05x, ", flow & 0x000fffff); +#endif + + (void)printf("hlim %u, next-header: %s (%u), payload-len %u) ", + ip6->ip6_hlim, + tok2str(ipproto_values,"unknown",ip6->ip6_nxt), + ip6->ip6_nxt, + payload_len); + } + + /* + * Cut off the snapshot length to the end of the IP payload. + */ + ipend = bp + len; + if (ipend < snapend) + snapend = ipend; cp = (const u_char *)ip6; + advance = sizeof(struct ip6_hdr); nh = ip6->ip6_nxt; - while (cp < snapend) { - cp += hlen; + while (cp < snapend && advance > 0) { + cp += advance; + len -= advance; - if (cp == (u_char *)(ip6 + 1) - && nh != IPPROTO_TCP && nh != IPPROTO_UDP) { + if (cp == (const u_char *)(ip6 + 1) && + nh != IPPROTO_TCP && nh != IPPROTO_UDP && + nh != IPPROTO_SCTP) { (void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src), ip6addr_string(&ip6->ip6_dst)); } switch (nh) { case IPPROTO_HOPOPTS: - hlen = hbhopt_print(cp); + advance = hbhopt_print(cp); nh = *cp; break; case IPPROTO_DSTOPTS: - hlen = dstopt_print(cp); + advance = dstopt_print(cp); nh = *cp; break; case IPPROTO_FRAGMENT: - hlen = frag6_print(cp, (const u_char *)ip6); - if (snapend <= cp + hlen) - goto end; + advance = frag6_print(cp, (const u_char *)ip6); + if (snapend <= cp + advance) + return; nh = *cp; + fragmented = 1; break; + + case IPPROTO_MOBILITY_OLD: + case IPPROTO_MOBILITY: + /* + * XXX - we don't use "advance"; the current + * "Mobility Support in IPv6" draft + * (draft-ietf-mobileip-ipv6-24) says that + * the next header field in a mobility header + * should be IPPROTO_NONE, but speaks of + * the possiblity of a future extension in + * which payload can be piggybacked atop a + * mobility header. + */ + advance = mobility_print(cp, (const u_char *)ip6); + nh = *cp; + return; case IPPROTO_ROUTING: - hlen = rt6_print(cp, (const u_char *)ip6); + advance = rt6_print(cp, (const u_char *)ip6); nh = *cp; break; + case IPPROTO_SCTP: + sctp_print(cp, (const u_char *)ip6, len); + return; case IPPROTO_TCP: - tcp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp), - (const u_char *)ip6); - goto end; + tcp_print(cp, len, (const u_char *)ip6, fragmented); + return; case IPPROTO_UDP: - udp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp), - (const u_char *)ip6); - goto end; + udp_print(cp, len, (const u_char *)ip6, fragmented); + return; case IPPROTO_ICMPV6: - icmp6_print(cp, (const u_char *)ip6); - goto end; + icmp6_print(cp, len, (const u_char *)ip6, fragmented); + return; case IPPROTO_AH: - hlen = ah_print(cp, (const u_char *)ip6); + advance = ah_print(cp); nh = *cp; break; case IPPROTO_ESP: { - int enh; - cp += esp_print(cp, (const u_char *)ip6, &enh); - if (enh < 0) - goto end; + int enh, padlen; + advance = esp_print(gndo, cp, (const u_char *)ip6, &enh, &padlen); nh = enh & 0xff; + len -= padlen; break; } -#ifndef IPPROTO_IPCOMP -#define IPPROTO_IPCOMP 108 -#endif case IPPROTO_IPCOMP: { int enh; - cp += ipcomp_print(cp, (const u_char *)ip6, &enh); - if (enh < 0) - goto end; + advance = ipcomp_print(cp, &enh); nh = enh & 0xff; break; } -#ifndef IPPROTO_PIM -#define IPPROTO_PIM 103 -#endif case IPPROTO_PIM: pim_print(cp, len); - goto end; -#ifndef IPPROTO_OSPF -#define IPPROTO_OSPF 89 -#endif + return; case IPPROTO_OSPF: ospf6_print(cp, len); - goto end; + return; + case IPPROTO_IPV6: ip6_print(cp, len); - goto end; -#ifndef IPPROTO_IPV4 -#define IPPROTO_IPV4 4 -#endif + return; + case IPPROTO_IPV4: ip_print(cp, len); - goto end; + return; + case IPPROTO_NONE: (void)printf("no next header"); - goto end; + return; default: (void)printf("ip-proto-%d %d", ip6->ip6_nxt, len); - goto end; + return; } } - end: - - flow = ntohl(ip6->ip6_flow); -#if 0 - /* rfc1883 */ - if (flow & 0x0f000000) - (void)printf(" [pri 0x%x]", (flow & 0x0f000000) >> 24); - if (flow & 0x00ffffff) - (void)printf(" [flowlabel 0x%x]", flow & 0x00ffffff); -#else - /* RFC 2460 */ - if (flow & 0x0ff00000) - (void)printf(" [class 0x%x]", (flow & 0x0ff00000) >> 20); - if (flow & 0x000fffff) - (void)printf(" [flowlabel 0x%x]", flow & 0x000fffff); -#endif - - if (ip6->ip6_hlim <= 1) - (void)printf(" [hlim %d]", (int)ip6->ip6_hlim); - - if (vflag) { - printf(" ("); - (void)printf("len %d", len); - if (ip6->ip6_hlim > 1) - (void)printf(", hlim %d", (int)ip6->ip6_hlim); - printf(")"); - } + return; +trunc: + (void)printf("[|ip6]"); } #endif /* INET6 */