From owner-svn-src-all@FreeBSD.ORG  Sun Aug  9 18:39:24 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 668C31065677;
	Sun,  9 Aug 2009 18:39:24 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 550F68FC21;
	Sun,  9 Aug 2009 18:39:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n79IdOJw075059;
	Sun, 9 Aug 2009 18:39:24 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n79IdONq075058;
	Sun, 9 Aug 2009 18:39:24 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <200908091839.n79IdONq075058@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Sun, 9 Aug 2009 18:39:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196088 - stable/7/usr.sbin/ppp
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: Sun, 09 Aug 2009 18:39:25 -0000

Author: brian
Date: Sun Aug  9 18:39:23 2009
New Revision: 196088
URL: http://svn.freebsd.org/changeset/base/196088

Log:
  MFC: Don't get stuck in an infinite loop comparing (short++ <= maxshort)
  
  PR:		136893
  Submitted by:	Aragon Gouveia - aragon at phat dot za dot net (mostly)

Modified:
  stable/7/usr.sbin/ppp/   (props changed)
  stable/7/usr.sbin/ppp/nat_cmd.c

Modified: stable/7/usr.sbin/ppp/nat_cmd.c
==============================================================================
--- stable/7/usr.sbin/ppp/nat_cmd.c	Sun Aug  9 11:47:39 2009	(r196087)
+++ stable/7/usr.sbin/ppp/nat_cmd.c	Sun Aug  9 18:39:23 2009	(r196088)
@@ -173,7 +173,7 @@ nat_RedirectPort(struct cmdargs const *a
       return -1;
     }
 
-    while (laliasport <= haliasport) {
+    do {
       link = PacketAliasRedirectPort(localaddr, htons(llocalport),
 				     remoteaddr, htons(lremoteport),
                                      aliasaddr, htons(laliasport),
@@ -185,10 +185,9 @@ nat_RedirectPort(struct cmdargs const *a
         return 1;
       }
       llocalport++;
-      laliasport++;
       if (hremoteport)
         lremoteport++;
-    }
+    } while (laliasport++ < haliasport);
 
     return 0;
   }