diff options
| author | Eneas U de Queiroz | 2025-11-07 17:24:33 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-11-10 10:46:55 +0000 |
| commit | 988b2ed515f6bb737292738074fc74cf78c4da35 (patch) | |
| tree | ee24d70f2d49105a9120c9b33c579cd64349e0fc | |
| parent | e50703d033268f721a1e86a2673bc09d3b27e65c (diff) | |
| download | openwrt-988b2ed515f6bb737292738074fc74cf78c4da35.tar.gz | |
wifi-scripts: ucode: iwinfo: escape control chars
Escape control characters when displaying ESSID. It is not uncommon for
a scan to encounter invalid SSIDs, containing binary data. Escape the
control characters to avoid messing the display (ENQ is particularly
bothersome).
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20686
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rwxr-xr-x | package/network/config/wifi-scripts/files-ucode/usr/bin/iwinfo | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/package/network/config/wifi-scripts/files-ucode/usr/bin/iwinfo b/package/network/config/wifi-scripts/files-ucode/usr/bin/iwinfo index 5f6743dfd2..a1290ac201 100755 --- a/package/network/config/wifi-scripts/files-ucode/usr/bin/iwinfo +++ b/package/network/config/wifi-scripts/files-ucode/usr/bin/iwinfo @@ -6,6 +6,13 @@ import { find_phy } from 'wifi.utils'; import * as uci from 'uci'; import * as iwinfo from 'iwinfo'; +function normalize_ssid(ssid) { + if (!ssid) + return 'unknown'; + return '"' + replace(ssid, /[[:cntrl:]]/g, + function(c) { return '\\x' + hexenc(c); }) + '"' +} + function print_assoclist(stations) { for (let mac, station in stations) { printf(`${station.mac} ${station.signal} dBm / ${station.noise} dBm (SNR ${station.snr}) ${station.inactive_time} ms ago\n`); @@ -44,7 +51,7 @@ function print_info(list) { let padding = ' '; for (let bss in list) { - printf(`${bss.iface} ESSID: ${bss.ssid === null ? 'unknown' : '"' + bss.ssid + '"'}\n`); + printf(`${bss.iface} ESSID: ${normalize_ssid(bss.ssid)}\n`); printf(`${padding}Access Point: ${bss.mac}\n`); printf(`${padding}Mode: ${bss.mode} Channel: ${bss.channel} (${bss.freq} GHz) HT Mode: ${bss.htmode}\n`); printf(`${padding}Center Channel 1: ${bss.center_freq1} 2: ${bss.center_freq2}\n`); @@ -69,7 +76,7 @@ function print_scan(cells) { for (let cell in cells) { printf('Cell %02d - Address: %s\n', idx++, cell.bssid); - printf('\t ESSID: %s\n', cell.ssid ? '"' + cell.ssid + '"' : 'unknown'); + printf('\t ESSID: %s\n', normalize_ssid(cell.ssid)); printf('\t Mode: %s Frequency: %s GHz Band: %s GHz Channel: %d\n', cell.mode, cell.frequency, cell.band, cell.channel); printf('\t Signal: %d dBm Quality: %2d/70\n', cell.dbm, cell.quality); |