X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=inline;f=src%2Fnet.c;h=1de5f1fb711530eff4420f212062ef26424e06bc;hb=116065afe352221ac6c2c8e34c109252004d6a59;hp=81a0d894daaf8f818a8139c72404be5f40a7ea5f;hpb=0200d3cd5d773d9b101c33264532d2a301c2af32;p=tinc

diff --git a/src/net.c b/src/net.c
index 81a0d894..1de5f1fb 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -295,8 +295,10 @@ static void check_network_activity(fd_set * readset, fd_set * writeset)
 
 	/* check input from kernel */
 	if(FD_ISSET(device_fd, readset)) {
-		if(read_packet(&packet))
+		if(read_packet(&packet)) {
+			packet.priority = 0;
 			route(myself, &packet);
+		}
 	}
 
 	/* check meta connections */
@@ -421,23 +423,17 @@ int main_loop(void)
 			}
 		}
 
-
-		while((event = get_expired_event())) {
-			event->handler(event->data);
-			free(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);
-			}
+			expire_events();
 			sigalrm = false;
 		}
 
+		while((event = get_expired_event())) {
+			event->handler(event->data);
+			free_event(event);
+		}
+
 		if(sighup) {
 			connection_t *c;
 			avl_node_t *node;
@@ -463,7 +459,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;
 				}