From owner-freebsd-bugs@FreeBSD.ORG  Sun Apr 10 14:40:52 2005
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3A29B16A4E2; Sun, 10 Apr 2005 14:40:52 +0000 (GMT)
Received: from neerbosch.nijmegen.internl.net (neerbosch.nijmegen.internl.net
	[217.149.193.38])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0C8CE43D1F; Sun, 10 Apr 2005 14:40:51 +0000 (GMT)
	(envelope-from michiel@boland.org)
Received: from brakkenstein.nijmegen.internl.net by
	neerbosch.nijmegen.internl.net
	via brakkenstein.nijmegen.internl.net [217.149.193.41] with ESMTP
	id j3AEenfk015079 (8.13.2/1.4);
	Sun, 10 Apr 2005 16:40:49 +0200 (MET DST)
Received: from localhost by brakkenstein.nijmegen.internl.net
	via mboland@localhost with ESMTP	id j3AEenR8017418 (8.13.2/2.02);
	Sun, 10 Apr 2005 16:40:49 +0200 (MEST)
X-Authentication-Warning: brakkenstein.nijmegen.internl.net: mboland owned
	process doing -bs
Date: Sun, 10 Apr 2005 16:40:49 +0200 (MEST)
From: Michiel Boland <michiel@boland.org>
To: Mark Knight <markk@knigma.org>
In-Reply-To: <200503080132.j281WRYH001684@shrewd.pub.knigma.org>
Message-ID: <Pine.GSO.4.62.0504101639030.17395@brakkenstein.nijmegen.internl.net>
References: <200503080132.j281WRYH001684@shrewd.pub.knigma.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
cc: freebsd-bugs@FreeBSD.org
cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: bin/78570: "wicontrol -i wi0 -C" outputs garbage
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Apr 2005 14:40:52 -0000

> Since at least 5.3, wicontrol -i wi0 -C has been broken.

The following patch to /usr/src/usr.sbin/wicontrol/wicontrol.c fixes 
things for me (on 6.0-CURRENT)

--- wicontrol.c.orig	Sun Oct 17 23:29:53 2004
+++ wicontrol.c	Sun Apr 10 15:33:47 2005
@@ -1020,10 +1020,8 @@
  wi_readcache(const char *iface)
  {
  	struct wi_req		wreq;
-	int 			*wi_sigitems;
  	struct wi_sigcache 	*sc;
-	char *			pt;
-	int 			i;
+	int 			i, n;

  	if (iface == NULL)
  		errx(1, "must specify interface name");
@@ -1034,13 +1032,11 @@
  	if (wi_getval(iface, &wreq) == -1)
  		errx(1, "Cannot read signal cache");

-	wi_sigitems = (int *) &wreq.wi_val; 
-	pt = ((char *) &wreq.wi_val);
-	pt += sizeof(int);
-	sc = (struct wi_sigcache *) pt;
+	n = wreq.wi_len * 2 / sizeof (struct wi_sigcache); /* XXX ?? */
+	sc = (struct wi_sigcache *) &wreq.wi_val;

-	for (i = 0; i < *wi_sigitems; i++) {
-		printf("[%d/%d]:", i+1, *wi_sigitems);
+	for (i = 0; i < n; i++) {
+		printf("[%d/%d]:", i+1, n);
  		printf(" %02x:%02x:%02x:%02x:%02x:%02x,",
  		  		    	sc->macsrc[0]&0xff,
  		  		    	sc->macsrc[1]&0xff,