From owner-svn-src-all@FreeBSD.ORG Fri Jul 17 21:11:09 2009 Return-Path: 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 54869106566C; Fri, 17 Jul 2009 21:11:09 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4286D8FC15; Fri, 17 Jul 2009 21:11:09 +0000 (UTC) (envelope-from sam@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 n6HLB8Sk082141; Fri, 17 Jul 2009 21:11:08 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6HLB8Im082138; Fri, 17 Jul 2009 21:11:08 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200907172111.n6HLB8Im082138@svn.freebsd.org> From: Sam Leffler Date: Fri, 17 Jul 2009 21:11:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195746 - head/usr.sbin/wlandebug 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jul 2009 21:11:10 -0000 Author: sam Date: Fri Jul 17 21:11:08 2009 New Revision: 195746 URL: http://svn.freebsd.org/changeset/base/195746 Log: add mesh support Submitted by: rpaulo Approved by: re (kib) Modified: head/usr.sbin/wlandebug/wlandebug.8 head/usr.sbin/wlandebug/wlandebug.c Modified: head/usr.sbin/wlandebug/wlandebug.8 ============================================================================== --- head/usr.sbin/wlandebug/wlandebug.8 Fri Jul 17 19:45:42 2009 (r195745) +++ head/usr.sbin/wlandebug/wlandebug.8 Fri Jul 17 21:11:08 2009 (r195746) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 19, 2008 +.Dd July 17, 2009 .Dt WLANDEBUG 8 .Os .Sh NAME @@ -97,11 +97,8 @@ state machine operation. 802.11 power save operation; in hostap mode this enables copious information about buffered frames for stations operating in power save mode. -.It Ar dot1x -802.1x operation; not presently meaningful as 802.1x protocol -support is implemented in user mode by the -.Xr hostapd 8 -program. +.It Ar hwmp +trace operation of Hybrid Wireless Mesh Protocol processing. .It Ar dot1xsm 802.1x state machine operation; not presently meaningful as 802.1x protocol support is implemented in user mode by the @@ -119,13 +116,8 @@ not presently meaningful as 802.1x proto support is implemented in user mode by the .Xr hostapd 8 program. -.It Ar radkeys -include key contents when dumping packets exchanged with the -radius backend for 802.1x operation; -not presently meaningful as 802.1x protocol -support is implemented in user mode by the -.Xr hostapd 8 -program. +.It Ar mesh +trace operation of 802.11s mesh protocol processing. .It Ar wpa trace operation of the WPA protocol; only partly meaningful as WPA protocol Modified: head/usr.sbin/wlandebug/wlandebug.c ============================================================================== --- head/usr.sbin/wlandebug/wlandebug.c Fri Jul 17 19:45:42 2009 (r195745) +++ head/usr.sbin/wlandebug/wlandebug.c Fri Jul 17 21:11:08 2009 (r195746) @@ -61,11 +61,11 @@ const char *progname; #define IEEE80211_MSG_OUTPUT 0x00100000 /* output handling */ #define IEEE80211_MSG_STATE 0x00080000 /* state machine */ #define IEEE80211_MSG_POWER 0x00040000 /* power save handling */ -#define IEEE80211_MSG_DOT1X 0x00020000 /* 802.1x authenticator */ +#define IEEE80211_MSG_HWMP 0x00020000 /* hybrid mesh protocol */ #define IEEE80211_MSG_DOT1XSM 0x00010000 /* 802.1x state machine */ #define IEEE80211_MSG_RADIUS 0x00008000 /* 802.1x radius client */ #define IEEE80211_MSG_RADDUMP 0x00004000 /* dump 802.1x radius packets */ -#define IEEE80211_MSG_RADKEYS 0x00002000 /* dump 802.1x keys */ +#define IEEE80211_MSG_MESH 0x00002000 /* mesh networking */ #define IEEE80211_MSG_WPA 0x00001000 /* WPA/RSN protocol */ #define IEEE80211_MSG_ACL 0x00000800 /* ACL handling */ #define IEEE80211_MSG_WME 0x00000400 /* WME protocol */ @@ -97,11 +97,11 @@ static struct { { "output", IEEE80211_MSG_OUTPUT }, { "state", IEEE80211_MSG_STATE }, { "power", IEEE80211_MSG_POWER }, - { "dot1x", IEEE80211_MSG_DOT1X }, + { "hwmp", IEEE80211_MSG_HWMP }, { "dot1xsm", IEEE80211_MSG_DOT1XSM }, { "radius", IEEE80211_MSG_RADIUS }, { "raddump", IEEE80211_MSG_RADDUMP }, - { "radkeys", IEEE80211_MSG_RADKEYS }, + { "mesh", IEEE80211_MSG_MESH }, { "wpa", IEEE80211_MSG_WPA }, { "acl", IEEE80211_MSG_ACL }, { "wme", IEEE80211_MSG_WME },