From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 28 17:22:07 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96207106566C;
	Sun, 28 Jun 2009 17:22:07 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 84FCF8FC12;
	Sun, 28 Jun 2009 17:22:07 +0000 (UTC)
	(envelope-from rpaulo@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 n5SHM7Z7017451;
	Sun, 28 Jun 2009 17:22:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5SHM72d017449;
	Sun, 28 Jun 2009 17:22:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906281722.n5SHM72d017449@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 28 Jun 2009 17:22:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195144 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2009 17:22:07 -0000

Author: rpaulo
Date: Sun Jun 28 17:22:07 2009
New Revision: 195144
URL: http://svn.freebsd.org/changeset/base/195144

Log:
  Limit mesh_generateid() to 4 iterations and drop a peer link if we can't
  generate random values.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 17:15:17 2009	(r195143)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 17:22:07 2009	(r195144)
@@ -304,13 +304,14 @@ mesh_checkid(void *arg, struct ieee80211
 static uint32_t
 mesh_generateid(struct ieee80211vap *vap)
 {
+	int maxiter = 4;
 	uint16_t r;
 
-	/* XXX max iterations? */
 	do {
 		get_random_bytes(&r, 2);
 		ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_checkid, &r);
-	} while (r == 0);
+		maxiter--;
+	} while (r == 0 && maxiter > 0);
 	return r;
 }
 
@@ -734,6 +735,8 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 			union ieee80211_send_action_args sargs;
 
 			ni->ni_mlpid = mesh_generateid(vap);
+			if (ni->ni_mlpid == 0)
+				return;
 			mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENSNT);
 			sargs.arg[0] = ni->ni_mlpid;
 			ieee80211_send_action(ni,
@@ -988,6 +991,8 @@ mesh_recv_action(struct ieee80211_node *
 				    IEEE80211_NODE_MESH_OPENRCV);
 				ni->ni_mllid = meshpeer->peer_llinkid;
 				ni->ni_mlpid = mesh_generateid(vap);
+				if (ni->ni_mlpid == 0)
+					return;
 				sargs.arg[0] = ni->ni_mlpid;
 				/* Announce we're open too... */
 				ieee80211_send_action(ni,