From 06c7b7f0b5f4deed675a7b81e33830311da7339a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 28 Feb 2014 00:29:34 +0200 Subject: [PATCH] HS 2.0R2: Fix temporary network disabling in Deauth Req case Commits 7ef6947993d4b09dea6797b96f34dbcfed57d90e and 533536d82ac63512c31ff0bae403d437392d34e0 added this temporarily disabling case, but those commits were merged in without having been converted to the new os_reltime design used for ssid->disabled_until. Consequently, they ended up disabling the network for 44 years or so too long time (depending on what values the relative timestamp had accummulated so far). Fix this by using relative timestamps consistently. Signed-off-by: Jouni Malinen --- wpa_supplicant/hs20_supplicant.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c index b873c7c15..b342d5d89 100644 --- a/wpa_supplicant/hs20_supplicant.c +++ b/wpa_supplicant/hs20_supplicant.c @@ -885,8 +885,8 @@ void hs20_rx_deauth_imminent_notice(struct wpa_supplicant *wpa_s, u8 code, /* TODO: For now, disable full ESS since some drivers may not * support disabling per BSS. */ if (wpa_s->current_ssid) { - struct os_time now; - os_get_time(&now); + struct os_reltime now; + os_get_reltime(&now); if (now.sec + reauth_delay <= wpa_s->current_ssid->disabled_until.sec) return; @@ -898,8 +898,8 @@ void hs20_rx_deauth_imminent_notice(struct wpa_supplicant *wpa_s, u8 code, } if (code == HS20_DEAUTH_REASON_CODE_ESS && wpa_s->current_ssid) { - struct os_time now; - os_get_time(&now); + struct os_reltime now; + os_get_reltime(&now); if (now.sec + reauth_delay <= wpa_s->current_ssid->disabled_until.sec) return;