From: tholo <tholo@openbsd.org>
Date: Sat, 25 Jan 1997 23:26:42 +0000 (+0000)
Subject: Attempt to give the entire passed address to getnetbyaddr() before starting
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3fd1408a3fe7cffc729c8c1b0b97cc60a424544e;p=openbsd

Attempt to give the entire passed address to getnetbyaddr() before starting
to try various network masks
---

diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index e0645de89fc..5a0438156e4 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.7 1997/01/17 07:13:00 millert Exp $	*/
+/*	$OpenBSD: route.c,v 1.8 1997/01/25 23:26:42 tholo Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.7 1997/01/17 07:13:00 millert Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.8 1997/01/25 23:26:42 tholo Exp $";
 #endif
 #endif /* not lint */
 
@@ -541,30 +541,33 @@ netname(in, mask)
 	in = ntohl(in);
 	mask = ntohl(mask);
 	if (!nflag && in != INADDR_ANY) {
-		if (mask == INADDR_ANY) {
-			if (IN_CLASSA(in)) {
-				mask = IN_CLASSA_NET;
-				subnetshift = 8;
-			} else if (IN_CLASSB(in)) {
-				mask = IN_CLASSB_NET;
-				subnetshift = 8;
-			} else {
-				mask = IN_CLASSC_NET;
-				subnetshift = 4;
+		np = getnetbyaddr(in, AF_INET);
+		if (np == NULL) {
+			if (mask == INADDR_ANY) {
+				if (IN_CLASSA(in)) {
+					mask = IN_CLASSA_NET;
+					subnetshift = 8;
+				} else if (IN_CLASSB(in)) {
+					mask = IN_CLASSB_NET;
+					subnetshift = 8;
+				} else {
+					mask = IN_CLASSC_NET;
+					subnetshift = 4;
+				}
+				/*
+			 	* 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 (in &~ mask)
+					mask = (long)mask >> subnetshift;
 			}
-			/*
-			 * 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 (in &~ mask)
-				mask = (long)mask >> subnetshift;
+			net = in & mask;
+			while ((mask & 1) == 0)
+				mask >>= 1, net >>= 1;
+			np = getnetbyaddr(net, AF_INET);
 		}
-		net = in & mask;
-		while ((mask & 1) == 0)
-			mask >>= 1, net >>= 1;
-		np = getnetbyaddr(net, AF_INET);
 		if (np)
 			cp = np->n_name;
 	}