From owner-p4-projects@FreeBSD.ORG  Tue Feb 19 16:47:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BE50816A469; Tue, 19 Feb 2008 16:47:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 823D516A421
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 16:47:35 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E5DE13C4DB
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 16:47:35 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1JGlZ3g076116
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 16:47:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1JGlZsL076113
	for perforce@freebsd.org; Tue, 19 Feb 2008 16:47:35 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 19 Feb 2008 16:47:35 GMT
Message-Id: <200802191647.m1JGlZsL076113@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135727 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Feb 2008 16:47:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=135727

Change 135727 by sam@sam_ebb on 2008/02/19 16:47:17

	switch over to vap setup

Affected files ...

.. //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#4 edit

Differences ...

==== //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#4 (text+ko) ====

@@ -156,47 +156,44 @@
 	exit(-1);
 }
 
+static void
+setoid(char oid[], size_t oidlen, const char *wlan)
+{
+#ifdef __linux__
+	snprintf(oid, oidlen, "net.%s.debug", wlan);
+#elif __FreeBSD__
+	snprintf(oid, oidlen, "net.wlan.%s.debug", wlan+4);
+#elif __NetBSD__
+	snprintf(oid, oidlen, "net.link.ieee80211.%s.debug", wlan+4);
+#else
+#error "No support for this system"
+#endif
+}
+
 int
 main(int argc, char *argv[])
 {
-	const char *ifname = "ath0";
 	const char *cp, *tp;
 	const char *sep;
 	int op, i, unit;
 	u_int32_t debug, ndebug;
 	size_t debuglen, parentlen;
-	char oid[256], parent[256];
+	char oid[256];
 
 	progname = argv[0];
+	setoid(oid, sizeof(oid), "wlan0");
 	if (argc > 1) {
 		if (strcmp(argv[1], "-i") == 0) {
 			if (argc < 2)
 				errx(1, "missing interface name for -i option");
-			ifname = argv[2];
+			if (strncmp(argv[2], "wlan", 4) != 0)
+				errx(1, "expecting a wlan interface name");
+			setoid(oid, sizeof(oid), argv[2]);
 			argc -= 2, argv += 2;
 		} else if (strcmp(argv[1], "-?") == 0)
 			usage();
 	}
 
-	for (unit = 0; unit < 10; unit++) {
-#ifdef __linux__
-		snprintf(oid, sizeof(oid), "net.wlan%d.%%parent", unit);
-#else
-		snprintf(oid, sizeof(oid), "net.wlan.%d.%%parent", unit);
-#endif
-		parentlen = sizeof(parent);
-		if (sysctlbyname(oid, parent, &parentlen, NULL, 0) < 0)
-			continue;
-		if (strncmp(parent, ifname, parentlen) == 0)
-			break;
-	}
-	if (unit == 10)
-		errx(1, "%s: cannot locate wlan sysctl node.", ifname);
-#ifdef __linux__
-	snprintf(oid, sizeof(oid), "net.wlan%d.debug", unit);
-#else
-	snprintf(oid, sizeof(oid), "net.wlan.%d.debug", unit);
-#endif
 	debuglen = sizeof(debug);
 	if (sysctlbyname(oid, &debug, &debuglen, NULL, 0) < 0)
 		err(1, "sysctl-get(%s)", oid);