From owner-svn-src-projects@FreeBSD.ORG  Thu May  7 13:08:27 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 81F49106564A;
	Thu,  7 May 2009 13:08:27 +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 713C88FC0A;
	Thu,  7 May 2009 13:08:27 +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 n47D8RXq056442;
	Thu, 7 May 2009 13:08:27 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n47D8REY056441;
	Thu, 7 May 2009 13:08:27 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905071308.n47D8REY056441@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 7 May 2009 13:08:27 +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: r191881 - 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: Thu, 07 May 2009 13:08:27 -0000

Author: rpaulo
Date: Thu May  7 13:08:26 2009
New Revision: 191881
URL: http://svn.freebsd.org/changeset/base/191881

Log:
  Print mesh node information.
  
  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	Thu May  7 12:55:58 2009	(r191880)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Thu May  7 13:08:26 2009	(r191881)
@@ -3187,6 +3187,20 @@ getrxseq(const struct ieee80211req_sta_i
 #undef IEEE80211_NODE_QOS
 }
 
+static const char *
+mesh_linkstate_string(uint8_t state)
+{
+	switch (state) {
+	case 0: return "IDLE";
+	case 1: return "OPEN SENT";
+	case 2: return "OPEN RECEIVED";
+	case 3: return "CONFIRM RECEIVED";
+	case 4: return "ESTABLISHED";
+	case 5: return "HOLDING";
+	default: return "UNKNOWN";
+	}
+}
+
 static void
 list_stations(int s)
 {
@@ -3248,6 +3262,11 @@ list_stations(int s)
 		printies(cp + si->isi_ie_off, si->isi_ie_len, 24);
 		printmimo(&si->isi_mimo);
 		printf("\n");
+		if (verbose && opmode == IEEE80211_M_MBSS)
+			printf("\tMesh Peer ID: 0x%x, Local ID: 0x%x, "
+			    "Link state: %s\n", si->isi_peerid,
+			    si->isi_localid,
+			    mesh_linkstate_string(si->isi_peerstate));
 		cp += si->isi_len, len -= si->isi_len;
 	} while (len >= sizeof(struct ieee80211req_sta_info));
 }