From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 28 22:27:23 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 26D97106566B;
	Tue, 28 Apr 2009 22:27:23 +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 EF8338FC1A;
	Tue, 28 Apr 2009 22:27:22 +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 n3SMRMd7061794;
	Tue, 28 Apr 2009 22:27:22 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3SMRMGD061793;
	Tue, 28 Apr 2009 22:27:22 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904282227.n3SMRMGD061793@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 28 Apr 2009 22:27:22 +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: r191641 - projects/mesh11s/sbin/ifconfig
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: Tue, 28 Apr 2009 22:27:23 -0000

Author: rpaulo
Date: Tue Apr 28 22:27:22 2009
New Revision: 191641
URL: http://svn.freebsd.org/changeset/base/191641

Log:
  Sync with latest modifications to meshconf IE struct.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Tue Apr 28 21:48:07 2009	(r191640)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Tue Apr 28 22:27:22 2009	(r191641)
@@ -83,6 +83,7 @@
 #include <net80211/ieee80211_freebsd.h>
 #include <net80211/ieee80211_superg.h>
 #include <net80211/ieee80211_tdma.h>
+#include <net80211/ieee80211_mesh.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -2502,10 +2503,9 @@ printathie(const char *tag, const u_int8
 static void
 printmeshconf(const char *tag, const uint8_t *ie, size_t ielen, int maxlen)
 {
-#define MATCHOUI(bitfield, oui, value, string)				\
+#define MATCHOUI(field, oui, string)					\
 do {									\
-	if (((htonl(bitfield)) >> 8) == oui && 				\
-	    ((htonl(bitfield)) & 0xff) == value)			\
+	if (memcmp(field, oui, 4) == 0)					\
 		printf("%s", string);					\
 } while (0)
 
@@ -2513,21 +2513,27 @@ do {									\
 	if (verbose) {
 		const struct ieee80211_meshconf_ie *mconf =
 			(const struct ieee80211_meshconf_ie *)ie;
-		printf("<v%d APSPI:", mconf->conf_ver);
-		MATCHOUI(mconf->conf_apspi, IEEE80211_MESHCONF_APSPI_HWMP_OUI,
-			IEEE80211_MESHCONF_APSPI_HWMP_VALUE, "HWMP");
-		printf(" APSMI:");
-		MATCHOUI(mconf->conf_apsmi,
-		    IEEE80211_MESHCONF_APSMI_AIRTIME_OUI,
-		    IEEE80211_MESHCONF_APSMI_AIRTIME_VALUE, "AIRTIME");
-		printf(" CCMI:");
-		MATCHOUI(mconf->conf_ccmi, IEEE80211_MESHCONF_CCMI_DEFAULT_OUI,
-		    IEEE80211_MESHCONF_CCMI_DEFAULT_VALUE, "DEFAULT");
-		MATCHOUI(mconf->conf_ccmi, IEEE80211_MESHCONF_CCMI_NULL_OUI,
-		    IEEE80211_MESHCONF_CCMI_NULL_VALUE, "NULL");
-		printf(" FORM:0x%x CAPS:0x%x", mconf->conf_finfo,
+		const uint8_t null[4] = IEEE80211_MESHCONF_NULL;
+		const uint8_t hwmp[4] = IEEE80211_MESHCONF_HWMP;
+		const uint8_t airtime[4] = IEEE80211_MESHCONF_AIRTIME;
+		const uint8_t ccsig[4] = IEEE80211_MESHCONF_CCSIG;
+		const uint8_t sae[4] = IEEE80211_MESHCONF_SAE;
+		const uint8_t neighoff[4] = IEEE80211_MESHCONF_SAE;
+		printf("<v%d PATH:", mconf->conf_ver);
+		MATCHOUI(mconf->conf_pselid, hwmp, "HWMP");
+		printf(" LINK:");
+		MATCHOUI(mconf->conf_pmetid, airtime, "AIRTIME");
+		printf(" CONGESTION:");
+		MATCHOUI(mconf->conf_ccid, ccsig, "SIG");
+		MATCHOUI(mconf->conf_ccid, null, "NULL");
+		printf(" SYNC:");
+		MATCHOUI(mconf->conf_syncid, neighoff, "NEIGHOFF");
+		MATCHOUI(mconf->conf_syncid, null, "NULL");
+		printf(" AUTH:");
+		MATCHOUI(mconf->conf_authid, sae, "SAE");
+		MATCHOUI(mconf->conf_authid, null, "NULL");
+		printf(" FORM:0x%x CAPS:0x%x>", mconf->conf_form,
 		    mconf->conf_cap);
-		printf(">");
 	}
 #undef MATCHOUI
 }