From: Hasso Tepper <hasso@estpak.ee>
Date: Sun, 18 Jan 2009 13:21:45 +0000 (+0200)
Subject: Make "route add 0.0.0.0/X <gw>" where X > 0 work again.
X-Git-Tag: v2.3.0~23^2~3
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a80e869f444616b15f5685b343928be09b3b43bc

Make "route add 0.0.0.0/X <gw>" where X > 0 work again.
---

diff --git a/sbin/route/route.c b/sbin/route/route.c
index 232f671..80552be 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -915,30 +915,26 @@ inet_makenetandmask(u_long net, struct sockaddr_in *in, u_long bits)
 	char *cp;
 
 	rtm_addrs |= RTA_NETMASK;
-	if (net == 0)
-		mask = addr = 0;
-	else {
-		if (net <= 0xff)
-			addr = net << 24;
-		else if (net <= 0xffff)
-			addr = net << 16;
-		else if (net <= 0xffffff)
-			addr = net << 8;
-		else
-			addr = net;
+	if (net <= 0xff)
+		addr = net << 24;
+	else if (net <= 0xffff)
+		addr = net << 16;
+	else if (net <= 0xffffff)
+		addr = net << 8;
+	else
+		addr = net;
 
-		if (bits)
-			mask = 0xffffffff << (32 - bits);
-		else {
-			if (IN_CLASSA(addr)) {
-				mask = IN_CLASSA_NET;
-			} else if (IN_CLASSB(addr)) {
-				mask = IN_CLASSB_NET;
-			} else if (IN_CLASSC(addr)) {
-				mask = IN_CLASSC_NET;
-			} else
-				mask = 0xffffffff;
-		}
+	if (bits)
+		mask = 0xffffffff << (32 - bits);
+	else {
+		if (IN_CLASSA(addr)) {
+			mask = IN_CLASSA_NET;
+		} else if (IN_CLASSB(addr)) {
+			mask = IN_CLASSB_NET;
+		} else if (IN_CLASSC(addr)) {
+			mask = IN_CLASSC_NET;
+		} else
+			mask = 0xffffffff;
 	}
 	in->sin_addr.s_addr = htonl(addr);
 	in = &so_mask.sin;