aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-12-16 20:08:41 (GMT)
committerJouni Malinen <j@w1.fi>2013-12-24 06:01:59 (GMT)
commit4e1eae1dff54295d5d8036f8aeb4d84fbd38f7fa (patch)
treeac68419b2abad77e91398ee0ea47b1e0c6cc2bd3 /wpa_supplicant
parent151ab808fa64c7b3d302ec476c5797d89a42ac54 (diff)
downloadhostap-4e1eae1dff54295d5d8036f8aeb4d84fbd38f7fa.zip
hostap-4e1eae1dff54295d5d8036f8aeb4d84fbd38f7fa.tar.gz
hostap-4e1eae1dff54295d5d8036f8aeb4d84fbd38f7fa.tar.bz2
wpa_supplicant: Use monotonic time for temp-disabled networks
Temporarily disabled networks are disabled for a certain duration, so the code should use monotonic time. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/config_ssid.h2
-rw-r--r--wpa_supplicant/events.c4
-rw-r--r--wpa_supplicant/wpa_supplicant.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index af0c3c6..d515030 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -611,7 +611,7 @@ struct wpa_ssid {
/**
* disabled_until - Network block disabled until this time if non-zero
*/
- struct os_time disabled_until;
+ struct os_reltime disabled_until;
/**
* parent_cred - Pointer to parent wpa_cred entry
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 21a1132..fd12cf8 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -53,12 +53,12 @@ static int wpas_select_network_from_last_scan(struct wpa_supplicant *wpa_s,
static int wpas_temp_disabled(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
- struct os_time now;
+ struct os_reltime now;
if (ssid == NULL || ssid->disabled_until.sec == 0)
return 0;
- os_get_time(&now);
+ os_get_reltime(&now);
if (ssid->disabled_until.sec > now.sec)
return ssid->disabled_until.sec - now.sec;
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index f93d718..f25f546 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -3979,7 +3979,7 @@ void wpas_auth_failed(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid = wpa_s->current_ssid;
int dur;
- struct os_time now;
+ struct os_reltime now;
if (ssid == NULL) {
wpa_printf(MSG_DEBUG, "Authentication failure but no known "
@@ -4016,7 +4016,7 @@ void wpas_auth_failed(struct wpa_supplicant *wpa_s)
else
dur = 10;
- os_get_time(&now);
+ os_get_reltime(&now);
if (now.sec + dur <= ssid->disabled_until.sec)
return;