X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/afdea7aeac56fe8debf5b62a56abaf478e05cc83..467c341cc8fff82a032b722a0f9afb432d8e8f9c:/print-icmp.c

diff --git a/print-icmp.c b/print-icmp.c
index fc835133..135eba3b 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.57 2000-10-10 05:03:32 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.60 2001-06-28 19:53:42 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -268,27 +268,21 @@ struct id_rdiscovery {
 };
 
 void
-icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
+icmp_print(const u_char *bp, u_int plen, const u_char *bp2)
 {
-	register char *cp;
-	register const struct icmp *dp;
-	register const struct ip *ip;
-	register const char *str, *fmt;
-	register const struct ip *oip;
-	register const struct udphdr *ouh;
-	register u_int hlen, dport, mtu;
+	char *cp;
+	const struct icmp *dp;
+	const struct ip *ip;
+	const char *str, *fmt;
+	const struct ip *oip;
+	const struct udphdr *ouh;
+	u_int hlen, dport, mtu;
 	char buf[MAXHOSTNAMELEN + 100];
 
 	dp = (struct icmp *)bp;
 	ip = (struct ip *)bp2;
 	str = buf;
 
-#if 0
-        (void)printf("%s > %s: ",
-		ipaddr_string(&ip->ip_src),
-		ipaddr_string(&ip->ip_dst));
-#endif
-
 	TCHECK(dp->icmp_code);
 	switch (dp->icmp_type) {
 
@@ -339,12 +333,12 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
 		    {
 			register const struct mtu_discovery *mp;
 			mp = (struct mtu_discovery *)&dp->icmp_void;
-                        mtu = EXTRACT_16BITS(&mp->nexthopmtu);
-                        if (mtu) {
+			mtu = EXTRACT_16BITS(&mp->nexthopmtu);
+			if (mtu) {
 				(void)snprintf(buf, sizeof(buf),
 				    "%s unreachable - need to frag (mtu %d)",
 				    ipaddr_string(&dp->icmp_ip.ip_dst), mtu);
-                        } else {
+			} else {
 				(void)snprintf(buf, sizeof(buf),
 				    "%s unreachable - need to frag",
 				    ipaddr_string(&dp->icmp_ip.ip_dst));
@@ -353,20 +347,19 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
 			break;
 
 		default:
-			fmt = tok2str(unreach2str, "#%d %%s unreachable",
+			fmt = tok2str(unreach2str, "#%d",
 			    dp->icmp_code);
-			(void)snprintf(buf, sizeof(buf), fmt,
-			    ipaddr_string(&dp->icmp_ip.ip_dst));
+			(void)snprintf(buf, sizeof(buf), "%s %s unreachable",
+			    fmt, ipaddr_string(&dp->icmp_ip.ip_dst));
 			break;
 		}
 		break;
 
 	case ICMP_REDIRECT:
 		TCHECK(dp->icmp_ip.ip_dst);
-		fmt = tok2str(type2str, "redirect-#%d %%s to net %%s",
-		    dp->icmp_code);
-		(void)snprintf(buf, sizeof(buf), fmt,
-		    ipaddr_string(&dp->icmp_ip.ip_dst),
+		fmt = tok2str(type2str, "#%d", dp->icmp_code);
+		(void)snprintf(buf, sizeof(buf), "redirect-%s %s to net %s",
+		    fmt, ipaddr_string(&dp->icmp_ip.ip_dst),
 		    ipaddr_string(&dp->icmp_gwaddr));
 		break;
 
@@ -381,7 +374,7 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
 
 		ihp = (struct ih_rdiscovery *)&dp->icmp_void;
 		TCHECK(*ihp);
-		(void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf));
+		(void)snprintf(cp, sizeof(buf) - (cp - buf), " lifetime ");
 		cp = buf + strlen(buf);
 		lifetime = EXTRACT_16BITS(&ihp->ird_lifetime);
 		if (lifetime < 60) {
@@ -480,7 +473,7 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2)
 		str = tok2str(icmp2str, "type-#%d", dp->icmp_type);
 		break;
 	}
-        (void)printf("icmp: %s", str);
+	(void)printf("icmp: %s", str);
 	if (vflag) {
 		if (TTEST2(*bp, plen)) {
 			if (in_cksum((u_short*)dp, plen, 0))