WPS: Add hostapd_cli get_config command

This can be used by a WPS UI to display the current AP configuration.

diff --git a/hostapd/README-WPS b/hostapd/README-WPS
index 63b62a5..c052df6 100644 (file)
--- a/hostapd/README-WPS
+++ b/hostapd/README-WPS
@@ -236,6 +236,9 @@ hostapd_cli wps_ap_pin set <PIN> [timeout]
 - if the optional timeout parameter is given, the AP PIN will be enabled
   for the specified number of seconds
 
+hostapd_cli get_config
+- display the current configuration
+
 
 Credential generation and configuration changes
 -----------------------------------------------

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 7f628f1..1886b77 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -493,6 +493,172 @@ static int hostapd_ctrl_iface_wps_ap_pin(struct hostapd_data *hapd, char *txt,
 #endif /* CONFIG_WPS */
 
 
+static int hostapd_ctrl_iface_get_config(struct hostapd_data *hapd,
+                                        char *buf, size_t buflen)
+{
+       int ret;
+       char *pos, *end;
+
+       pos = buf;
+       end = buf + buflen;
+
+       ret = os_snprintf(pos, end - pos, "bssid=" MACSTR "\n"
+                         "ssid=%s\n",
+                         MAC2STR(hapd->own_addr),
+                         hapd->conf->ssid.ssid);
+       if (ret < 0 || ret >= end - pos)
+               return pos - buf;
+       pos += ret;
+
+#ifdef CONFIG_WPS
+       ret = os_snprintf(pos, end - pos, "wps_state=%s\n",
+                         hapd->conf->wps_state == 0 ? "disabled" :
+                         (hapd->conf->wps_state == 1 ? "not configured" :
+                          "configured"));
+       if (ret < 0 || ret >= end - pos)
+               return pos - buf;
+       pos += ret;
+
+       if (hapd->conf->wps_state &&
+           hapd->conf->ssid.wpa_passphrase) {
+               ret = os_snprintf(pos, end - pos, "passphrase=%s\n",
+                                 hapd->conf->ssid.wpa_passphrase);
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+       }
+
+       if (hapd->conf->wps_state && hapd->conf->ssid.wpa_psk &&
+           hapd->conf->ssid.wpa_psk->group) {
+               char hex[PMK_LEN * 2 + 1];
+               wpa_snprintf_hex(hex, sizeof(hex),
+                                hapd->conf->ssid.wpa_psk->psk, PMK_LEN);
+               ret = os_snprintf(pos, end - pos, "psk=%s\n", hex);
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+       }
+#endif /* CONFIG_WPS */
+
+       if (hapd->conf->wpa && hapd->conf->wpa_key_mgmt) {
+               ret = os_snprintf(pos, end - pos, "key_mgmt=");
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+
+               if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) {
+                       ret = os_snprintf(pos, end - pos, "WPA-PSK ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+               if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X) {
+                       ret = os_snprintf(pos, end - pos, "WPA-EAP ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+#ifdef CONFIG_IEEE80211R
+               if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_FT_PSK) {
+                       ret = os_snprintf(pos, end - pos, "FT-PSK ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+               if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_FT_IEEE8021X) {
+                       ret = os_snprintf(pos, end - pos, "FT-EAP ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+#endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_IEEE80211W
+               if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK_SHA256) {
+                       ret = os_snprintf(pos, end - pos, "WPA-PSK-SHA256 ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+               if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X_SHA256) {
+                       ret = os_snprintf(pos, end - pos, "WPA-EAP-SHA256 ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+#endif /* CONFIG_IEEE80211W */
+
+               ret = os_snprintf(pos, end - pos, "\n");
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+       }
+
+       if (hapd->conf->wpa_group == WPA_CIPHER_CCMP) {
+               ret = os_snprintf(pos, end - pos, "group_cipher=CCMP\n");
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+       } else if (hapd->conf->wpa_group == WPA_CIPHER_TKIP) {
+               ret = os_snprintf(pos, end - pos, "group_cipher=TKIP\n");
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+       }
+
+       if ((hapd->conf->wpa & WPA_PROTO_RSN) && hapd->conf->rsn_pairwise) {
+               ret = os_snprintf(pos, end - pos, "rsn_pairwise_cipher=");
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+
+               if (hapd->conf->rsn_pairwise & WPA_CIPHER_CCMP) {
+                       ret = os_snprintf(pos, end - pos, "CCMP ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+               if (hapd->conf->rsn_pairwise & WPA_CIPHER_TKIP) {
+                       ret = os_snprintf(pos, end - pos, "TKIP ");
+                       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;
+       }
+
+       if ((hapd->conf->wpa & WPA_PROTO_WPA) && hapd->conf->wpa_pairwise) {
+               ret = os_snprintf(pos, end - pos, "wpa_pairwise_cipher=");
+               if (ret < 0 || ret >= end - pos)
+                       return pos - buf;
+               pos += ret;
+
+               if (hapd->conf->wpa_pairwise & WPA_CIPHER_CCMP) {
+                       ret = os_snprintf(pos, end - pos, "CCMP ");
+                       if (ret < 0 || ret >= end - pos)
+                               return pos - buf;
+                       pos += ret;
+               }
+               if (hapd->conf->wpa_pairwise & WPA_CIPHER_TKIP) {
+                       ret = os_snprintf(pos, end - pos, "TKIP ");
+                       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 hostapd_ctrl_iface_set(struct hostapd_data *wpa_s, char *cmd)
 {
        char *value;
@@ -650,6 +816,9 @@ static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                reply_len = hostapd_ctrl_iface_wps_ap_pin(hapd, buf + 11,
                                                          reply, reply_size);
 #endif /* CONFIG_WPS */
+       } else if (os_strcmp(buf, "GET_CONFIG") == 0) {
+               reply_len = hostapd_ctrl_iface_get_config(hapd, reply,
+                                                         reply_size);
        } else if (os_strncmp(buf, "SET ", 4) == 0) {
                if (hostapd_ctrl_iface_set(hapd, buf + 4))
                        reply_len = -1;

diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 5ca793b..c0d647f 100644 (file)
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -97,6 +97,7 @@ static const char *commands_help =
 #endif /* CONFIG_WPS_OOB */
 "   wps_ap_pin <cmd> [params..]  enable/disable AP PIN\n"
 #endif /* CONFIG_WPS */
+"   get_config           show current configuration\n"
 "   help                 show this usage help\n"
 "   interface [ifname]   show interfaces/select interface\n"
 "   level <debug level>  change debug level\n"
@@ -460,6 +461,13 @@ static int hostapd_cli_cmd_wps_ap_pin(struct wpa_ctrl *ctrl, int argc,
 #endif /* CONFIG_WPS */
 
 
+static int hostapd_cli_cmd_get_config(struct wpa_ctrl *ctrl, int argc,
+                                     char *argv[])
+{
+       return wpa_ctrl_command(ctrl, "GET_CONFIG");
+}
+
+
 static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, char *cmd,
                                char *addr, size_t addr_len)
 {
@@ -642,6 +650,7 @@ static struct hostapd_cli_cmd hostapd_cli_commands[] = {
 #endif /* CONFIG_WPS_OOB */
        { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin },
 #endif /* CONFIG_WPS */
+       { "get_config", hostapd_cli_cmd_get_config },
        { "help", hostapd_cli_cmd_help },
        { "interface", hostapd_cli_cmd_interface },
        { "level", hostapd_cli_cmd_level },