Add 'get_capability channels' command for ctrl_iface

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 82dbf869401d794743a18cfa0b952268fc9fe976..7fe969427af349e5ecb0c4d782d2b3ec7b6b7aa4 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2367,6 +2367,53 @@ 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:
+                       continue;
+               }
+               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++) {
+                       if (chnl[i].flag & HOSTAPD_CHAN_DISABLED)
+                               continue;
+                       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)
@@ -2417,6 +2464,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 b159ad3f6b3d53921afb89607943be2e52dee4aa..ae67fda008e063059d2ab15a9c09d2e9e5f83a92 100644 (file)
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -3087,7 +3087,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> "
+         "= get capabilies" },
        { "reconfigure", wpa_cli_cmd_reconfigure,
          cli_cmd_flag_none,
          "= force wpa_supplicant to re-read its configuration file" },