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

eloop_win: Update to be closer to the current eloop.c

Browse source 
Some fixes had were made only in eloop.c.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-02-03 17:13:37 +02:00
parent 5960afcd18
commit 328bc71776
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/utils/eloop_win.c
View file

@ -241,10 +241,13 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
struct eloop_timeout *timeout, *tmp; struct eloop_timeout *timeout, *tmp;
os_time_t now_sec; os_time_t now_sec;
timeout = os_malloc(sizeof(*timeout)); timeout = os_zalloc(sizeof(*timeout));
if (timeout == NULL) if (timeout == NULL)
return -1; return -1;
os_get_time(&timeout->time); if (os_get_time(&timeout->time) < 0) {
os_free(timeout);
return -1;
}
now_sec = timeout->time.sec; now_sec = timeout->time.sec;
timeout->time.sec += secs; timeout->time.sec += secs;
if (timeout->time.sec < now_sec) { if (timeout->time.sec < now_sec) {
@ -279,6 +282,13 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
} }
static void eloop_remove_timeout(struct eloop_timeout *timeout)
{
dl_list_del(&timeout->list);
os_free(timeout);
}
int eloop_cancel_timeout(eloop_timeout_handler handler, int eloop_cancel_timeout(eloop_timeout_handler handler,
void *eloop_data, void *user_data) void *eloop_data, void *user_data)
{ {
@ -292,8 +302,7 @@ int eloop_cancel_timeout(eloop_timeout_handler handler,
eloop_data == ELOOP_ALL_CTX) && eloop_data == ELOOP_ALL_CTX) &&
(timeout->user_data == user_data || (timeout->user_data == user_data ||
user_data == ELOOP_ALL_CTX)) { user_data == ELOOP_ALL_CTX)) {
dl_list_del(&timeout->list); eloop_remove_timeout(timeout);
os_free(timeout);
removed++; removed++;
} }
} }
@ -487,10 +496,12 @@ void eloop_run(void)
if (timeout) { if (timeout) {
os_get_time(&now); os_get_time(&now);
if (!os_time_before(&now, &timeout->time)) { if (!os_time_before(&now, &timeout->time)) {
dl_list_del(&timeout->list); void *eloop_data = timeout->eloop_data;
timeout->handler(timeout->eloop_data, void *user_data = timeout->user_data;
timeout->user_data); eloop_timeout_handler handler =
os_free(timeout); timeout->handler;
eloop_remove_timeout(timeout);
handler(eloop_data, user_data);
} }
} }
@ -551,8 +562,7 @@ void eloop_destroy(void)
dl_list_for_each_safe(timeout, prev, &eloop.timeout, dl_list_for_each_safe(timeout, prev, &eloop.timeout,
struct eloop_timeout, list) { struct eloop_timeout, list) {
dl_list_del(&timeout->list); eloop_remove_timeout(timeout);
os_free(timeout);
} }
os_free(eloop.readers); os_free(eloop.readers);
os_free(eloop.signals); os_free(eloop.signals);