From 1a09a08af98165c92cecddbb94b18714d1ac9b44 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 25 May 1997 08:36:20 +0000
Subject: Remove some quite bogus code that tried to find subnet names but
 instead spammed named with bogus queries.

---
 usr.bin/netstat/route.c | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'usr.bin/netstat')

diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index b6487fe..e920aaa 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: route.c,v 1.25 1997/02/22 19:56:23 peter Exp $";
+	"$Id: route.c,v 1.26 1997/05/10 10:03:43 jhay Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -634,40 +634,16 @@ netname(in, mask)
 	char *cp = 0;
 	static char line[MAXHOSTNAMELEN + 1];
 	struct netent *np = 0;
-	u_long net, omask;
+	u_long net, omask, dmask;
 	register u_long i;
 	int subnetshift;
 
 	i = ntohl(in);
 	omask = mask;
 	if (!nflag && i) {
-		if (mask == 0) {
-			switch (mask = forgemask(i)) {
-			case IN_CLASSA_NET:
-				subnetshift = 8;
-				break;
-			case IN_CLASSB_NET:
-				subnetshift = 8;
-				break;
-			case IN_CLASSC_NET:
-				subnetshift = 4;
-				break;
-			default:
-				abort();
-			}
-			/*
-			 * If there are more bits than the standard mask
-			 * would suggest, subnets must be in use.
-			 * Guess at the subnet mask, assuming reasonable
-			 * width subnet fields.
-			 */
-			while (i &~ mask)
-				mask = (long)mask >> subnetshift;
-		}
-		net = i & mask;
-		while ((mask & 1) == 0)
-			mask >>= 1, net >>= 1;
-		if (!(np = getnetbyaddr(i, AF_INET)))
+		dmask = forgemask(i);
+		net = i & dmask;
+		if (!(np = getnetbyaddr(i, AF_INET)) && net != i)
 			np = getnetbyaddr(net, AF_INET);
 		if (np) {
 			cp = np->n_name;
-- 
cgit v1.1