X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bef667db65b15c89ec6f1cf325b76acd3c0b8748..refs/heads/mcr-macro-update-1:/print-icmp.c

diff --git a/print-icmp.c b/print-icmp.c
index 0f0e7a10..dd767eba 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -202,42 +202,6 @@ static const struct tok icmp2str[] = {
 	{ 0,				NULL }
 };
 
-/* Formats for most of the ICMP_UNREACH codes */
-static const struct tok unreach2str[] = {
-	{ ICMP_UNREACH_NET,		"net %s unreachable" },
-	{ ICMP_UNREACH_HOST,		"host %s unreachable" },
-	{ ICMP_UNREACH_SRCFAIL,
-	    "%s unreachable - source route failed" },
-	{ ICMP_UNREACH_NET_UNKNOWN,	"net %s unreachable - unknown" },
-	{ ICMP_UNREACH_HOST_UNKNOWN,	"host %s unreachable - unknown" },
-	{ ICMP_UNREACH_ISOLATED,
-	    "%s unreachable - source host isolated" },
-	{ ICMP_UNREACH_NET_PROHIB,
-	    "net %s unreachable - admin prohibited" },
-	{ ICMP_UNREACH_HOST_PROHIB,
-	    "host %s unreachable - admin prohibited" },
-	{ ICMP_UNREACH_TOSNET,
-	    "net %s unreachable - tos prohibited" },
-	{ ICMP_UNREACH_TOSHOST,
-	    "host %s unreachable - tos prohibited" },
-	{ ICMP_UNREACH_FILTER_PROHIB,
-	    "host %s unreachable - admin prohibited filter" },
-	{ ICMP_UNREACH_HOST_PRECEDENCE,
-	    "host %s unreachable - host precedence violation" },
-	{ ICMP_UNREACH_PRECEDENCE_CUTOFF,
-	    "host %s unreachable - precedence cutoff" },
-	{ 0,				NULL }
-};
-
-/* Formats for the ICMP_REDIRECT codes */
-static const struct tok type2str[] = {
-	{ ICMP_REDIRECT_NET,		"redirect %s to net %s" },
-	{ ICMP_REDIRECT_HOST,		"redirect %s to host %s" },
-	{ ICMP_REDIRECT_TOSNET,		"redirect-tos %s to net %s" },
-	{ ICMP_REDIRECT_TOSHOST,	"redirect-tos %s to host %s" },
-	{ 0,				NULL }
-};
-
 /* rfc1191 */
 struct mtu_discovery {
 	nd_uint16_t unused;
@@ -322,7 +286,7 @@ icmp_tstamp_print(u_int tstamp)
     sec = tstamp / 1000;
     min = sec / 60; sec -= min * 60;
     hrs = min / 60; min -= hrs * 60;
-    nd_snprintf(buf, sizeof(buf), "%02u:%02u:%02u.%03u",hrs,min,sec,msec);
+    snprintf(buf, sizeof(buf), "%02u:%02u:%02u.%03u",hrs,min,sec,msec);
     return buf;
 }
 
@@ -335,7 +299,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 	uint8_t icmp_type, icmp_code;
         const struct icmp_ext_t *ext_dp;
 	const struct ip *ip;
-	const char *str, *fmt;
+	const char *str;
 	const struct ip *oip;
 	uint8_t ip_proto;
 	const struct udphdr *ouh;
@@ -354,15 +318,13 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 	ip = (const struct ip *)bp2;
 	str = buf;
 
-	ND_TCHECK_1(dp->icmp_code);
 	icmp_type = GET_U_1(dp->icmp_type);
 	icmp_code = GET_U_1(dp->icmp_code);
 	switch (icmp_type) {
 
 	case ICMP_ECHO:
 	case ICMP_ECHOREPLY:
-		ND_TCHECK_2(dp->icmp_seq);
-		(void)nd_snprintf(buf, sizeof(buf), "echo %s, id %u, seq %u",
+		(void)snprintf(buf, sizeof(buf), "echo %s, id %u, seq %u",
                                icmp_type == ICMP_ECHO ?
                                "request" : "reply",
                                GET_BE_U_2(dp->icmp_id),
@@ -370,14 +332,24 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 		break;
 
 	case ICMP_UNREACH:
-		ND_TCHECK_4(dp->icmp_ip.ip_dst);
 		switch (icmp_code) {
 
+		case ICMP_UNREACH_NET:
+			(void)snprintf(buf, sizeof(buf),
+			    "net %s unreachable",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_HOST:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
 		case ICMP_UNREACH_PROTOCOL:
-			ND_TCHECK_1(dp->icmp_ip.ip_p);
-			(void)nd_snprintf(buf, sizeof(buf),
+			(void)snprintf(buf, sizeof(buf),
 			    "%s protocol %u unreachable",
-			    ipaddr_string(ndo, dp->icmp_ip.ip_dst),
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
 			    GET_U_1(dp->icmp_ip.ip_p));
 			break;
 
@@ -386,29 +358,28 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 			oip = &dp->icmp_ip;
 			hlen = IP_HL(oip) * 4;
 			ouh = (const struct udphdr *)(((const u_char *)oip) + hlen);
-			ND_TCHECK_2(ouh->uh_dport);
 			dport = GET_BE_U_2(ouh->uh_dport);
 			ip_proto = GET_U_1(oip->ip_p);
 			switch (ip_proto) {
 
 			case IPPROTO_TCP:
-				(void)nd_snprintf(buf, sizeof(buf),
+				(void)snprintf(buf, sizeof(buf),
 					"%s tcp port %s unreachable",
-					ipaddr_string(ndo, oip->ip_dst),
+					GET_IPADDR_STRING(oip->ip_dst),
 					tcpport_string(ndo, dport));
 				break;
 
 			case IPPROTO_UDP:
-				(void)nd_snprintf(buf, sizeof(buf),
+				(void)snprintf(buf, sizeof(buf),
 					"%s udp port %s unreachable",
-					ipaddr_string(ndo, oip->ip_dst),
+					GET_IPADDR_STRING(oip->ip_dst),
 					udpport_string(ndo, dport));
 				break;
 
 			default:
-				(void)nd_snprintf(buf, sizeof(buf),
+				(void)snprintf(buf, sizeof(buf),
 					"%s protocol %u port %u unreachable",
-					ipaddr_string(ndo, oip->ip_dst),
+					GET_IPADDR_STRING(oip->ip_dst),
 					ip_proto, dport);
 				break;
 			}
@@ -420,33 +391,130 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 			mp = (const struct mtu_discovery *)(const u_char *)&dp->icmp_void;
 			mtu = GET_BE_U_2(mp->nexthopmtu);
 			if (mtu) {
-				(void)nd_snprintf(buf, sizeof(buf),
+				(void)snprintf(buf, sizeof(buf),
 				    "%s unreachable - need to frag (mtu %u)",
-				    ipaddr_string(ndo, dp->icmp_ip.ip_dst), mtu);
+				    GET_IPADDR_STRING(dp->icmp_ip.ip_dst), mtu);
 			} else {
-				(void)nd_snprintf(buf, sizeof(buf),
+				(void)snprintf(buf, sizeof(buf),
 				    "%s unreachable - need to frag",
-				    ipaddr_string(ndo, dp->icmp_ip.ip_dst));
+				    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
 			}
 		    }
 			break;
 
+		case ICMP_UNREACH_SRCFAIL:
+			(void)snprintf(buf, sizeof(buf),
+			    "%s unreachable - source route failed",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_NET_UNKNOWN:
+			(void)snprintf(buf, sizeof(buf),
+			    "net %s unreachable - unknown",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_HOST_UNKNOWN:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable - unknown",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_ISOLATED:
+			(void)snprintf(buf, sizeof(buf),
+			    "%s unreachable - source host isolated",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_NET_PROHIB:
+			(void)snprintf(buf, sizeof(buf),
+			    "net %s unreachable - admin prohibited",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_HOST_PROHIB:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable - admin prohibited",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_TOSNET:
+			(void)snprintf(buf, sizeof(buf),
+			    "net %s unreachable - tos prohibited",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_TOSHOST:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable - tos prohibited",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_FILTER_PROHIB:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable - admin prohibited filter",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_HOST_PRECEDENCE:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable - host precedence violation",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
+		case ICMP_UNREACH_PRECEDENCE_CUTOFF:
+			(void)snprintf(buf, sizeof(buf),
+			    "host %s unreachable - precedence cutoff",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst));
+			break;
+
 		default:
-			fmt = tok2str(unreach2str, "#%u %%s unreachable",
+			(void)snprintf(buf, sizeof(buf),
+			    "%s unreachable - #%u",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
 			    icmp_code);
-			(void)nd_snprintf(buf, sizeof(buf), fmt,
-			    ipaddr_string(ndo, dp->icmp_ip.ip_dst));
 			break;
 		}
 		break;
 
 	case ICMP_REDIRECT:
-		ND_TCHECK_4(dp->icmp_ip.ip_dst);
-		fmt = tok2str(type2str, "redirect-#%u %%s to net %%s",
-		    icmp_code);
-		(void)nd_snprintf(buf, sizeof(buf), fmt,
-		    ipaddr_string(ndo, dp->icmp_ip.ip_dst),
-		    ipaddr_string(ndo, dp->icmp_gwaddr));
+		switch (icmp_code) {
+
+		case ICMP_REDIRECT_NET:
+			(void)snprintf(buf, sizeof(buf),
+			    "redirect %s to net %s",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
+			    GET_IPADDR_STRING(dp->icmp_gwaddr));
+			break;
+
+		case ICMP_REDIRECT_HOST:
+			(void)snprintf(buf, sizeof(buf),
+			    "redirect %s to host %s",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
+			    GET_IPADDR_STRING(dp->icmp_gwaddr));
+			break;
+
+		case ICMP_REDIRECT_TOSNET:
+			(void)snprintf(buf, sizeof(buf),
+			    "redirect-tos %s to net %s",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
+			    GET_IPADDR_STRING(dp->icmp_gwaddr));
+			break;
+
+		case ICMP_REDIRECT_TOSHOST:
+			(void)snprintf(buf, sizeof(buf),
+			    "redirect-tos %s to host %s",
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
+			    GET_IPADDR_STRING(dp->icmp_gwaddr));
+			break;
+
+		default:
+			(void)snprintf(buf, sizeof(buf),
+			    "redirect-#%u %s to %s", icmp_code,
+			    GET_IPADDR_STRING(dp->icmp_ip.ip_dst),
+			    GET_IPADDR_STRING(dp->icmp_gwaddr));
+			break;
+		}
 		break;
 
 	case ICMP_ROUTERADVERT:
@@ -455,7 +523,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 		const struct id_rdiscovery *idp;
 		u_int lifetime, num, size;
 
-		(void)nd_snprintf(buf, sizeof(buf), "router advertisement");
+		(void)snprintf(buf, sizeof(buf), "router advertisement");
 		cp = buf + strlen(buf);
 
 		ihp = (const struct ih_rdiscovery *)&dp->icmp_void;
@@ -464,13 +532,13 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 		cp = buf + strlen(buf);
 		lifetime = GET_BE_U_2(ihp->ird_lifetime);
 		if (lifetime < 60) {
-			(void)nd_snprintf(cp, sizeof(buf) - (cp - buf), "%u",
+			(void)snprintf(cp, sizeof(buf) - (cp - buf), "%u",
 			    lifetime);
 		} else if (lifetime < 60 * 60) {
-			(void)nd_snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u",
+			(void)snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u",
 			    lifetime / 60, lifetime % 60);
 		} else {
-			(void)nd_snprintf(cp, sizeof(buf) - (cp - buf),
+			(void)snprintf(cp, sizeof(buf) - (cp - buf),
 			    "%u:%02u:%02u",
 			    lifetime / 3600,
 			    (lifetime % 3600) / 60,
@@ -479,20 +547,20 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 		cp = buf + strlen(buf);
 
 		num = GET_U_1(ihp->ird_addrnum);
-		(void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " %u:", num);
+		(void)snprintf(cp, sizeof(buf) - (cp - buf), " %u:", num);
 		cp = buf + strlen(buf);
 
 		size = GET_U_1(ihp->ird_addrsiz);
 		if (size != 2) {
-			(void)nd_snprintf(cp, sizeof(buf) - (cp - buf),
+			(void)snprintf(cp, sizeof(buf) - (cp - buf),
 			    " [size %u]", size);
 			break;
 		}
 		idp = (const struct id_rdiscovery *)&dp->icmp_data;
 		while (num > 0) {
 			ND_TCHECK_SIZE(idp);
-			(void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}",
-			    ipaddr_string(ndo, idp->ird_addr),
+			(void)snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}",
+			    GET_IPADDR_STRING(idp->ird_addr),
 			    GET_BE_U_4(idp->ird_pref));
 			cp = buf + strlen(buf);
 			++idp;
@@ -514,7 +582,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 			break;
 
 		default:
-			(void)nd_snprintf(buf, sizeof(buf), "time exceeded-#%u",
+			(void)snprintf(buf, sizeof(buf), "time exceeded-#%u",
 			    icmp_code);
 			break;
 		}
@@ -522,25 +590,22 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 
 	case ICMP_PARAMPROB:
 		if (icmp_code)
-			(void)nd_snprintf(buf, sizeof(buf),
+			(void)snprintf(buf, sizeof(buf),
 			    "parameter problem - code %u", icmp_code);
 		else {
-			ND_TCHECK_1(dp->icmp_pptr);
-			(void)nd_snprintf(buf, sizeof(buf),
+			(void)snprintf(buf, sizeof(buf),
 			    "parameter problem - octet %u",
 			    GET_U_1(dp->icmp_pptr));
 		}
 		break;
 
 	case ICMP_MASKREPLY:
-		ND_TCHECK_4(dp->icmp_mask);
-		(void)nd_snprintf(buf, sizeof(buf), "address mask is 0x%08x",
+		(void)snprintf(buf, sizeof(buf), "address mask is 0x%08x",
 		    GET_BE_U_4(dp->icmp_mask));
 		break;
 
 	case ICMP_TSTAMP:
-		ND_TCHECK_2(dp->icmp_seq);
-		(void)nd_snprintf(buf, sizeof(buf),
+		(void)snprintf(buf, sizeof(buf),
 		    "time stamp query id %u seq %u",
 		    GET_BE_U_2(dp->icmp_id),
 		    GET_BE_U_2(dp->icmp_seq));
@@ -548,15 +613,15 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 
 	case ICMP_TSTAMPREPLY:
 		ND_TCHECK_4(dp->icmp_ttime);
-		(void)nd_snprintf(buf, sizeof(buf),
+		(void)snprintf(buf, sizeof(buf),
 		    "time stamp reply id %u seq %u: org %s",
                                GET_BE_U_2(dp->icmp_id),
                                GET_BE_U_2(dp->icmp_seq),
                                icmp_tstamp_print(GET_BE_U_4(dp->icmp_otime)));
 
-                (void)nd_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", recv %s",
+                (void)snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", recv %s",
                          icmp_tstamp_print(GET_BE_U_4(dp->icmp_rtime)));
-                (void)nd_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", xmit %s",
+                (void)snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", xmit %s",
                          icmp_tstamp_print(GET_BE_U_4(dp->icmp_ttime)));
                 break;
 
@@ -590,7 +655,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
 		ND_PRINT("\n\t");
 		ip = (const struct ip *)bp;
                 snapend_save = ndo->ndo_snapend;
-		ND_TCHECK_2(ip->ip_len);
 		ip_print(ndo, bp, GET_BE_U_2(ip->ip_len));
                 ndo->ndo_snapend = snapend_save;
 	}
@@ -673,7 +737,6 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                 case 1:
                     switch(obj_ctype) {
                     case 1:
-                        ND_TCHECK_4(obj_tptr);
                         raw_label = GET_BE_U_4(obj_tptr);
                         ND_PRINT("\n\t    label %u, exp %u", MPLS_LABEL(raw_label), MPLS_EXP(raw_label));
                         if (MPLS_STACK(raw_label))