X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0bda4e776bffcd346d9bc346ca770275b64193ec..2bb115bda1b3a404f9e4535d69b83e893d210bd6:/print-ip.c

diff --git a/print-ip.c b/print-ip.c
index cb775f48..b05088d3 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.124 2003-05-15 16:58:04 hannes Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.147 2005-01-21 08:02:06 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -39,39 +39,48 @@ static const char rcsid[] =
 #include "extract.h"			/* must come after interface.h */
 
 #include "ip.h"
-
-/* Compatibility */
-#ifndef	IPPROTO_ND
-#define	IPPROTO_ND	77
-#endif
+#include "ipproto.h"
+
+struct tok ip_option_values[] = {
+    { IPOPT_EOL, "EOL" },
+    { IPOPT_NOP, "NOP" },
+    { IPOPT_TS, "timestamp" },
+    { IPOPT_SECURITY, "security" },
+    { IPOPT_RR, "RR" },
+    { IPOPT_SSRR, "SSRR" },
+    { IPOPT_LSRR, "LSRR" },
+    { IPOPT_RA, "RA" },
+    { 0, NULL }
+};
 
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
 static void
-ip_printroute(const char *type, register const u_char *cp, u_int length)
+ip_printroute(register const u_char *cp, u_int length)
 {
-	register u_int ptr = cp[2] - 1;
+	register u_int ptr;
 	register u_int len;
 
-	printf(" %s{", type);
+	if (length < 3) {
+		printf(" [bad length %u]", length);
+		return;
+	}
 	if ((length + 1) & 3)
-		printf(" [bad length %d]", length);
+		printf(" [bad length %u]", length);
+	ptr = cp[2] - 1;
 	if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
-		printf(" [bad ptr %d]", cp[2]);
+		printf(" [bad ptr %u]", cp[2]);
 
-	type = "";
 	for (len = 3; len < length; len += 4) {
-		if (ptr == len)
-			type = "#";
-		printf("%s%s", type, ipaddr_string(&cp[len]));
-		type = " ";
+		printf("%s", ipaddr_string(&cp[len]));
+                if (ptr > len)
+                    printf (", ");
 	}
-	printf("%s}", ptr == len? "#" : "");
 }
 
 /*
- * If source-routing is present, return the final destination.
+ * If source-routing is present and valid, return the final destination.
  * Otherwise, return IP destination.
  *
  * This is used for UDP and TCP pseudo-header in the checksum
@@ -89,45 +98,54 @@ ip_finddst(const struct ip *ip)
 	length = (IP_HL(ip) << 2) - sizeof(struct ip);
 
 	for (; length > 0; cp += len, length -= len) {
-		int tt = *cp;
+		int tt;
 
-		if (tt == IPOPT_NOP || tt == IPOPT_EOL)
+		TCHECK(*cp);
+		tt = *cp;
+		if (tt == IPOPT_EOL)
+			break;
+		else if (tt == IPOPT_NOP)
 			len = 1;
 		else {
-			if (&cp[1] >= snapend) {
-				return 0;
-			}
+			TCHECK(cp[1]);
 			len = cp[1];
+			if (len < 2)
+				break;
 		}
-		if (len <= 0) {
-			return 0;
-		}
-		if (&cp[1] >= snapend || cp + len > snapend) {
-			return 0;
-		}
+		TCHECK2(*cp, len);
 		switch (tt) {
 
 		case IPOPT_SSRR:
 		case IPOPT_LSRR:
+			if (len < 7)
+				break;
 			memcpy(&retval, cp + len - 4, 4);
 			return retval;
 		}
 	}
-	return ip->ip_dst.s_addr;
+trunc:
+	memcpy(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+	return retval;
 }
 
 static void
 ip_printts(register const u_char *cp, u_int length)
 {
-	register u_int ptr = cp[2] - 1;
-	register u_int len = 0;
+	register u_int ptr;
+	register u_int len;
 	int hoplen;
 	const char *type;
 
+	if (length < 4) {
+		printf("[bad length %d]", length);
+		return;
+	}
 	printf(" TS{");
 	hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
 	if ((length - 4) & (hoplen-1))
 		printf("[bad length %d]", length);
+	ptr = cp[2] - 1;
+	len = 0;
 	if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
 		printf("[bad ptr %d]", cp[2]);
 	switch (cp[3]&0xF) {
@@ -178,79 +196,63 @@ done:
 static void
 ip_optprint(register const u_char *cp, u_int length)
 {
-	register u_int len;
+	register u_int option_len;
 
-	for (; length > 0; cp += len, length -= len) {
-		int tt = *cp;
+	for (; length > 0; cp += option_len, length -= option_len) {
+		u_int option_code;
+
+		TCHECK(*cp);
+		option_code = *cp;
+
+		if (option_code == IPOPT_NOP ||
+                    option_code == IPOPT_EOL)
+			option_len = 1;
 
-		if (tt == IPOPT_NOP || tt == IPOPT_EOL)
-			len = 1;
 		else {
-			if (&cp[1] >= snapend) {
-				printf("[|ip]");
-				return;
-			}
-			len = cp[1];
-		}
-		if (len <= 0) {
-			printf("[|ip op len %d]", len);
-			return;
-		}
-		if (&cp[1] >= snapend || cp + len > snapend) {
-			printf("[|ip]");
-			return;
+			TCHECK(cp[1]);
+			option_len = cp[1];			
 		}
-		switch (tt) {
 
-		case IPOPT_EOL:
-			printf(" EOL");
-			if (length > 1)
-				printf("-%d", length - 1);
-			return;
+                printf("%s (%u) len %u",
+                       tok2str(ip_option_values,"unknown",option_code),
+                       option_code,
+                       option_len);
 
-		case IPOPT_NOP:
-			printf(" NOP");
-			break;
+                if (option_len < 2)
+                        return;
 
-		case IPOPT_TS:
-			ip_printts(cp, len);
-			break;
+                TCHECK2(*cp, option_len);
 
-#ifndef IPOPT_SECURITY
-#define IPOPT_SECURITY 130
-#endif /* IPOPT_SECURITY */
-		case IPOPT_SECURITY:
-			printf(" SECURITY{%d}", len);
-			break;
+		switch (option_code) {
+		case IPOPT_EOL:
+			return;
 
-		case IPOPT_RR:
-			ip_printroute("RR", cp, len);
+		case IPOPT_TS:
+			ip_printts(cp, option_len);
 			break;
 
+		case IPOPT_RR:       /* fall through */
 		case IPOPT_SSRR:
-			ip_printroute("SSRR", cp, len);
-			break;
-
 		case IPOPT_LSRR:
-			ip_printroute("LSRR", cp, len);
+			ip_printroute( cp, option_len);
 			break;
 
-#ifndef IPOPT_RA
-#define IPOPT_RA 148		/* router alert */
-#endif
 		case IPOPT_RA:
-			printf(" RA");
-			if (len != 4)
-				printf("{%d}", len);
-			else if (cp[2] || cp[3])
-				printf("%d.%d", cp[2], cp[3]);
+                        TCHECK(cp[3]);
+                        if (EXTRACT_16BITS(&cp[2]) != 0)
+                            printf("value %u", EXTRACT_16BITS(&cp[2]));
 			break;
 
+		case IPOPT_NOP:       /* nothing to print - fall through */
+		case IPOPT_SECURITY:
 		default:
-			printf(" IPOPT-%d{%d}", cp[0], len);
 			break;
 		}
 	}
+	return;
+
+trunc:
+	printf("[|ip]");
 }
 
 /*
@@ -361,37 +363,65 @@ void
 ip_print(register const u_char *bp, register u_int length)
 {
 	register const struct ip *ip;
-	register u_int hlen, len, len0, off;
+	register u_int hlen, len, off;
+	const u_char *ipend;
 	register const u_char *cp;
 	u_char nh;
 	int advance;
 	struct protoent *proto;
 	u_int16_t sum, ip_sum;
-	const char *sep = "";
-
-	printf("IP%s ", (((*bp >> 4) & 0xf) == 4) ? "" : "4"); /* print version if != 4 */
 
 	ip = (const struct ip *)bp;
+	if (IP_V(ip) != 4) { /* print version if != 4 */
+	    printf("IP%u ", IP_V(ip));
+	    if (IP_V(ip) == 6)
+		printf(", wrong link-layer encapsulation");
+	}
+        else if (!eflag)
+	    printf("IP ");
+
 	if ((u_char *)(ip + 1) > snapend) {
 		printf("[|ip]");
 		return;
 	}
 	if (length < sizeof (struct ip)) {
-		(void)printf("truncated-ip %d", length);
+		(void)printf("truncated-ip %u", length);
 		return;
 	}
 	hlen = IP_HL(ip) * 4;
 	if (hlen < sizeof (struct ip)) {
-		(void)printf("bad-hlen %d", hlen);
+		(void)printf("bad-hlen %u", hlen);
 		return;
 	}
 
 	len = EXTRACT_16BITS(&ip->ip_len);
 	if (length < len)
-		(void)printf("truncated-ip - %d bytes missing! ",
+		(void)printf("truncated-ip - %u bytes missing! ",
 			len - length);
+	if (len < hlen) {
+#ifdef GUESS_TSO
+            if (len) {
+                (void)printf("bad-len %u", len);
+                return;
+            }
+            else {
+                /* we guess that it is a TSO send */
+                len = length;
+            }
+#else
+            (void)printf("bad-len %u", len);
+            return;
+#endif /* GUESS_TSO */
+	}
+
+	/*
+	 * Cut off the snapshot length to the end of the IP payload.
+	 */
+	ipend = bp + len;
+	if (ipend < snapend)
+		snapend = ipend;
+
 	len -= hlen;
-	len0 = len;
 
 	off = EXTRACT_16BITS(&ip->ip_off);
 
@@ -420,15 +450,17 @@ ip_print(register const u_char *bp, register u_int length)
 	     * For unfragmented datagrams, note the don't fragment flag.
 	     */
 
-	    (void)printf(", id %u, offset %u, flags [%s]",
-			     EXTRACT_16BITS(&ip->ip_id),
-			     (off & 0x1fff) * 8,
-			     bittok2str(ip_frag_values, "none", off & 0xe000 ));
+	    (void)printf(", id %u, offset %u, flags [%s], proto: %s (%u)",
+                         EXTRACT_16BITS(&ip->ip_id),
+                         (off & 0x1fff) * 8,
+                         bittok2str(ip_frag_values, "none", off & 0xe000 ),
+                         tok2str(ipproto_values,"unknown",ip->ip_p),
+                         ip->ip_p);
 
             (void)printf(", length: %u", EXTRACT_16BITS(&ip->ip_len));
 
             if ((hlen - sizeof(struct ip)) > 0) {
-                (void)printf(", optlength: %u (", hlen - (u_int)sizeof(struct ip));
+                printf(", options ( ");
                 ip_optprint((u_char *)(ip + 1), hlen - sizeof(struct ip));
                 printf(" )");
             }
@@ -437,10 +469,8 @@ ip_print(register const u_char *bp, register u_int length)
 	        sum = in_cksum((const u_short *)ip, hlen, 0);
 		if (sum != 0) {
 		    ip_sum = EXTRACT_16BITS(&ip->ip_sum);
-		    (void)printf("%sbad cksum %x (->%x)!", sep,
-			     ip_sum,
+		    (void)printf(", bad cksum %x (->%x)!", ip_sum,
 			     in_cksum_shouldbe(ip_sum, sum));
-		    sep = ", ";
 		}
 	    }
 
@@ -455,9 +485,6 @@ ip_print(register const u_char *bp, register u_int length)
 		cp = (const u_char *)ip + hlen;
 		nh = ip->ip_p;
 
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
 		if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
 		    nh != IPPROTO_SCTP) {
 			(void)printf("%s > %s: ", ipaddr_string(&ip->ip_src),
@@ -466,42 +493,35 @@ ip_print(register const u_char *bp, register u_int length)
 again:
 		switch (nh) {
 
-#ifndef IPPROTO_AH
-#define IPPROTO_AH	51
-#endif
 		case IPPROTO_AH:
 			nh = *cp;
 			advance = ah_print(cp);
+			if (advance <= 0)
+				break;
 			cp += advance;
 			len -= advance;
 			goto again;
 
-#ifndef IPPROTO_ESP
-#define IPPROTO_ESP	50
-#endif
 		case IPPROTO_ESP:
 		    {
 			int enh, padlen;
-			advance = esp_print(cp, (const u_char *)ip, &enh, &padlen);
+			advance = esp_print(gndo, cp, len, (const u_char *)ip, &enh, &padlen);
+			if (advance <= 0)
+				break;
 			cp += advance;
 			len -= advance + padlen;
-			if (enh < 0)
-				break;
 			nh = enh & 0xff;
 			goto again;
 		    }
 
-#ifndef IPPROTO_IPCOMP
-#define IPPROTO_IPCOMP	108
-#endif
 		case IPPROTO_IPCOMP:
 		    {
 			int enh;
 			advance = ipcomp_print(cp, &enh);
+			if (advance <= 0)
+				break;
 			cp += advance;
 			len -= advance;
-			if (enh < 0)
-				break;
 			nh = enh & 0xff;
 			goto again;
 		    }
@@ -523,36 +543,44 @@ again:
 			icmp_print(cp, len, (const u_char *)ip, (off & 0x3fff));
 			break;
 
-#ifndef IPPROTO_IGRP
-#define IPPROTO_IGRP 9
-#endif
-		case IPPROTO_IGRP:
+		case IPPROTO_PIGP:
+			/*
+			 * XXX - the current IANA protocol number assignments
+			 * page lists 9 as "any private interior gateway
+			 * (used by Cisco for their IGRP)" and 88 as
+			 * "EIGRP" from Cisco.
+			 *
+			 * Recent BSD <netinet/in.h> headers define
+			 * IP_PROTO_PIGP as 9 and IP_PROTO_IGRP as 88.
+			 * We define IP_PROTO_PIGP as 9 and
+			 * IP_PROTO_EIGRP as 88; those names better
+			 * match was the current protocol number
+			 * assignments say.
+			 */
 			igrp_print(cp, len, (const u_char *)ip);
 			break;
 
+		case IPPROTO_EIGRP:
+			eigrp_print(cp, len);
+			break;
+
 		case IPPROTO_ND:
 			(void)printf(" nd %d", len);
 			break;
 
 		case IPPROTO_EGP:
-			egp_print(cp);
+			egp_print(cp, len);
 			break;
 
-#ifndef IPPROTO_OSPF
-#define IPPROTO_OSPF 89
-#endif
 		case IPPROTO_OSPF:
 			ospf_print(cp, len, (const u_char *)ip);
 			break;
 
-#ifndef IPPROTO_IGMP
-#define IPPROTO_IGMP 2
-#endif
 		case IPPROTO_IGMP:
 			igmp_print(cp, len);
 			break;
 
-		case 4:
+		case IPPROTO_IPV4:
 			/* DVMRP multicast tunnel (ip-in-ip encapsulation) */
 			ip_print(cp, len);
 			if (! vflag) {
@@ -562,47 +590,29 @@ again:
 			break;
 
 #ifdef INET6
-#ifndef IP6PROTO_ENCAP
-#define IP6PROTO_ENCAP 41
-#endif
-		case IP6PROTO_ENCAP:
+		case IPPROTO_IPV6:
 			/* ip6-in-ip encapsulation */
 			ip6_print(cp, len);
 			break;
 #endif /*INET6*/
 
-#ifndef IPPROTO_RSVP
-#define IPPROTO_RSVP 46
-#endif
 		case IPPROTO_RSVP:
 			rsvp_print(cp, len);
 			break;
 
-#ifndef IPPROTO_GRE
-#define IPPROTO_GRE 47
-#endif
 		case IPPROTO_GRE:
 			/* do it */
 			gre_print(cp, len);
 			break;
 
-#ifndef IPPROTO_MOBILE
-#define IPPROTO_MOBILE 55
-#endif
 		case IPPROTO_MOBILE:
 			mobile_print(cp, len);
 			break;
 
-#ifndef IPPROTO_PIM
-#define IPPROTO_PIM	103
-#endif
 		case IPPROTO_PIM:
 			pim_print(cp, len);
 			break;
 
-#ifndef IPPROTO_VRRP
-#define IPPROTO_VRRP	112
-#endif
 		case IPPROTO_VRRP:
 			vrrp_print(cp, len, ip->ip_ttl);
 			break;