X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3cd171317f54bc968808d49e3ca87b6c49ccdcdd..refs/pull/482/head:/print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 14a8c5ce..45508ced 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -19,211 +19,245 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.6 2000-07-01 03:39:05 assar Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
+#include <netdissect-stdinc.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <string.h>
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include "netdissect.h"
+#include "addrtoname.h"
+#include "extract.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include "ip6.h"
+#include "ipproto.h"
 
-#include "interface.h"
-#include "addrtoname.h"
+/*
+ * Compute a V6-style checksum by building a pseudoheader.
+ */
+int
+nextproto6_cksum(const struct ip6_hdr *ip6, const uint8_t *data,
+		 u_int len, u_int covlen, u_int next_proto)
+{
+        struct {
+                struct in6_addr ph_src;
+                struct in6_addr ph_dst;
+                uint32_t       ph_len;
+                uint8_t        ph_zero[3];
+                uint8_t        ph_nxt;
+        } ph;
+        struct cksum_vec vec[2];
 
-#include <netinet/ip6.h>
+        /* pseudo-header */
+        memset(&ph, 0, sizeof(ph));
+        UNALIGNED_MEMCPY(&ph.ph_src, &ip6->ip6_src, sizeof (struct in6_addr));
+        UNALIGNED_MEMCPY(&ph.ph_dst, &ip6->ip6_dst, sizeof (struct in6_addr));
+        ph.ph_len = htonl(len);
+        ph.ph_nxt = next_proto;
+
+        vec[0].ptr = (const uint8_t *)(void *)&ph;
+        vec[0].len = sizeof(ph);
+        vec[1].ptr = data;
+        vec[1].len = covlen;
+
+        return in_cksum(vec, 2);
+}
 
 /*
  * print an IP6 datagram.
  */
 void
-ip6_print(register const u_char *bp, register int length)
+ip6_print(netdissect_options *ndo, const u_char *bp, 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;
-	}
+	ND_TCHECK(*ip6);
 	if (length < sizeof (struct ip6_hdr)) {
-		(void)printf("truncated-ip6 %d", length);
+		ND_PRINT((ndo, "truncated-ip6 %u", length));
 		return;
 	}
-	hlen = sizeof(struct ip6_hdr);
 
-	len = ntohs(ip6->ip6_plen);
-	if (length < len + hlen)
-		(void)printf("truncated-ip6 - %d bytes missing!",
-			len + hlen - length);
+        if (!ndo->ndo_eflag)
+            ND_PRINT((ndo, "IP6 "));
+
+	if (IP6_VERSION(ip6) != 6) {
+          ND_PRINT((ndo,"version error: %u != 6", IP6_VERSION(ip6)));
+          return;
+	}
+
+	payload_len = EXTRACT_16BITS(&ip6->ip6_plen);
+	len = payload_len + sizeof(struct ip6_hdr);
+	if (length < len)
+		ND_PRINT((ndo, "truncated-ip6 - %u bytes missing!",
+			len - length));
+
+        if (ndo->ndo_vflag) {
+            flow = EXTRACT_32BITS(&ip6->ip6_flow);
+            ND_PRINT((ndo, "("));
+#if 0
+            /* rfc1883 */
+            if (flow & 0x0f000000)
+		ND_PRINT((ndo, "pri 0x%02x, ", (flow & 0x0f000000) >> 24));
+            if (flow & 0x00ffffff)
+		ND_PRINT((ndo, "flowlabel 0x%06x, ", flow & 0x00ffffff));
+#else
+            /* RFC 2460 */
+            if (flow & 0x0ff00000)
+		ND_PRINT((ndo, "class 0x%02x, ", (flow & 0x0ff00000) >> 20));
+            if (flow & 0x000fffff)
+		ND_PRINT((ndo, "flowlabel 0x%05x, ", flow & 0x000fffff));
+#endif
+
+            ND_PRINT((ndo, "hlim %u, next-header %s (%u) payload length: %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 < ndo->ndo_snapend)
+		ndo->ndo_snapend = ipend;
 
 	cp = (const u_char *)ip6;
+	advance = sizeof(struct ip6_hdr);
 	nh = ip6->ip6_nxt;
-	while (cp < snapend) {
-		cp += hlen;
+	while (cp < ndo->ndo_snapend && advance > 0) {
+		cp += advance;
+		len -= advance;
 
-		if (cp == (u_char *)(ip6 + 1)
-		 && nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
-			(void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
-				     ip6addr_string(&ip6->ip6_dst));
+		if (cp == (const u_char *)(ip6 + 1) &&
+		    nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
+		    nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) {
+			ND_PRINT((ndo, "%s > %s: ", ip6addr_string(ndo, &ip6->ip6_src),
+				     ip6addr_string(ndo, &ip6->ip6_dst)));
 		}
 
 		switch (nh) {
 		case IPPROTO_HOPOPTS:
-			hlen = hbhopt_print(cp);
+			advance = hbhopt_print(ndo, cp);
 			nh = *cp;
 			break;
 		case IPPROTO_DSTOPTS:
-			hlen = dstopt_print(cp);
+			advance = dstopt_print(ndo, cp);
 			nh = *cp;
 			break;
 		case IPPROTO_FRAGMENT:
-			hlen = frag6_print(cp, (const u_char *)ip6);
-			if (snapend <= cp + hlen)
-				goto end;
+			advance = frag6_print(ndo, cp, (const u_char *)ip6);
+			if (ndo->ndo_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(ndo, cp, (const u_char *)ip6);
+			nh = *cp;
+			return;
 		case IPPROTO_ROUTING:
-			hlen = rt6_print(cp, (const u_char *)ip6);
+			advance = rt6_print(ndo, cp, (const u_char *)ip6);
 			nh = *cp;
 			break;
+		case IPPROTO_SCTP:
+			sctp_print(ndo, cp, (const u_char *)ip6, len);
+			return;
+		case IPPROTO_DCCP:
+			dccp_print(ndo, 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(ndo, 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(ndo, cp, len, (const u_char *)ip6, fragmented);
+			return;
 		case IPPROTO_ICMPV6:
-			icmp6_print(cp, (const u_char *)ip6);
-			goto end;
+			icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
+			return;
 		case IPPROTO_AH:
-			hlen = ah_print(cp, (const u_char *)ip6);
+			advance = ah_print(ndo, 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(ndo, cp, len, (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(ndo, 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
+			pim_print(ndo, cp, len, (const u_char *)ip6);
+			return;
+
 		case IPPROTO_OSPF:
-			ospf6_print(cp, len);
-			goto end;
+			ospf6_print(ndo, cp, len);
+			return;
+
 		case IPPROTO_IPV6:
-			ip6_print(cp, len);
-			goto end;
-#ifndef IPPROTO_IPV4
-#define IPPROTO_IPV4	4
-#endif
+			ip6_print(ndo, cp, len);
+			return;
+
 		case IPPROTO_IPV4:
-			ip_print(cp, len);
-			goto end;
+		        ip_print(ndo, cp, len);
+			return;
+
+                case IPPROTO_PGM:
+                        pgm_print(ndo, cp, len, (const u_char *)ip6);
+                        return;
+
+		case IPPROTO_GRE:
+			gre_print(ndo, cp, len);
+			return;
+
+		case IPPROTO_RSVP:
+			rsvp_print(ndo, cp, len);
+			return;
+
 		case IPPROTO_NONE:
-			(void)printf("no next header");
-			goto end;
+			ND_PRINT((ndo, "no next header"));
+			return;
 
 		default:
-			(void)printf("ip-proto-%d %d", ip6->ip6_nxt, len);
-			goto end;
+			ND_PRINT((ndo, "ip-proto-%d %d", nh, len));
+			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:
+	ND_PRINT((ndo, "[|ip6]"));
 }
-
-#endif /* INET6 */