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

nl80211: add "mhz" and "band" to iwinfo_scanlist_entry

Browse source 
Providing the channel alone isn't clear as there're overlapping channels
on e.g. band 2 and 6.

Note: This changes the ABI.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2022-11-23 15:21:57 +01:00 committed by Christian Marangi
parent 0d5ea34245
commit afa147c45a
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/iwinfo.h
View file

@ -313,7 +313,9 @@ struct iwinfo_scanlist_entry {
uint8_t mac[6]; uint8_t mac[6];
char ssid[IWINFO_ESSID_MAX_SIZE+1]; char ssid[IWINFO_ESSID_MAX_SIZE+1];
enum iwinfo_opmode mode; enum iwinfo_opmode mode;
uint8_t band;
uint8_t channel; uint8_t channel;
uint32_t mhz;
uint8_t signal; uint8_t signal;
uint8_t quality; uint8_t quality;
uint8_t quality_max; uint8_t quality_max;

25
iwinfo_nl80211.c
View file

@ -742,6 +742,20 @@ static int nl80211_channel2freq(int channel, const char *band, bool ax)
return 0; return 0;
} }
static uint8_t nl80211_freq2band(int freq)
{
if (freq >= 2412 && freq <= 2484)
return IWINFO_BAND_24;
else if (freq >= 5160 && freq <= 5885)
return IWINFO_BAND_5;
else if (freq >= 5925 && freq <= 7125)
return IWINFO_BAND_6;
else if (freq >= 58320 && freq <= 69120)
return IWINFO_BAND_60;
return 0;
}
static int nl80211_phyname_cb(struct nl_msg *msg, void *arg) static int nl80211_phyname_cb(struct nl_msg *msg, void *arg)
{ {
char *buf = arg; char *buf = arg;
@ -2619,8 +2633,11 @@ static int nl80211_get_scanlist_cb(struct nl_msg *msg, void *arg)
sl->e->crypto.enabled = 1; sl->e->crypto.enabled = 1;
if (bss[NL80211_BSS_FREQUENCY]) if (bss[NL80211_BSS_FREQUENCY])
sl->e->channel = nl80211_freq2channel(nla_get_u32( {
bss[NL80211_BSS_FREQUENCY])); sl->e->mhz = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
sl->e->band = nl80211_freq2band(sl->e->mhz);
sl->e->channel = nl80211_freq2channel(sl->e->mhz);
}
if (bss[NL80211_BSS_INFORMATION_ELEMENTS]) if (bss[NL80211_BSS_INFORMATION_ELEMENTS])
nl80211_get_scanlist_ie(bss, sl->e); nl80211_get_scanlist_ie(bss, sl->e);
@ -2842,7 +2859,9 @@ static int nl80211_get_scanlist_wpactl(const char *ifname, char *buf, int *len)
e->mode = IWINFO_OPMODE_MASTER; e->mode = IWINFO_OPMODE_MASTER;
/* Channel */ /* Channel */
e->channel = nl80211_freq2channel(atoi(freq)); e->mhz = atoi(freq);
e->band = nl80211_freq2band(e->mhz);
e->channel = nl80211_freq2channel(e->mhz);
/* Signal */ /* Signal */
rssi = atoi(signal); rssi = atoi(signal);