X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbc1cfa669a5f51ed26bae3784447076e3fbc80f..1ee09c1510704191a14df4eb914dba3d5dc9ab58:/print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 617ddeae..05db9d97 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.34 2003-11-16 09:36:24 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47 2005-04-06 21:32:40 mcr Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -51,8 +51,10 @@ ip6_print(register const u_char *bp, register u_int length)
 {
 	register const struct ip6_hdr *ip6;
 	register int advance;
-	register u_int len;
+	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;
@@ -61,20 +63,56 @@ ip6_print(register const u_char *bp, register u_int length)
 
 	TCHECK(*ip6);
 	if (length < sizeof (struct ip6_hdr)) {
-		(void)printf("truncated-ip6 %d", length);
+		(void)printf("truncated-ip6 %u", length);
 		return;
 	}
-	advance = sizeof(struct ip6_hdr);
 
-	len = EXTRACT_16BITS(&ip6->ip6_plen);
-	if (length < len + advance)
-		(void)printf("truncated-ip6 - %d bytes missing!",
-			len + advance - length);
+        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 - %u bytes missing!",
+			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), 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 < snapend)
+		snapend = ipend;
 
 	cp = (const u_char *)ip6;
+	advance = sizeof(struct ip6_hdr);
 	nh = ip6->ip6_nxt;
-	while (cp < snapend) {
+	while (cp < snapend && advance > 0) {
 		cp += advance;
+		len -= advance;
 
 		if (cp == (const u_char *)(ip6 + 1) &&
 		    nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
@@ -95,38 +133,42 @@ ip6_print(register const u_char *bp, register u_int length)
 		case IPPROTO_FRAGMENT:
 			advance = frag6_print(cp, (const u_char *)ip6);
 			if (snapend <= cp + advance)
-				goto end;
+				return;
 			nh = *cp;
 			fragmented = 1;
 			break;
 
+		case IPPROTO_MOBILITY_OLD:
 		case IPPROTO_MOBILITY:
 			/*
-			 * XXX - we don't use "advance"; is this
-			 * header always a final header?
+			 * 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;
-			goto end;
+			return;
 		case IPPROTO_ROUTING:
 			advance = rt6_print(cp, (const u_char *)ip6);
 			nh = *cp;
 			break;
 		case IPPROTO_SCTP:
-			sctp_print(cp, (const u_char *)ip6, 
-				len + sizeof(struct ip6_hdr) - (cp - bp));
-			goto end;
+			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, fragmented);
-			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, fragmented);
-			goto end;
+			udp_print(cp, len, (const u_char *)ip6, fragmented);
+			return;
 		case IPPROTO_ICMPV6:
-			icmp6_print(cp, (const u_char *)ip6, fragmented);
-			goto end;
+			icmp6_print(cp, len, (const u_char *)ip6, fragmented);
+			return;
 		case IPPROTO_AH:
 			advance = ah_print(cp);
 			nh = *cp;
@@ -134,9 +176,7 @@ ip6_print(register const u_char *bp, register u_int length)
 		case IPPROTO_ESP:
 		    {
 			int enh, padlen;
-			advance = esp_print(cp, (const u_char *)ip6, &enh, &padlen);
-			if (enh < 0)
-				goto end;
+			advance = esp_print(gndo, cp, len, (const u_char *)ip6, &enh, &padlen);
 			nh = enh & 0xff;
 			len -= padlen;
 			break;
@@ -145,64 +185,35 @@ ip6_print(register const u_char *bp, register u_int length)
 		    {
 			int enh;
 			advance = ipcomp_print(cp, &enh);
-			if (enh < 0)
-				goto end;
 			nh = enh & 0xff;
 			break;
 		    }
 
 		case IPPROTO_PIM:
 			pim_print(cp, len);
-			goto end;
+			return;
 		case IPPROTO_OSPF:
 			ospf6_print(cp, len);
-			goto end;
+			return;
 
 		case IPPROTO_IPV6:
 			ip6_print(cp, len);
-			goto end;
+			return;
 
 		case IPPROTO_IPV4:
-			ip_print(cp, len);
-			goto end;
+		        ip_print(gndo, cp, len);
+			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 = EXTRACT_32BITS(&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]");