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

don't widen the ssid field by default, this screws up other formatting;

Browse Source 
make it available with the -v option
This commit is contained in:
Sam Leffler 2006-01-18 17:45:38 +00:00
parent 4006cd2b3f
commit 949c433eab
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=154522
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/ifconfig/ifieee80211.c
View File

@ -848,7 +848,7 @@ list_scan(int s)
struct ieee80211req ireq;
char ssid[IEEE80211_NWID_LEN+1];
uint8_t *cp;
int len;
int len, ssidmax;
(void) memset(&ireq, 0, sizeof(ireq));
(void) strncpy(ireq.i_name, name, sizeof(ireq.i_name));
@ -861,8 +861,9 @@ list_scan(int s)
if (len < sizeof(struct ieee80211req_scan_result))
return;
printf("%-32.32s %-17.17s %4s %4s %-5s %3s %4s\n"
, "SSID"
ssidmax = verbose ? IEEE80211_NWID_LEN : 14;
printf("%-*.*s %-17.17s %4s %4s %-5s %3s %4s\n"
, ssidmax, ssidmax, "SSID"
, "BSSID"
, "CHAN"
, "RATE"
@ -877,9 +878,10 @@ list_scan(int s)
sr = (struct ieee80211req_scan_result *) cp;
vp = (u_int8_t *)(sr+1);
printf("%-32.*s %s %3d %3dM %2d:%-2d %3d %-4.4s"
, copy_essid(ssid, sizeof(ssid), vp, sr->isr_ssid_len)
, ssid
printf("%-*.*s %s %3d %3dM %2d:%-2d %3d %-4.4s"
, ssidmax
, copy_essid(ssid, sizeof(ssid), vp, sr->isr_ssid_len)
, ssid
, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
, ieee80211_mhz2ieee(sr->isr_freq)
, getmaxrate(sr->isr_rates, sr->isr_nrates)