Declare all read only data structures as const

[mech_eap.git] / wpa_supplicant / ctrl_iface.c

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 09f72af..91617fb 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -153,7 +153,8 @@ static int set_disallow_aps(struct wpa_supplicant *wpa_s, char *val)
                        }
                        ssid = ns;
 
-                       if ((end - pos) & 0x01 || end - pos > 2 * 32 ||
+                       if ((end - pos) & 0x01 ||
+                           end - pos > 2 * SSID_MAX_LEN ||
                            hexstr2bin(pos, ssid[ssid_count].ssid,
                                       (end - pos) / 2) < 0) {
                                os_free(ssid);
@@ -1728,7 +1729,7 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
                if (ssid) {
                        u8 *_ssid = ssid->ssid;
                        size_t ssid_len = ssid->ssid_len;
-                       u8 ssid_buf[MAX_SSID_LEN];
+                       u8 ssid_buf[SSID_MAX_LEN];
                        if (ssid_len == 0) {
                                int _res = wpa_drv_get_ssid(wpa_s, ssid_buf);
                                if (_res < 0)
@@ -2366,6 +2367,14 @@ static char * wpa_supplicant_ie_txt(char *pos, char *end, const char *proto,
        }
 #endif /* CONFIG_SUITEB192 */
 
+       if (data.key_mgmt & WPA_KEY_MGMT_OSEN) {
+               ret = os_snprintf(pos, end - pos, "%sOSEN",
+                                 pos == start ? "" : "+");
+               if (os_snprintf_error(end - pos, ret))
+                       return pos;
+               pos += ret;
+       }
+
        pos = wpa_supplicant_cipher_txt(pos, end, data.pairwise_cipher);
 
        if (data.capabilities & WPA_CAPABILITY_PREAUTH) {
@@ -2433,7 +2442,7 @@ static int wpa_supplicant_ctrl_iface_scan_result(
 {
        char *pos, *end;
        int ret;
-       const u8 *ie, *ie2, *p2p, *mesh;
+       const u8 *ie, *ie2, *osen_ie, *p2p, *mesh;
 
        mesh = wpa_bss_get_ie(bss, WLAN_EID_MESH_ID);
        p2p = wpa_bss_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE);
@@ -2460,8 +2469,12 @@ static int wpa_supplicant_ctrl_iface_scan_result(
                pos = wpa_supplicant_ie_txt(pos, end, mesh ? "RSN" : "WPA2",
                                            ie2, 2 + ie2[1]);
        }
+       osen_ie = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
+       if (osen_ie)
+               pos = wpa_supplicant_ie_txt(pos, end, "OSEN",
+                                           osen_ie, 2 + osen_ie[1]);
        pos = wpa_supplicant_wps_ie_txt(wpa_s, pos, end, bss);
-       if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
+       if (!ie && !ie2 && !osen_ie && (bss->caps & IEEE80211_CAP_PRIVACY)) {
                ret = os_snprintf(pos, end - pos, "[WEP]");
                if (os_snprintf_error(end - pos, ret))
                        return -1;
@@ -3937,7 +3950,7 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
        size_t i;
        int ret;
        char *pos, *end;
-       const u8 *ie, *ie2;
+       const u8 *ie, *ie2, *osen_ie;
 
        pos = buf;
        end = buf + buflen;
@@ -4054,8 +4067,13 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
                if (ie2)
                        pos = wpa_supplicant_ie_txt(pos, end, "WPA2", ie2,
                                                    2 + ie2[1]);
+               osen_ie = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
+               if (osen_ie)
+                       pos = wpa_supplicant_ie_txt(pos, end, "OSEN",
+                                                   osen_ie, 2 + osen_ie[1]);
                pos = wpa_supplicant_wps_ie_txt(wpa_s, pos, end, bss);
-               if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
+               if (!ie && !ie2 && !osen_ie &&
+                   (bss->caps & IEEE80211_CAP_PRIVACY)) {
                        ret = os_snprintf(pos, end - pos, "[WEP]");
                        if (os_snprintf_error(end - pos, ret))
                                return 0;
@@ -6702,6 +6720,8 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
                           MAC2STR(wpa_s->bssid),
                           MAC2STR(wpa_s->pending_bssid));
        }
+
+       eloop_cancel_timeout(wpas_network_reenabled, wpa_s, NULL);
 }
 
 
@@ -7687,7 +7707,7 @@ static int wpas_ctrl_iface_send_neigbor_rep(struct wpa_supplicant *wpa_s,
 
        if (os_strncmp(cmd, " ssid=", 6) == 0) {
                ssid.ssid_len = os_strlen(cmd + 6);
-               if (ssid.ssid_len > 32)
+               if (ssid.ssid_len > SSID_MAX_LEN)
                        return -1;
                ssid.ssid = (u8 *) (cmd + 6);
                ssid_p = &ssid;
@@ -8262,6 +8282,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
                wpa_supplicant_cancel_scan(wpa_s);
                wpa_supplicant_deauthenticate(wpa_s,
                                              WLAN_REASON_DEAUTH_LEAVING);
+               eloop_cancel_timeout(wpas_network_reenabled, wpa_s, NULL);
        } else if (os_strcmp(buf, "SCAN") == 0) {
                wpas_ctrl_scan(wpa_s, NULL, reply, reply_size, &reply_len);
        } else if (os_strncmp(buf, "SCAN ", 5) == 0) {
@@ -8501,11 +8522,14 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
                                           char *cmd)
 {
        struct wpa_interface iface;
-       char *pos;
+       char *pos, *extra;
+       struct wpa_supplicant *wpa_s;
+       unsigned int create_iface = 0;
+       u8 mac_addr[ETH_ALEN];
 
        /*
         * <ifname>TAB<confname>TAB<driver>TAB<ctrl_interface>TAB<driver_param>
-        * TAB<bridge_ifname>
+        * TAB<bridge_ifname>[TAB<create>]
         */
        wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_ADD '%s'", cmd);
 
@@ -8565,12 +8589,54 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
                        iface.bridge_ifname = NULL;
                if (pos == NULL)
                        break;
+
+               extra = pos;
+               pos = os_strchr(pos, '\t');
+               if (pos)
+                       *pos++ = '\0';
+               if (!extra[0])
+                       break;
+
+               if (os_strcmp(extra, "create") == 0)
+                       create_iface = 1;
+               else {
+                       wpa_printf(MSG_DEBUG,
+                                  "INTERFACE_ADD unsupported extra parameter: '%s'",
+                                  extra);
+                       return -1;
+               }
        } while (0);
 
+       if (create_iface) {
+               wpa_printf(MSG_DEBUG, "CTRL_IFACE creating interface '%s'",
+                          iface.ifname);
+               if (!global->ifaces)
+                       return -1;
+               if (wpa_drv_if_add(global->ifaces, WPA_IF_STATION, iface.ifname,
+                                  NULL, NULL, NULL, mac_addr, NULL) < 0) {
+                       wpa_printf(MSG_ERROR,
+                                  "CTRL_IFACE interface creation failed");
+                       return -1;
+               }
+
+               wpa_printf(MSG_DEBUG,
+                          "CTRL_IFACE interface '%s' created with MAC addr: "
+                          MACSTR, iface.ifname, MAC2STR(mac_addr));
+       }
+
        if (wpa_supplicant_get_iface(global, iface.ifname))
-               return -1;
+               goto fail;
 
-       return wpa_supplicant_add_iface(global, &iface, NULL) ? 0 : -1;
+       wpa_s = wpa_supplicant_add_iface(global, &iface, NULL);
+       if (!wpa_s)
+               goto fail;
+       wpa_s->added_vif = create_iface;
+       return 0;
+
+fail:
+       if (create_iface)
+               wpa_drv_if_remove(global->ifaces, WPA_IF_STATION, iface.ifname);
+       return -1;
 }
 
 
@@ -8578,13 +8644,22 @@ static int wpa_supplicant_global_iface_remove(struct wpa_global *global,
                                              char *cmd)
 {
        struct wpa_supplicant *wpa_s;
+       int ret;
+       unsigned int delete_iface;
 
        wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_REMOVE '%s'", cmd);
 
        wpa_s = wpa_supplicant_get_iface(global, cmd);
        if (wpa_s == NULL)
                return -1;
-       return wpa_supplicant_remove_iface(global, wpa_s, 0);
+       delete_iface = wpa_s->added_vif;
+       ret = wpa_supplicant_remove_iface(global, wpa_s, 0);
+       if (!ret && delete_iface) {
+               wpa_printf(MSG_DEBUG, "CTRL_IFACE deleting the interface '%s'",
+                          cmd);
+               ret = wpa_drv_if_remove(global->ifaces, WPA_IF_STATION, cmd);
+       }
+       return ret;
 }
 
 
@@ -8611,7 +8686,7 @@ static int wpa_supplicant_global_iface_list(struct wpa_global *global,
        char *pos, *end;
 
        for (i = 0; wpa_drivers[i]; i++) {
-               struct wpa_driver_ops *drv = wpa_drivers[i];
+               const struct wpa_driver_ops *drv = wpa_drivers[i];
                if (drv->get_interfaces == NULL)
                        continue;
                tmp = drv->get_interfaces(global->drv_priv[i]);