 @@ -34,57 +34,54 @@
 #ifdef CONFIG_ELOOP_EPOLL
 #include <sys/epoll.h>
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 #include <sys/event.h>
 #endif /* CONFIG_ELOOP_KQUEUE */
 struct eloop_sock {
 	int sock;
 	void *eloop_data;
 	void *user_data;
 	eloop_sock_handler handler;
-	WPA_TRACE_REF(eloop)
+	WPA_TRACE_REF(eloop);
-	WPA_TRACE_REF(user)
+	WPA_TRACE_REF(user);
 	WPA_TRACE_INFO
 };
 struct eloop_timeout {
 	struct dl_list list;
 	struct os_reltime time;
 	void *eloop_data;
 	void *user_data;
 	eloop_timeout_handler handler;
-	WPA_TRACE_REF(eloop)
+	WPA_TRACE_REF(eloop);
-	WPA_TRACE_REF(user)
+	WPA_TRACE_REF(user);
 	WPA_TRACE_INFO
 };
 struct eloop_signal {
 	int sig;
 	void *user_data;
 	eloop_signal_handler handler;
 	int signaled;
 };
 struct eloop_sock_table {
 	int count;
 	struct eloop_sock *table;
 #if defined(CONFIG_ELOOP_EPOLL) || defined(CONFIG_ELOOP_KQUEUE)
 	eloop_event_type type;
 #else /* CONFIG_ELOOP_EPOLL */
 	int changed;
 #endif /* CONFIG_ELOOP_EPOLL */
 };
 struct eloop_data {
 	int max_sock;
 	int count; /* sum of all table counts */
 #ifdef CONFIG_ELOOP_POLL
 	int max_pollfd_map; /* number of pollfds_map currently allocated */
 	int max_poll_fds; /* number of pollfds currently allocated */
 	struct pollfd *pollfds;
 	struct pollfd **pollfds_map;
 #endif /* CONFIG_ELOOP_POLL */
 #if defined(CONFIG_ELOOP_EPOLL) || defined(CONFIG_ELOOP_KQUEUE)
 @@ -292,29 +289,27 @@ static int eloop_sock_table_add_sock(str
 		eloop_trace_sock_add_ref(table);
 		return -1;
+	}
 	tmp[table->count].sock = sock;
 	tmp[table->count].eloop_data = eloop_data;
 	tmp[table->count].user_data = user_data;
 	tmp[table->count].handler = handler;
 	wpa_trace_record(&tmp[table->count]);
 	table->count++;
 	table->table = tmp;
 	eloop.max_sock = new_max_sock;
 	eloop.count++;
 #if !defined(CONFIG_ELOOP_EPOLL) && !defined(CONFIG_ELOOP_KQUEUE)
 	table->changed = 1;
 #endif /* CONFIG_ELOOP_EPOLL */
 	eloop_trace_sock_add_ref(table);
 #ifdef CONFIG_ELOOP_EPOLL
 	os_memset(&ev, 0, sizeof(ev));
 	switch (table->type) {
 	case EVENT_TYPE_READ:
 		ev.events = EPOLLIN;
 		break;
 	case EVENT_TYPE_WRITE:
 		ev.events = EPOLLOUT;
 		break;
 	/*
 	 * Exceptions are always checked when using epoll, but I suppose it's
 @@ -373,29 +368,27 @@ static void eloop_sock_table_remove_sock
 		if (table->table[i].sock == sock)
 			break;
+	}
 	if (i == table->count)
 		return;
 	eloop_trace_sock_remove_ref(table);
 	if (i != table->count - 1) {
 		os_memmove(&table->table[i], &table->table[i + 1],
 			   (table->count - i - 1) *
 			   sizeof(struct eloop_sock));
+	}
 	table->count--;
 	eloop.count--;
 #if !defined(CONFIG_ELOOP_EPOLL) && !defined(CONFIG_ELOOP_KQUEUE)
 	table->changed = 1;
 #endif /* CONFIG_ELOOP_EPOLL */
 	eloop_trace_sock_add_ref(table);
 #ifdef CONFIG_ELOOP_EPOLL
 	if (epoll_ctl(eloop.epollfd, EPOLL_CTL_DEL, sock, NULL) < 0) {
 		wpa_printf(MSG_ERROR, "%s: epoll_ctl(DEL) for fd=%d "
 			   "failed. %s\n", __func__, sock, strerror(errno));
 		return;
+	}
 	os_memset(&eloop.fd_table[sock], 0, sizeof(struct eloop_sock));
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	EV_SET(&ke, sock, 0, EV_DELETE, 0, 0, NULL);
 	if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) == -1) {
 		wpa_printf(MSG_ERROR, "%s: kevent(DEL) for fd=%d "
 @@ -591,43 +584,51 @@ static void eloop_sock_table_dispatch(st
 #ifdef CONFIG_ELOOP_EPOLL
 static void eloop_sock_table_dispatch(struct epoll_event *events, int nfds)
+{
 	struct eloop_sock *table;
 	int i;
 	for (i = 0; i < nfds; i++) {
 		table = &eloop.fd_table[events[i].data.fd];
 		if (table->handler == NULL)
 			continue;
 		table->handler(table->sock, table->eloop_data,
 			       table->user_data);
 		if (eloop.readers.changed ||
 		    eloop.writers.changed ||
 		    eloop.exceptions.changed)
 			break;
+	}
+}
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 static void eloop_sock_table_dispatch(struct kevent *events, int nfds)
+{
 	struct eloop_sock *table;
 	int i;
 	for (i = 0; i < nfds; i++) {
 		table = &eloop.fd_table[events[i].ident];
 		if (table->handler == NULL)
 			continue;
 		table->handler(table->sock, table->eloop_data,
 			       table->user_data);
 		if (eloop.readers.changed ||
 		    eloop.writers.changed ||
 		    eloop.exceptions.changed)
 			break;
+	}
+}
 #endif /* CONFIG_ELOOP_KQUEUE */
 static void eloop_sock_table_destroy(struct eloop_sock_table *table)
+{
 	if (table) {
 		int i;
 		for (i = 0; i < table->count && table->table; i++) {
 			wpa_printf(MSG_INFO, "ELOOP: remaining socket: "
 				   "sock=%d eloop_data=%p user_data=%p "
 				   "handler=%p",
 				   table->table[i].sock,
 @@ -1010,26 +1011,40 @@ void eloop_run(void)
 #ifdef CONFIG_ELOOP_SELECT
 	rfds = os_malloc(sizeof(*rfds));
 	wfds = os_malloc(sizeof(*wfds));
 	efds = os_malloc(sizeof(*efds));
 	if (rfds == NULL || wfds == NULL || efds == NULL)
 		goto out;
 #endif /* CONFIG_ELOOP_SELECT */
 	while (!eloop.terminate &&
 	       (!dl_list_empty(&eloop.timeout) || eloop.readers.count > 0 ||
 		eloop.writers.count > 0 || eloop.exceptions.count > 0)) {
 		struct eloop_timeout *timeout;
 		if (eloop.pending_terminate) {
 			/*
 			 * This may happen in some corner cases where a signal
 			 * is received during a blocking operation. We need to
 			 * process the pending signals and exit if requested to
 			 * avoid hitting the SIGALRM limit if the blocking
 			 * operation took more than two seconds.
 			 */
 			eloop_process_pending_signals();
 			if (eloop.terminate)
 				break;
+		}
 		timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
 					list);
 		if (timeout) {
 			os_get_reltime(&now);
 			if (os_reltime_before(&now, &timeout->time))
 				os_reltime_sub(&timeout->time, &now, &tv);
 			else
 				tv.sec = tv.usec = 0;
 #if defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL)
 			timeout_ms = tv.sec * 1000 + tv.usec / 1000;
 #endif /* defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL) */
 #ifdef CONFIG_ELOOP_SELECT
 			_tv.tv_sec = tv.sec;
 @@ -1081,47 +1096,66 @@ void eloop_run(void)
 #ifdef CONFIG_ELOOP_SELECT
 				   "select"
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 				   "epoll"
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 				   "kqueue"
 #endif /* CONFIG_ELOOP_EKQUEUE */
 				   , strerror(errno));
 			goto out;
+		}
 		eloop.readers.changed = 0;
 		eloop.writers.changed = 0;
 		eloop.exceptions.changed = 0;
 		eloop_process_pending_signals();
 		/* check if some registered timeouts have occurred */
 		timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
 					list);
 		if (timeout) {
 			os_get_reltime(&now);
 			if (!os_reltime_before(&now, &timeout->time)) {
 				void *eloop_data = timeout->eloop_data;
 				void *user_data = timeout->user_data;
 				eloop_timeout_handler handler =
 					timeout->handler;
 				eloop_remove_timeout(timeout);
 				handler(eloop_data, user_data);
+			}
+		}
 		if (res <= 0)
 			continue;
 		if (eloop.readers.changed ||
 		    eloop.writers.changed ||
 		    eloop.exceptions.changed) {
 			 /*
 			  * Sockets may have been closed and reopened with the
 			  * same FD in the signal or timeout handlers, so we
 			  * must skip the previous results and check again
 			  * whether any of the currently registered sockets have
 			  * events.
 			  */
 			continue;
+		}
 #ifdef CONFIG_ELOOP_POLL
 		eloop_sock_table_dispatch(&eloop.readers, &eloop.writers,
 					  &eloop.exceptions, eloop.pollfds_map,
 					  eloop.max_pollfd_map);
 #endif /* CONFIG_ELOOP_POLL */
 #ifdef CONFIG_ELOOP_SELECT
 		eloop_sock_table_dispatch(&eloop.readers, rfds);
 		eloop_sock_table_dispatch(&eloop.writers, wfds);
 		eloop_sock_table_dispatch(&eloop.exceptions, efds);
 #endif /* CONFIG_ELOOP_SELECT */
 #ifdef CONFIG_ELOOP_EPOLL
 		eloop_sock_table_dispatch(eloop.epoll_events, res);
 #endif /* CONFIG_ELOOP_EPOLL */
 @@ -1186,27 +1220,27 @@ void eloop_destroy(void)
 #ifdef CONFIG_ELOOP_EPOLL
 	os_free(eloop.epoll_events);
 	close(eloop.epollfd);
 #endif /* CONFIG_ELOOP_EPOLL */
 #ifdef CONFIG_ELOOP_KQUEUE
 	os_free(eloop.kqueue_events);
 	close(eloop.kqueuefd);
 #endif /* CONFIG_ELOOP_KQUEUE */
+}
 int eloop_terminated(void)
+{
-	return eloop.terminate;
+	return eloop.terminate || eloop.pending_terminate;
+}
 void eloop_wait_for_read_sock(int sock)
+{
 #ifdef CONFIG_ELOOP_POLL
 	struct pollfd pfd;
 	if (sock < 0)
 		return;
 	os_memset(&pfd, 0, sizeof(pfd));
 	pfd.fd = sock;