DGNum/iwinfo
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli: fix printing the scan channel width

Browse source 
The "chan_width" var contains an index, not a value.

While at it, make the 40 and 2040 description shorter and clearer.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2022-11-21 18:56:38 +01:00 committed by Jo-Philipp Wich
parent b1c8873e37
commit 49b6ec91e9
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
iwinfo_cli.c
View file

@ -340,16 +340,21 @@ static char * format_assocrate(struct iwinfo_rate_entry *r)
return buf; return buf;
} }
static const char* format_chan_width(uint16_t width) static const char* format_chan_width(bool vht, uint8_t width)
{ {
switch (width) { if (!vht && width < ARRAY_SIZE(ht_chan_width))
case 20: return "20 MHz"; switch (ht_chan_width[width]) {
case 2040: return "40 MHz and upper or 20 MHz with intolerant bit"; case 20: return "20 MHz";
case 40: return "40 MHz or lower"; case 2040: return "40 MHz or higher";
case 80: return "80 MHz"; }
case 8080: return "80+80 MHz";
case 160: return "160 MHz"; if (vht && width < ARRAY_SIZE(vht_chan_width))
} switch (vht_chan_width[width]) {
case 40: return "20 or 40 MHz";
case 80: return "80 MHz";
case 8080: return "80+80 MHz";
case 160: return "160 MHz";
}
return "unknown"; return "unknown";
} }
@ -674,16 +679,16 @@ static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
printf(" Secondary Channel Offset: %s\n", printf(" Secondary Channel Offset: %s\n",
ht_secondary_offset[e->ht_chan_info.secondary_chan_off]); ht_secondary_offset[e->ht_chan_info.secondary_chan_off]);
printf(" Channel Width: %s\n", printf(" Channel Width: %s\n",
format_chan_width(e->ht_chan_info.chan_width)); format_chan_width(false, e->ht_chan_info.chan_width));
if (e->vht_chan_info.center_chan_1) { if (e->vht_chan_info.center_chan_1) {
printf(" VHT Operation:\n"); printf(" VHT Operation:\n");
printf(" Channel Width: %s\n",
format_chan_width(e->vht_chan_info.chan_width));
printf(" Center Frequency 1: %d\n", printf(" Center Frequency 1: %d\n",
e->vht_chan_info.center_chan_1); e->vht_chan_info.center_chan_1);
printf(" Center Frequency 2: %d\n", printf(" Center Frequency 2: %d\n",
e->vht_chan_info.center_chan_2); e->vht_chan_info.center_chan_2);
printf(" Channel Width: %s\n",
format_chan_width(true, e->vht_chan_info.chan_width));
} }
printf("\n"); printf("\n");