diff options
| author | Bruno Randolf <br1@einfach.org> | 2013-03-22 17:07:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-13 05:49:35 -0700 |
| commit | 5735c9995574669adeed9380e86fbf0f24287477 (patch) | |
| tree | 79ae01da1a4d1b0cbe9f9caf92c3a6c6e2c9fc71 /wpa_supplicant | |
| parent | 4d11042be9623f74660d930c7bcb82ae6e6fd4df (diff) | |
| download | external_wpa_supplicant_8-5735c9995574669adeed9380e86fbf0f24287477.zip external_wpa_supplicant_8-5735c9995574669adeed9380e86fbf0f24287477.tar.gz external_wpa_supplicant_8-5735c9995574669adeed9380e86fbf0f24287477.tar.bz2 | |
wpa_supplicant: Add get_capability freq
Add "get_capability freq" command to print a more verbose list of channels and
frequencies in MHz. The tag "NO_IBSS" is added, if IBSS mode is not allowed on
a channel. This allows userspace programs to get the frequencies and
limitations associated with each channel.
This extends the information already provided in "get_capability channel" but a
new interface is chosen because of backwards compatibility considerations.
Signed-hostap: Bruno Randolf <br1@einfach.org>
Change-Id: Ic05a080b3cdea3ab095127d8c2e86eb16408bb4f
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 52 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_cli.c | 2 |
2 files changed, 53 insertions, 1 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 53393d1..ad87a0e 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2519,6 +2519,55 @@ static int ctrl_iface_get_capability_channels(struct wpa_supplicant *wpa_s, } +static int ctrl_iface_get_capability_freq(struct wpa_supplicant *wpa_s, + char *buf, size_t buflen) +{ + struct hostapd_channel_data *chnl; + int ret, i, j; + char *pos, *end, *hmode; + + pos = buf; + end = pos + buflen; + + for (j = 0; j < wpa_s->hw.num_modes; j++) { + switch (wpa_s->hw.modes[j].mode) { + case HOSTAPD_MODE_IEEE80211B: + hmode = "B"; + break; + case HOSTAPD_MODE_IEEE80211G: + hmode = "G"; + break; + case HOSTAPD_MODE_IEEE80211A: + hmode = "A"; + break; + default: + continue; + } + ret = os_snprintf(pos, end - pos, "Mode[%s] Channels:\n", hmode); + if (ret < 0 || ret >= end - pos) + return pos - buf; + pos += ret; + chnl = wpa_s->hw.modes[j].channels; + for (i = 0; i < wpa_s->hw.modes[j].num_channels; i++) { + if (chnl[i].flag & HOSTAPD_CHAN_DISABLED) + continue; + ret = os_snprintf(pos, end - pos, " %d = %d MHz%s\n", + chnl[i].chan, chnl[i].freq, + chnl[i].flag & HOSTAPD_CHAN_NO_IBSS ? " (NO_IBSS)" : ""); + if (ret < 0 || ret >= end - pos) + return pos - buf; + pos += ret; + } + ret = os_snprintf(pos, end - pos, "\n"); + if (ret < 0 || ret >= end - pos) + return pos - buf; + pos += ret; + } + + return pos - buf; +} + + static int wpa_supplicant_ctrl_iface_get_capability( struct wpa_supplicant *wpa_s, const char *_field, char *buf, size_t buflen) @@ -2576,6 +2625,9 @@ static int wpa_supplicant_ctrl_iface_get_capability( if (os_strcmp(field, "channels") == 0) return ctrl_iface_get_capability_channels(wpa_s, buf, buflen); + if (os_strcmp(field, "freq") == 0) + return ctrl_iface_get_capability_freq(wpa_s, buf, buflen); + wpa_printf(MSG_DEBUG, "CTRL_IFACE: Unknown GET_CAPABILITY field '%s'", field); diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index 97e11bb..87d2bf8 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -2417,7 +2417,7 @@ static struct wpa_cli_cmd wpa_cli_commands[] = { "<<idx> | <bssid>> = get detailed scan result info" }, { "get_capability", wpa_cli_cmd_get_capability, NULL, cli_cmd_flag_none, - "<eap/pairwise/group/key_mgmt/proto/auth_alg/channels/modes> " + "<eap/pairwise/group/key_mgmt/proto/auth_alg/channels/freq/modes> " "= get capabilies" }, { "reconfigure", wpa_cli_cmd_reconfigure, NULL, cli_cmd_flag_none, |