From patchwork Thu Dec 13 17:28:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 206197 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 56A482C0097 for ; Fri, 14 Dec 2012 04:28:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 40BF09D089; Thu, 13 Dec 2012 12:28:45 -0500 (EST) 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 rk9dpMYPHb4g; Thu, 13 Dec 2012 12:28:45 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 47FE29D0C4; Thu, 13 Dec 2012 12:28:39 -0500 (EST) 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 6E06E9D089 for ; Thu, 13 Dec 2012 12:28:38 -0500 (EST) 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 AU6dni4q2r4A for ; Thu, 13 Dec 2012 12:28:33 -0500 (EST) Received: from ns3.lanforge.com (mail.candelatech.com [208.74.158.172]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 27A0E9C234 for ; Thu, 13 Dec 2012 12:28:33 -0500 (EST) Received: from fs3.candelatech.com (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id qBDHSKNb012785 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 13 Dec 2012 09:28:20 -0800 From: greearb@candelatech.com To: hostap@lists.shmoo.com Subject: [PATCH 1/2] wpa_supplicant: Support minimum interval between scan attempts. Date: Thu, 13 Dec 2012 09:28:14 -0800 Message-Id: <1355419695-3956-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 Cc: Ben Greear 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: Ben Greear When running lots of vifs, they can all end up wanting to scan right after the other. This leaves too little time for useful work to happen. Allow users to configure a minimum timer interval (in seconds) between scans. Default is zero, which is current behaviour. Signed-off-by: Ben Greear --- wpa_supplicant/config.c | 2 ++ wpa_supplicant/config.h | 4 ++++ wpa_supplicant/events.c | 14 ++++++++++++++ wpa_supplicant/scan.c | 20 +++++++++++++++++++- wpa_supplicant/scan.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 6 files changed, 41 insertions(+), 1 deletions(-) diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index e157845..cb5748d 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2609,6 +2609,7 @@ struct wpa_config * wpa_config_alloc_empty(const char *ctrl_interface, config->wmm_ac_params[1] = ac_bk; config->wmm_ac_params[2] = ac_vi; config->wmm_ac_params[3] = ac_vo; + config->min_scan_gap = DEFAULT_MIN_SCAN_GAP; if (ctrl_interface) config->ctrl_interface = os_strdup(ctrl_interface); @@ -2981,6 +2982,7 @@ static const struct global_parse_data global_fields[] = { { INT(dot11RSNAConfigPMKLifetime), 0 }, { INT(dot11RSNAConfigPMKReauthThreshold), 0 }, { INT(dot11RSNAConfigSATimeout), 0 }, + { INT(min_scan_gap), 0 }, #ifndef CONFIG_NO_CONFIG_WRITE { INT(update_config), 0 }, #endif /* CONFIG_NO_CONFIG_WRITE */ diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h index c0aea0b..4e972cb 100644 --- a/wpa_supplicant/config.h +++ b/wpa_supplicant/config.h @@ -24,6 +24,7 @@ #define DEFAULT_BSS_EXPIRATION_SCAN_COUNT 2 #define DEFAULT_MAX_NUM_STA 128 #define DEFAULT_ACCESS_NETWORK_TYPE 15 +#define DEFAULT_MIN_SCAN_GAP 0 #include "config_ssid.h" #include "wps/wps.h" @@ -646,6 +647,9 @@ struct wpa_config { */ int disassoc_low_ack; + /* Minimum interval between scan requests, in seconds */ + int min_scan_gap; + /** * interworking - Whether Interworking (IEEE 802.11u) is enabled */ diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 35ba8e4..9132414 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -1071,6 +1071,7 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s, #ifndef CONFIG_NO_RANDOM_POOL size_t i, num; #endif /* CONFIG_NO_RANDOM_POOL */ + struct os_time t; #ifdef CONFIG_AP if (wpa_s->ap_iface) @@ -1146,6 +1147,19 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s, return 0; } + os_get_time(&t); + wpa_s->last_scan_rx_sec = t.sec; + /* Now, *if* we have (another) scan scheduled, and a min-scan-gap + * configured, make sure it happens after the minimum time. Since + * one STA's scan results can be propagated to other STA on the + * same radio, this is actually a common case. + */ + if (wpa_s->conf->min_scan_gap && + eloop_is_timeout_registered(wpa_supplicant_scan, wpa_s, NULL)) { + /* Min gap will be applied as needed */ + wpa_supplicant_req_scan(wpa_s, 1, 0); + } + wpa_dbg(wpa_s, MSG_DEBUG, "New scan results available"); wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS); wpas_notify_scan_results(wpa_s); diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 82c5b78..8021a7b 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -501,7 +501,7 @@ static int shared_vif_oper_freq(struct wpa_supplicant *wpa_s) #endif /* CONFIG_P2P */ -static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) +void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) { struct wpa_supplicant *wpa_s = eloop_ctx; struct wpa_ssid *ssid; @@ -835,6 +835,24 @@ void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec) } } + /* With lots of VIFS, we can end up trying to scan very often. + * This can cause us to not be able to associate due to missing + * EAPOL key messages and such. So, allow a minimum time between + * scans. + */ + if (wpa_s->conf->min_scan_gap) { + int mingap; + struct os_time t; + os_get_time(&t); + + mingap = wpa_s->conf->min_scan_gap + - (t.sec - wpa_s->last_scan_rx_sec); + if (mingap > wpa_s->conf->min_scan_gap) + mingap = wpa_s->conf->min_scan_gap; + if (mingap > sec) + sec = mingap; + } + wpa_dbg(wpa_s, MSG_DEBUG, "Setting scan request: %d sec %d usec", sec, usec); eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL); diff --git a/wpa_supplicant/scan.h b/wpa_supplicant/scan.h index b0ddf97..60248f3 100644 --- a/wpa_supplicant/scan.h +++ b/wpa_supplicant/scan.h @@ -10,6 +10,7 @@ #define SCAN_H int wpa_supplicant_enabled_networks(struct wpa_supplicant *wpa_s); +void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx); void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec); int wpa_supplicant_delayed_sched_scan(struct wpa_supplicant *wpa_s, int sec, int usec); diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index a92d0c1..c24ee57 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -321,6 +321,7 @@ struct wpa_supplicant { int key_mgmt; int wpa_proto; int mgmt_group_cipher; + int last_scan_rx_sec; void *drv_priv; /* private data used by driver_ops */ void *global_drv_priv;