Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 18 Jan 2009 11:38:35 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r187384 - head/sbin/route
Message-ID:  <200901181138.n0IBcZSB072048@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Sun Jan 18 11:38:35 2009
New Revision: 187384
URL: http://svn.freebsd.org/changeset/base/187384

Log:
  Fix regression introduced in rev. 173124:
  0.0.0.0/1 is not the same as 0.0.0.0/0.
  
  MFC after:	1 month

Modified:
  head/sbin/route/route.c

Modified: head/sbin/route/route.c
==============================================================================
--- head/sbin/route/route.c	Sun Jan 18 11:17:46 2009	(r187383)
+++ head/sbin/route/route.c	Sun Jan 18 11:38:35 2009	(r187384)
@@ -791,33 +791,34 @@ inet_makenetandmask(net, sin, bits)
 	char *cp;
 
 	rtm_addrs |= RTA_NETMASK;
-	if (net == 0)
-		mask = addr = 0;
-	else {
-		if (net <= 0xff)
-			addr = net << IN_CLASSA_NSHIFT;
-		else if (net <= 0xffff)
-			addr = net << IN_CLASSB_NSHIFT;
-		else if (net <= 0xffffff)
-			addr = net << IN_CLASSC_NSHIFT;
-		else
-			addr = net;
+	/* 
+	 * XXX: This approach unable to handle 0.0.0.1/32 correctly
+	 * as inet_network() converts 0.0.0.1 and 1 equally.
+	 */
+	if (net <= 0xff)
+		addr = net << IN_CLASSA_NSHIFT;
+	else if (net <= 0xffff)
+		addr = net << IN_CLASSB_NSHIFT;
+	else if (net <= 0xffffff)
+		addr = net << IN_CLASSC_NSHIFT;
+	else
+		addr = net;
+
+	if (bits != 0)
+		mask = 0xffffffff << (32 - bits);
+	else if (net == 0)
+		mask = 0;
+	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 if (IN_MULTICAST(addr))
+		mask = IN_CLASSD_NET;
+	else
+		mask = 0xffffffff;
 
-		if (bits != 0)
-			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 if (IN_MULTICAST(addr))
-				mask = IN_CLASSD_NET;
-			else
-				mask = 0xffffffff;
-		}
-	}
 	sin->sin_addr.s_addr = htonl(addr);
 	sin = &so_mask.sin;
 	sin->sin_addr.s_addr = htonl(mask);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901181138.n0IBcZSB072048>