DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests1 Projects Releases Packages Wiki Activity Actions

AP: Use monotonic time for MMIC failure/TKIP countermeasures

Browse source 
Wall time jumps shouldn't affect MMIC failure/TKIP countermeasures,
so use monotonic time. Change the michael_mic_failure variable to
struct os_reltime for type-safety.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-12-16 21:08:24 +01:00 • committed by Jouni Malinen
parent dd4e32bae4
commit 7ffe7d222a
2 changed files with 5 additions and 5 deletions

2
src/ap/hostapd.h
View file

@ -146,7 +146,7 @@ struct hostapd_data {
struct eapol_authenticator *eapol_auth; struct eapol_authenticator *eapol_auth;
struct rsn_preauth_interface *preauth_iface; struct rsn_preauth_interface *preauth_iface;
time_t michael_mic_failure; struct os_reltime michael_mic_failure;
int michael_mic_failures; int michael_mic_failures;
int tkip_countermeasures; int tkip_countermeasures;

8
src/ap/tkip_countermeasures.c
View file

@ -68,7 +68,7 @@ void ieee80211_tkip_countermeasures_deinit(struct hostapd_data *hapd)
int michael_mic_failure(struct hostapd_data *hapd, const u8 *addr, int local) int michael_mic_failure(struct hostapd_data *hapd, const u8 *addr, int local)
{ {
struct os_time now; struct os_reltime now;
int ret = 0; int ret = 0;
if (addr && local) { if (addr && local) {
@ -89,8 +89,8 @@ int michael_mic_failure(struct hostapd_data *hapd, const u8 *addr, int local)
} }
} }
os_get_time(&now); os_get_reltime(&now);
if (now.sec > hapd->michael_mic_failure + 60) { if (os_reltime_expired(&now, &hapd->michael_mic_failure, 60)) {
hapd->michael_mic_failures = 1; hapd->michael_mic_failures = 1;
} else { } else {
hapd->michael_mic_failures++; hapd->michael_mic_failures++;
@ -99,7 +99,7 @@ int michael_mic_failure(struct hostapd_data *hapd, const u8 *addr, int local)
ret = 1; ret = 1;
} }
} }
hapd->michael_mic_failure = now.sec; hapd->michael_mic_failure = now;
return ret; return ret;
} }