From owner-svn-src-head@FreeBSD.ORG  Thu Feb  5 22:17:11 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9137710656D0;
	Thu,  5 Feb 2009 22:17:11 +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 62E668FC1D;
	Thu,  5 Feb 2009 22:17:11 +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 n15MHBg3040944;
	Thu, 5 Feb 2009 22:17:11 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n15MHBxL040943;
	Thu, 5 Feb 2009 22:17:11 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902052217.n15MHBxL040943@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 5 Feb 2009 22:17:11 +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: r188206 - head/tools/tools/net80211/wlanstats
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2009 22:17:13 -0000

Author: sam
Date: Thu Feb  5 22:17:10 2009
New Revision: 188206
URL: http://svn.freebsd.org/changeset/base/188206

Log:
  make -o handling like athstats

Modified:
  head/tools/tools/net80211/wlanstats/main.c

Modified: head/tools/tools/net80211/wlanstats/main.c
==============================================================================
--- head/tools/tools/net80211/wlanstats/main.c	Thu Feb  5 22:16:09 2009	(r188205)
+++ head/tools/tools/net80211/wlanstats/main.c	Thu Feb  5 22:17:10 2009	(r188206)
@@ -48,10 +48,30 @@
 
 #include "wlanstats.h"
 
-#define	S_DEFAULT \
-	"input,rx_mgmt,output,rx_badkeyid,scan_active,scan_bg,bmiss,rssi,noise,rate"
-#define	S_AMPDU \
-	"input,output,ampdu_reorder,ampdu_oor,rx_dup,ampdu_flush,ampdu_move,ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,rssi,rate"
+static struct {
+	const char *tag;
+	const char *fmt;
+} tags[] = {
+  { "default",
+    "input,rx_mgmt,output,rx_badkeyid,scan_active,scan_bg,bmiss,rssi,noise,rate"
+  },
+  { "ampdu",
+    "input,output,ampdu_reorder,ampdu_oor,rx_dup,ampdu_flush,ampdu_move,"
+    "ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,rssi,rate"
+  },
+};
+
+static const char *
+getfmt(const char *tag)
+{
+#define	N(a)	(sizeof(a)/sizeof(a[0]))
+	int i;
+	for (i = 0; i < N(tags); i++)
+		if (strcasecmp(tags[i].tag, tag) == 0)
+			return tags[i].fmt;
+	return tag;
+#undef N
+}
 
 static int signalled;
 
@@ -138,10 +158,14 @@ main(int argc, char *argv[])
 	struct wlanstatfoo *wf;
 	struct ether_addr *ea;
 	const uint8_t *mac = NULL;
+	const char *ifname;
 	int allnodes = 0;
 	int c, mode;
 
-	wf = wlanstats_new("wlan0", S_DEFAULT);
+	ifname = getenv("WLAN");
+	if (ifname == NULL)
+		ifname = "wlan0";
+	wf = wlanstats_new(ifname, getfmt("default"));
 	while ((c = getopt(argc, argv, "ai:lm:o:")) != -1) {
 		switch (c) {
 		case 'a':
@@ -160,10 +184,7 @@ main(int argc, char *argv[])
 			mac = ea->octet;
 			break;
 		case 'o':
-			if (strcasecmp(optarg, "ampdu") == 0)
-				wf->setfmt(wf, S_AMPDU);
-			else
-				wf->setfmt(wf, optarg);
+			wf->setfmt(wf, getfmt(optarg));
 			break;
 		default:
 			errx(-1, "usage: %s [-a] [-i ifname] [-l] [-o fmt] [interval]\n", argv[0]);