jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

RADIUS client: Use monotonic time

Browse source 
Since the RADIUS client cares about relative time (retry timeout)
only, it should use monotonic time.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-12-16 21:08:29 +01:00 committed by Jouni Malinen
parent acb69cec6f
commit 40128043ca
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/radius/radius_client.c
View file

@ -122,7 +122,7 @@ struct radius_msg_list {
/** /**
* last_attempt - Time of the last transmission attempt * last_attempt - Time of the last transmission attempt
*/ */
struct os_time last_attempt; struct os_reltime last_attempt;
/** /**
* shared_secret - Shared secret with the target RADIUS server * shared_secret - Shared secret with the target RADIUS server
@ -351,7 +351,7 @@ static int radius_client_retransmit(struct radius_client_data *radius,
HOSTAPD_LEVEL_DEBUG, "Resending RADIUS message (id=%d)", HOSTAPD_LEVEL_DEBUG, "Resending RADIUS message (id=%d)",
radius_msg_get_hdr(entry->msg)->identifier); radius_msg_get_hdr(entry->msg)->identifier);
os_get_time(&entry->last_attempt); os_get_reltime(&entry->last_attempt);
buf = radius_msg_get_buf(entry->msg); buf = radius_msg_get_buf(entry->msg);
if (send(s, wpabuf_head(buf), wpabuf_len(buf), 0) < 0) if (send(s, wpabuf_head(buf), wpabuf_len(buf), 0) < 0)
radius_client_handle_send_error(radius, s, entry->msg_type); radius_client_handle_send_error(radius, s, entry->msg_type);
@ -373,7 +373,7 @@ static void radius_client_timer(void *eloop_ctx, void *timeout_ctx)
{ {
struct radius_client_data *radius = eloop_ctx; struct radius_client_data *radius = eloop_ctx;
struct hostapd_radius_servers *conf = radius->conf; struct hostapd_radius_servers *conf = radius->conf;
struct os_time now; struct os_reltime now;
os_time_t first; os_time_t first;
struct radius_msg_list *entry, *prev, *tmp; struct radius_msg_list *entry, *prev, *tmp;
int auth_failover = 0, acct_failover = 0; int auth_failover = 0, acct_failover = 0;
@ -383,7 +383,7 @@ static void radius_client_timer(void *eloop_ctx, void *timeout_ctx)
if (!entry) if (!entry)
return; return;
os_get_time(&now); os_get_reltime(&now);
first = 0; first = 0;
prev = NULL; prev = NULL;
@ -481,7 +481,7 @@ static void radius_client_timer(void *eloop_ctx, void *timeout_ctx)
static void radius_client_update_timeout(struct radius_client_data *radius) static void radius_client_update_timeout(struct radius_client_data *radius)
{ {
struct os_time now; struct os_reltime now;
os_time_t first; os_time_t first;
struct radius_msg_list *entry; struct radius_msg_list *entry;
@ -497,7 +497,7 @@ static void radius_client_update_timeout(struct radius_client_data *radius)
first = entry->next_try; first = entry->next_try;
} }
os_get_time(&now); os_get_reltime(&now);
if (first < now.sec) if (first < now.sec)
first = now.sec; first = now.sec;
eloop_register_timeout(first - now.sec, 0, radius_client_timer, radius, eloop_register_timeout(first - now.sec, 0, radius_client_timer, radius,
@ -536,7 +536,7 @@ static void radius_client_list_add(struct radius_client_data *radius,
entry->msg_type = msg_type; entry->msg_type = msg_type;
entry->shared_secret = shared_secret; entry->shared_secret = shared_secret;
entry->shared_secret_len = shared_secret_len; entry->shared_secret_len = shared_secret_len;
os_get_time(&entry->last_attempt); os_get_reltime(&entry->last_attempt);
entry->first_try = entry->last_attempt.sec; entry->first_try = entry->last_attempt.sec;
entry->next_try = entry->first_try + RADIUS_CLIENT_FIRST_WAIT; entry->next_try = entry->first_try + RADIUS_CLIENT_FIRST_WAIT;
entry->attempts = 1; entry->attempts = 1;
@ -692,7 +692,7 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx)
struct radius_rx_handler *handlers; struct radius_rx_handler *handlers;
size_t num_handlers, i; size_t num_handlers, i;
struct radius_msg_list *req, *prev_req; struct radius_msg_list *req, *prev_req;
struct os_time now; struct os_reltime now;
struct hostapd_radius_server *rconf; struct hostapd_radius_server *rconf;
int invalid_authenticator = 0; int invalid_authenticator = 0;
@ -772,7 +772,7 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx)
goto fail; goto fail;
} }
os_get_time(&now); os_get_reltime(&now);
roundtrip = (now.sec - req->last_attempt.sec) * 100 + roundtrip = (now.sec - req->last_attempt.sec) * 100 +
(now.usec - req->last_attempt.usec) / 10000; (now.usec - req->last_attempt.usec) / 10000;
hostapd_logger(radius->ctx, req->addr, HOSTAPD_MODULE_RADIUS, hostapd_logger(radius->ctx, req->addr, HOSTAPD_MODULE_RADIUS,