diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2012-07-10 12:49:30 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-07-11 10:04:05 -0700 |
commit | 0e6d08e6ec9e3ef3b65a76124d7700d56fe67a8a (patch) | |
tree | eeeaaee28caf973316a3e430a1703e068ad9bdd4 /wpa_supplicant | |
parent | fa7bad8a38102d5e3bf9fb4436203b813d611bb2 (diff) | |
download | external_wpa_supplicant_8-0e6d08e6ec9e3ef3b65a76124d7700d56fe67a8a.zip external_wpa_supplicant_8-0e6d08e6ec9e3ef3b65a76124d7700d56fe67a8a.tar.gz external_wpa_supplicant_8-0e6d08e6ec9e3ef3b65a76124d7700d56fe67a8a.tar.bz2 |
Add 'get_capability channels' command
Change-Id: Ic5d5769b80804d3e8b577e988a1caf1e149b8c01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r-- | wpa_supplicant/ctrl_iface.c | 48 | ||||
-rw-r--r-- | wpa_supplicant/wpa_cli.c | 3 |
2 files changed, 50 insertions, 1 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 5d8409c..a22cce5 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2107,6 +2107,51 @@ static int ctrl_iface_get_capability_auth_alg(int res, char *strict, } +static int ctrl_iface_get_capability_channels(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: + return pos - buf; + } + ret = os_snprintf(pos, end - pos, "Mode[%s] Channels:", 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++) { + ret = os_snprintf(pos, end - pos, " %d", chnl[i].chan); + 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) @@ -2157,6 +2202,9 @@ static int wpa_supplicant_ctrl_iface_get_capability( return ctrl_iface_get_capability_auth_alg(res, strict, &capa, buf, buflen); + if (os_strcmp(field, "channels") == 0) + return ctrl_iface_get_capability_channels(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 4685970..8abf2ae 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -2849,7 +2849,8 @@ static struct wpa_cli_cmd wpa_cli_commands[] = { "<<idx> | <bssid>> = get detailed scan result info" }, { "get_capability", wpa_cli_cmd_get_capability, cli_cmd_flag_none, - "<eap/pairwise/group/key_mgmt/proto/auth_alg> = get capabilies" }, + "<eap/pairwise/group/key_mgmt/proto/auth_alg/channels>\n" + " = get capabilities" }, { "reconfigure", wpa_cli_cmd_reconfigure, cli_cmd_flag_none, "= force wpa_supplicant to re-read its configuration file" }, |