From patchwork Tue Jul 10 19:49:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Add 'get_capability channels' command Date: Tue, 10 Jul 2012 09:49:30 -0000 From: Dmitry Shmidt X-Patchwork-Id: 170494 Message-Id: <20120711171052.EB6CA38373@ushik.mtv.corp.google.com> To: hostap@lists.shmoo.com Signed-off-by: Dmitry Shmidt --- wpa_supplicant/ctrl_iface.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 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 cb3e523..1af1f34 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2364,6 +2364,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) @@ -2414,6 +2459,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 b159ad3..8b4a308 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -3087,7 +3087,8 @@ static struct wpa_cli_cmd wpa_cli_commands[] = { "< | > = get detailed scan result info" }, { "get_capability", wpa_cli_cmd_get_capability, cli_cmd_flag_none, - " = get capabilies" }, + "\n" + " = get capabilities" }, { "reconfigure", wpa_cli_cmd_reconfigure, cli_cmd_flag_none, "= force wpa_supplicant to re-read its configuration file" },