From owner-freebsd-bugs@FreeBSD.ORG  Sun Apr 10 14:50:24 2005
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1045B16A4CE
	for <freebsd-bugs@hub.freebsd.org>;
	Sun, 10 Apr 2005 14:50:24 +0000 (GMT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E241543D48
	for <freebsd-bugs@hub.freebsd.org>;
	Sun, 10 Apr 2005 14:50:23 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3AEoNH0092360
	for <freebsd-bugs@freefall.freebsd.org>; Sun, 10 Apr 2005 14:50:23 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3AEoNMX092359;
	Sun, 10 Apr 2005 14:50:23 GMT
	(envelope-from gnats)
Date: Sun, 10 Apr 2005 14:50:23 GMT
Message-Id: <200504101450.j3AEoNMX092359@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Michiel Boland <michiel@boland.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
Reply-To: Michiel Boland <michiel@boland.org>
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:50:24 -0000

The following reply was made to PR bin/78570; it has been noted by GNATS.

From: Michiel Boland <michiel@boland.org>
To: Mark Knight <markk@knigma.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-bugs@FreeBSD.org
Subject: Re: bin/78570: "wicontrol -i wi0 -C" outputs garbage
Date: Sun, 10 Apr 2005 16:40:49 +0200 (MEST)

 > 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,