d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. In key printing routine, the loop variable was j, but inside the

Browse Source 
loop was referencing i.

2. Print keys in hex rather than ascii by default.

3. Add a -a flag to reverse #2 on demand.
This commit is contained in:
nsayer 2000-09-16 20:54:59 +00:00
parent 97ac2e7951
commit 307f8d6aa8
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/wicontrol/wicontrol.8
View File

@ -38,7 +38,7 @@
.Nd configure WaveLAN/IEEE devices
.Sh SYNOPSIS
.Nm wicontrol
.Fl i Ar iface Op Fl o
.Fl i Ar iface Op Fl oa
.Nm wicontrol
.Fl i Ar iface Fl t Ar tx rate
.Nm wicontrol
@ -105,7 +105,7 @@ device (wi0, wi1, etc...).
.Sh OPTIONS
The options are as follows:
.Bl -tag -width Fl
.It Fl i Ar iface Op Fl o
.It Fl i Ar iface Op Fl oa
Display the current settings of the specified WaveLAN/IEEE interface.
This retrieves the current card settings from the driver and prints them
out.
@ -113,7 +113,13 @@ Using the additional
.Fl o
flag will cause
.Nm
to print out the statistics counters instead of the card settings.
to print out the statistics counters instead of the card settings. Using
the additional
.Fl a
flag will cause
.Nm
to print out encryption keys as ascii characters instead of in hex.
Encryption keys are only displayed if wicontrol is run as root.
.It Fl i Ar iface Fl t Ar tx rate
Set the transmit rate of the specified interface.
The legal values

45
usr.sbin/wicontrol/wicontrol.c
View File

@ -56,7 +56,7 @@
static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
Bill Paul. All rights reserved.";
static const char rcsid[] =
"@(#) $FreeBSD$";
"@(#) $FreeBSD$"
#endif
static void wi_getval __P((char *, struct wi_req *));
@ -69,9 +69,9 @@ static void wi_sethex __P((char *, int, char *));
static void wi_printwords __P((struct wi_req *));
static void wi_printbool __P((struct wi_req *));
static void wi_printhex __P((struct wi_req *));
static void wi_dumpinfo __P((char *));
static void wi_dumpinfo __P((char *, char));
static void wi_setkeys __P((char *, char *, int));
static void wi_printkeys __P((struct wi_req *));
static void wi_printkeys __P((struct wi_req *, char));
static void usage __P((char *));
static void wi_getval(iface, wreq)
@ -319,25 +319,35 @@ static void wi_setkeys(iface, key, idx)
return;
}
static void wi_printkeys(wreq)
static void wi_printkeys(wreq, asciikeys)
struct wi_req *wreq;
char asciikeys;
{
int i, j;
struct wi_key *k;
struct wi_ltv_keys *keys;
char *ptr;
unsigned char *ptr;
keys = (struct wi_ltv_keys *)wreq;
for (i = 0; i < 4; i++) {
k = &keys->wi_keys[i];
ptr = (char *)k->wi_keydat;
for (j = 0; j < k->wi_keylen; j++) {
if (ptr[i] == '\0')
ptr[i] = ' ';
if (asciikeys) {
for (j = 0; j < k->wi_keylen; j++) {
if (ptr[j] == '\0')
ptr[j] = ' ';
}
ptr[j] = '\0';
printf("[ %s ]", ptr);
} else {
printf("[ ");
if (k->wi_keylen)
printf("0x");
for (j = 0; j < k->wi_keylen; j++)
printf("%02x",ptr[j]);
printf(" ]");
}
ptr[j] = '\0';
printf("[ %s ]", ptr);
}
return;
@ -429,8 +439,8 @@ static struct wi_table wi_crypt_table[] = {
{ 0, NULL }
};
static void wi_dumpinfo(iface)
char *iface;
static void wi_dumpinfo(iface, asciikeys)
char *iface,asciikeys;
{
struct wi_req wreq;
int i, has_wep;
@ -499,7 +509,7 @@ static void wi_dumpinfo(iface)
wi_printhex(&wreq);
break;
case WI_KEYSTRUCT:
wi_printkeys(&wreq);
wi_printkeys(&wreq, asciikeys);
break;
default:
break;
@ -672,10 +682,10 @@ int main(argc, argv)
char *iface = NULL;
char *p = argv[0];
char *key = NULL;
int modifier = 0;
int modifier = 0, show_ascii_keys = 0;
while((ch = getopt(argc, argv,
"hoc:d:e:f:i:k:p:r:q:t:n:s:m:v:P:S:T:ZC")) != -1) {
"ahoc:d:e:f:i:k:p:r:q:t:n:s:m:v:P:S:T:ZC")) != -1) {
switch(ch) {
case 'Z':
#ifdef WICACHE
@ -700,6 +710,9 @@ int main(argc, argv)
case 'i':
iface = optarg;
break;
case 'a':
show_ascii_keys++;
break;
case 'c':
wi_setword(iface, WI_RID_CREATE_IBSS, atoi(optarg));
exit(0);
@ -779,7 +792,7 @@ int main(argc, argv)
exit(0);
}
wi_dumpinfo(iface);
wi_dumpinfo(iface,show_ascii_keys);
exit(0);
}