WEXT: Add protection for start/stop functionality

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

diff --git a/wpa_supplicant/src/drivers/driver_wext.c b/wpa_supplicant/src/drivers/driver_wext.c
index 0ab744c..b531d01 100644 (file)
--- a/wpa_supplicant/src/drivers/driver_wext.c
+++ b/wpa_supplicant/src/drivers/driver_wext.c
@@ -952,9 +952,10 @@ void * wpa_driver_wext_init(void *ctx, const char *ifname)
        drv->event_sock = s;
 
        drv->mlme_sock = -1;
-
+#ifdef ANDROID
        drv->errors = 0;
-
+       drv->driver_is_loaded = TRUE;
+#endif
        wpa_driver_wext_finish_drv_init(drv);
 
        return drv;
@@ -2407,6 +2408,11 @@ static int wpa_driver_priv_driver_cmd( void *priv, char *cmd, char *buf, size_t
 
        wpa_printf(MSG_DEBUG, "%s %s len = %d", __func__, cmd, buf_len);
 
+       if (!drv->driver_is_loaded && (os_strcasecmp(cmd, "START") != 0)) {
+               wpa_printf(MSG_ERROR,"WEXT: Driver not initialized yet");
+               return -1;
+       }
+
        if (os_strcasecmp(cmd, "RSSI-APPROX") == 0) {
                os_strncpy(cmd, "RSSI", MAX_DRV_CMD_SIZE);
        }
@@ -2456,13 +2462,15 @@ static int wpa_driver_priv_driver_cmd( void *priv, char *cmd, char *buf, size_t
                    (os_strcasecmp(cmd, "MACADDR") == 0)) {
                        ret = strlen(buf);
                }
-/*             else if (os_strcasecmp(cmd, "START") == 0) {
-                       os_sleep(0, WPA_DRIVER_WEXT_WAIT_US);
-                       wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "STARTED");
+               else if (os_strcasecmp(cmd, "START") == 0) {
+                       drv->driver_is_loaded = TRUE;
+                       /* os_sleep(0, WPA_DRIVER_WEXT_WAIT_US);
+                       wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "STARTED"); */
                }
                else if (os_strcasecmp(cmd, "STOP") == 0) {
-                       wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "STOPPED");
-               }*/
+                       drv->driver_is_loaded = FALSE;
+                       /* wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "STOPPED"); */
+               }
                wpa_printf(MSG_DEBUG, "%s %s len = %d, %d", __func__, buf, ret, strlen(buf));
        }
        return ret;

diff --git a/wpa_supplicant/src/drivers/driver_wext.h b/wpa_supplicant/src/drivers/driver_wext.h
index 3f7fc4e..63b61c3 100644 (file)
--- a/wpa_supplicant/src/drivers/driver_wext.h
+++ b/wpa_supplicant/src/drivers/driver_wext.h
@@ -43,7 +43,10 @@ struct wpa_driver_wext_data {
        char mlmedev[IFNAMSIZ + 1];
 
        int scan_complete_events;
+#ifdef ANDROID
        int errors;
+       int driver_is_loaded;
+#endif
 };
 
 int wpa_driver_wext_get_ifflags(struct wpa_driver_wext_data *drv, int *flags);