Page MenuHomeFreeBSD
Differential D4085

ifconfig: fix padding for '<ifname> scan' command output (S:N and beacon interval fields)
ClosedPublic
Actions

Authored by avos on Nov 5 2015, 4:28 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 5, 4:43 PM
Unknown Object (File)
Wed, Apr 2, 1:18 PM
Unknown Object (File)
Feb 28 2025, 1:06 AM
Unknown Object (File)
Feb 18 2025, 2:43 PM
Unknown Object (File)
Jan 21 2025, 3:05 AM
Unknown Object (File)
Jan 8 2025, 8:22 PM
Unknown Object (File)
Dec 19 2024, 2:41 PM
Unknown Object (File)
Dec 10 2024, 1:24 PM
View All 65 Files
Subscribers
imp

Details

Reviewers
adrian
Commits
rS290438: ifconfig: fix padding for '<ifname> scan' command output

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

avos updated this revision to Diff 9961.Nov 5 2015, 4:28 PM
avos retitled this revision from to ifconfig: fix padding for '<ifname> scan' command output (S:N and beacon interval fields).
avos updated this object.
avos edited the test plan for this revision. (Show Details)
avos added a reviewer: adrian.
avos set the repository for this revision to rS FreeBSD src repository - subversion.
Herald added a subscriber: imp. · View Herald TranscriptNov 5 2015, 4:28 PM
adrian accepted this revision.Nov 6 2015, 2:28 AM
adrian edited edge metadata.

go for it!

This revision is now accepted and ready to land.Nov 6 2015, 2:28 AM
Closed by commit rS290438: ifconfig: fix padding for '<ifname> scan' command output (authored by avos). · Explain WhyNov 6 2015, 11:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sbin/
ifconfig/
4 lines

Diff 9985

View Options

head/sbin/ifconfig/ifieee80211.c

Show First 20 Lines • Show All 3,179 Lines • ▼ Show 20 Lineslist_scan(int s)
if (get80211len(s, IEEE80211_IOC_SCAN_RESULTS, buf, sizeof(buf), &len) < 0) if (get80211len(s, IEEE80211_IOC_SCAN_RESULTS, buf, sizeof(buf), &len) < 0)
errx(1, "unable to get scan results"); errx(1, "unable to get scan results");
if (len < sizeof(struct ieee80211req_scan_result)) if (len < sizeof(struct ieee80211req_scan_result))
return; return;
getchaninfo(s); getchaninfo(s);
ssidmax = verbose ? IEEE80211_NWID_LEN - 1 : 14; ssidmax = verbose ? IEEE80211_NWID_LEN - 1 : 14;
printf("%-*.*s %-17.17s %4s %4s %-7s %3s %4s\n" printf("%-*.*s %-17.17s %4s %4s %-7s %3s %4s\n"
, ssidmax, ssidmax, "SSID/MESH ID" , ssidmax, ssidmax, "SSID/MESH ID"
, "BSSID" , "BSSID"
, "CHAN" , "CHAN"
, "RATE" , "RATE"
, " S:N" , " S:N"
, "INT" , "INT"
, "CAPS" , "CAPS"
); );
cp = buf; cp = buf;
do { do {
const struct ieee80211req_scan_result *sr; const struct ieee80211req_scan_result *sr;
const uint8_t *vp, *idp; const uint8_t *vp, *idp;
sr = (const struct ieee80211req_scan_result *) cp; sr = (const struct ieee80211req_scan_result *) cp;
vp = cp + sr->isr_ie_off; vp = cp + sr->isr_ie_off;
if (sr->isr_meshid_len) { if (sr->isr_meshid_len) {
idp = vp + sr->isr_ssid_len; idp = vp + sr->isr_ssid_len;
idlen = sr->isr_meshid_len; idlen = sr->isr_meshid_len;
} else { } else {
idp = vp; idp = vp;
idlen = sr->isr_ssid_len; idlen = sr->isr_ssid_len;
} }
printf("%-*.*s %s %3d %3dM %3d:%-3d %3d %-4.4s" printf("%-*.*s %s %3d %3dM %4d:%-4d %4d %-4.4s"
, ssidmax , ssidmax
, copy_essid(ssid, ssidmax, idp, idlen) , copy_essid(ssid, ssidmax, idp, idlen)
, ssid , ssid
, ether_ntoa((const struct ether_addr *) sr->isr_bssid) , ether_ntoa((const struct ether_addr *) sr->isr_bssid)
, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags) , ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)
, getmaxrate(sr->isr_rates, sr->isr_nrates) , getmaxrate(sr->isr_rates, sr->isr_nrates)
, (sr->isr_rssi/2)+sr->isr_noise, sr->isr_noise , (sr->isr_rssi/2)+sr->isr_noise, sr->isr_noise
, sr->isr_intval , sr->isr_intval
▲ Show 20 Lines • Show All 2,106 Lines • Show Last 20 Lines