svn commit: r195142 - projects/mesh11s/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Sun Jun 28 17:04:37 2009
New Revision: 195142
URL: http://svn.freebsd.org/changeset/base/195142

Log:
  * verify mesh conf ie before trying to peer
  * simplify debugging message.
  
  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 16:53:35 2009	(r195141)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 17:04:37 2009	(r195142)
@@ -704,10 +704,11 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		/*
 		 * Ignore STAs for other mesh networks.
 		 */
-		if (memcmp(scan.meshid+2, ms->ms_id, ms->ms_idlen) != 0) {
+		if (memcmp(scan.meshid+2, ms->ms_id, ms->ms_idlen) != 0 ||
+		    mesh_verify_meshconf(vap,
+		        (struct ieee80211_meshconf_ie *)scan.meshconf)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
-			    wh, "beacon", "not for our mesh (%s)",
-			    scan.meshid+2);
+			    wh, "beacon", "%s", "not for our mesh");
 			return;
 		}