X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=e9c7020a488cf3ac83b0843b845118165e894e4f;hb=834290b00f859412ee48bef454a07083cb727130;hp=81a0d894daaf8f818a8139c72404be5f40a7ea5f;hpb=0200d3cd5d773d9b101c33264532d2a301c2af32;p=meshlink

diff --git a/src/net.c b/src/net.c
index 81a0d894..e9c7020a 100644
--- a/src/net.c
+++ b/src/net.c
@@ -29,7 +29,7 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.h"
+#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -355,7 +355,7 @@ int main_loop(void)
 	struct timeval tv;
 	int r, maxfd;
 	time_t last_ping_check, last_config_check, last_graph_dump;
-	event_t *event;
+	tevent_t *event;
 
 	cp();
 
@@ -422,19 +422,14 @@ int main_loop(void)
 		}
 
 
-		while((event = get_expired_event())) {
+		while((event = get_expired_tevent())) {
 			event->handler(event->data);
-			free(event);
+			free_tevent(event);
 		}
 
 		if(sigalrm) {
 			logger(LOG_INFO, _("Flushing event queue"));
-
-			while(event_tree->head) {
-				event = event_tree->head->data;
-				event->handler(event->data);
-				event_del(event);
-			}
+			flush_tevents();
 			sigalrm = false;
 		}
 
@@ -463,7 +458,8 @@ int main_loop(void)
 				
 				if(c->outgoing) {
 					free(c->outgoing->name);
-					freeaddrinfo(c->outgoing->ai);
+					if(c->outgoing->ai)
+						freeaddrinfo(c->outgoing->ai);
 					free(c->outgoing);
 					c->outgoing = NULL;
 				}