[PATCH 14/23] wps_registrar: use monotonic time for PIN timeout
Johannes Berg
johannes
Mon Dec 16 12:08:35 PST 2013
From: Johannes Berg <johannes.berg at intel.com>
If the PIN expires, then a timeout is given, so that monotonic
time should be used.
Signed-hostap: Johannes Berg <johannes.berg at intel.com>
---
src/wps/wps_registrar.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index ef17617..a18f91b 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -82,7 +82,7 @@ struct wps_uuid_pin {
#define PIN_LOCKED BIT(0)
#define PIN_EXPIRES BIT(1)
int flags;
- struct os_time expiration;
+ struct os_reltime expiration;
u8 enrollee_addr[ETH_ALEN];
};
@@ -748,7 +748,7 @@ int wps_registrar_add_pin(struct wps_registrar *reg, const u8 *addr,
if (timeout) {
p->flags |= PIN_EXPIRES;
- os_get_time(&p->expiration);
+ os_get_reltime(&p->expiration);
p->expiration.sec += timeout;
}
@@ -797,13 +797,13 @@ static void wps_registrar_remove_pin(struct wps_registrar *reg,
static void wps_registrar_expire_pins(struct wps_registrar *reg)
{
struct wps_uuid_pin *pin, *prev;
- struct os_time now;
+ struct os_reltime now;
- os_get_time(&now);
+ os_get_reltime(&now);
dl_list_for_each_safe(pin, prev, ®->pins, struct wps_uuid_pin, list)
{
if ((pin->flags & PIN_EXPIRES) &&
- os_time_before(&pin->expiration, &now)) {
+ os_reltime_before(&pin->expiration, &now)) {
wpa_hexdump(MSG_DEBUG, "WPS: Expired PIN for UUID",
pin->uuid, WPS_UUID_LEN);
wps_registrar_remove_pin(reg, pin);
--
1.8.5.1
More information about the Hostap
mailing list