From patchwork Fri Oct 26 03:15:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Spinadel, David" X-Patchwork-Id: 194603 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id F390F2C00B1 for ; Sat, 27 Oct 2012 18:48:18 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 7E47D9C157; Sat, 27 Oct 2012 03:48:13 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ACObKlyo4Aym; Sat, 27 Oct 2012 03:48:13 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id DE1169C169; Sat, 27 Oct 2012 03:48:08 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id B023A9C169 for ; Sat, 27 Oct 2012 03:48:07 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nC6B6yilqAFw for ; Sat, 27 Oct 2012 03:48:02 -0400 (EDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id B63FC9C157 for ; Sat, 27 Oct 2012 03:48:01 -0400 (EDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 27 Oct 2012 00:47:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,650,1344236400"; d="scan'208,217,223";a="240404486" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by fmsmga002.fm.intel.com with ESMTP; 25 Oct 2012 20:15:41 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.19.17.221) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 25 Oct 2012 20:15:40 -0700 Received: from hasmsx152.ger.corp.intel.com (10.184.195.15) by fmsmsx152.amr.corp.intel.com (10.19.17.221) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 25 Oct 2012 20:15:40 -0700 Received: from hasmsx105.ger.corp.intel.com ([169.254.1.161]) by HASMSX152.ger.corp.intel.com ([169.254.3.53]) with mapi id 14.01.0355.002; Fri, 26 Oct 2012 05:15:37 +0200 From: "Spinadel, David" To: "hostap@lists.shmoo.com" Subject: [PATCH] wpa_supplicant: abort scan after removing all networks Thread-Topic: [PATCH] wpa_supplicant: abort scan after removing all networks Thread-Index: Ac2zKCJDtj3T0IyeTEa8aTYgnNJ+GA== Date: Fri, 26 Oct 2012 03:15:37 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.184.70.11] MIME-Version: 1.0 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From 8f3b462083bdca2a94d6af32547b7965fdffa9d6 Mon Sep 17 00:00:00 2001 From: David Spinadel Date: Wed, 10 Oct 2012 15:37:36 +0200 Subject: [PATCH] wpa_supplicant: abort scan after removing all networks Change-Id: I737848dabed49d961985845f2e86f717c2926f0c Signed-off-by: David Spinadel Reviewed-on: http://git-mwg.jer.intel.com/gerrit/3585 Reviewed-by: Jenkins Tested-by: Jenkins Reviewed-by: Max Stepanov Tested-by: Max Stepanov --- wpa_supplicant/ctrl_iface.c | 7 +++++++ wpa_supplicant/dbus/dbus_new_handlers.c | 8 ++++++++ wpa_supplicant/dbus/dbus_old_handlers.c | 5 +++++ wpa_supplicant/wps_supplicant.c | 5 +++++ 4 files changed, 25 insertions(+), 0 deletions(-) -- 1.7.1 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index d8e4864..0eeb9ec 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2085,6 +2085,8 @@ static int wpa_supplicant_ctrl_iface_remove_network( /* cmd: "" or "all" */ if (os_strcmp(cmd, "all") == 0) { wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_NETWORK all"); + wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_supplicant_cancel_scan(wpa_s); ssid = wpa_s->conf->ssid; while (ssid) { struct wpa_ssid *remove_ssid = ssid; @@ -2142,6 +2144,11 @@ static int wpa_supplicant_ctrl_iface_remove_network( return -1; } + if (!wpa_s->conf->ssid) { + wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_supplicant_cancel_scan(wpa_s); + } + return 0; } diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 00378be..9422b24 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -1525,6 +1525,11 @@ DBusMessage * wpas_dbus_handler_remove_network(DBusMessage *message, wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING); + if (!wpa_s->conf->ssid) { + wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_supplicant_cancel_scan(wpa_s); + } + out: os_free(iface); os_free(net_id); @@ -1538,6 +1543,9 @@ static void remove_network(void *arg, struct wpa_ssid *ssid) wpas_notify_network_removed(wpa_s, ssid); + wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_supplicant_cancel_scan(wpa_s); + if (wpa_config_remove_network(wpa_s->conf, ssid->id) < 0) { wpa_printf(MSG_ERROR, "wpas_dbus_handler_remove_all_networks[dbus]: " diff --git a/wpa_supplicant/dbus/dbus_old_handlers.c b/wpa_supplicant/dbus/dbus_old_handlers.c index e217a72..ff60f6e 100644 --- a/wpa_supplicant/dbus/dbus_old_handlers.c +++ b/wpa_supplicant/dbus/dbus_old_handlers.c @@ -870,6 +870,11 @@ DBusMessage * wpas_dbus_iface_remove_network(DBusMessage *message, WLAN_REASON_DEAUTH_LEAVING); reply = wpas_dbus_new_success_reply(message); + if (!wpa_s->conf->ssid) { + wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_supplicant_cancel_scan(wpa_s); + } + out: os_free(iface); os_free(net_id); diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c index dd48ab7..d8603fd 100644 --- a/wpa_supplicant/wps_supplicant.c +++ b/wpa_supplicant/wps_supplicant.c @@ -756,6 +756,11 @@ static void wpas_clear_wps(struct wpa_supplicant *wpa_s) } wpas_wps_clear_ap_info(wpa_s); + + if (!wpa_s->conf->ssid) { + wpa_supplicant_cancel_sched_scan(wpa_s); + wpa_supplicant_cancel_scan(wpa_s); + } }