From owner-svn-src-all@FreeBSD.ORG  Mon Apr  6 14:27:29 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 343CC10656BE;
	Mon,  6 Apr 2009 14:27:29 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 211508FC12;
	Mon,  6 Apr 2009 14:27:29 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n36ERTX2074016;
	Mon, 6 Apr 2009 14:27:29 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n36ERTVF074015;
	Mon, 6 Apr 2009 14:27:29 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200904061427.n36ERTVF074015@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 6 Apr 2009 14:27:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190775 - head/sbin/route
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Apr 2009 14:27:29 -0000

Author: rrs
Date: Mon Apr  6 14:27:28 2009
New Revision: 190775
URL: http://svn.freebsd.org/changeset/base/190775

Log:
  Ok, looking at the solution a bit closer, the level
  calculation was too agressive. Instead we should only
  look at each nibble. This makes it so we make
  10.2.0.0 become 10.2/16 NOT 10.2/17.
  
  Need to explore the non-cidr address issue. The two
  may not be seperable..
  
  MFC after:	1 week

Modified:
  head/sbin/route/route.c

Modified: head/sbin/route/route.c
==============================================================================
--- head/sbin/route/route.c	Mon Apr  6 14:12:22 2009	(r190774)
+++ head/sbin/route/route.c	Mon Apr  6 14:27:28 2009	(r190775)
@@ -808,15 +808,15 @@ inet_makenetandmask(net, sin, bits)
 	 * CIDR address.
 	 */
 	if ((bits == 0)  && (addr != 0)) {
-		int i, j;
-		for(i=0,j=1; i<32; i++)  {
+		u_long i, j;
+		for(i=0,j=0xff; i<4; i++)  {
 			if (addr & j) {
 				break;
 			}
-			j <<= 1;
+			j <<= 8;
 		}
 		/* i holds the first non zero bit */
-		bits = 32 - i;	
+		bits = 32 - (i*8);	
 	}
 	mask = 0xffffffff << (32 - bits);