X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ca9db7cfacc37b9939e9d08ada67af8d9de862d6;hp=1682705da74153241b3a96571ab5f8b6f37bdf54;hb=0966cca8ab6dcde2747c717f21d73fd332e04242;hpb=e9576632dc4b780b867044269d06cc50f76d8c05

diff --git a/src/net.c b/src/net.c
index 1682705d..ca9db7cf 100644
--- a/src/net.c
+++ b/src/net.c
@@ -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,18 +423,17 @@ int main_loop(void)
 			}
 		}
 
+		if(sigalrm) {
+			logger(LOG_INFO, _("Flushing event queue"));
+			expire_events();
+			sigalrm = false;
+		}
 
 		while((event = get_expired_event())) {
 			event->handler(event->data);
 			free_event(event);
 		}
 
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-			flush_events();
-			sigalrm = false;
-		}
-
 		if(sighup) {
 			connection_t *c;
 			avl_node_t *node;
@@ -456,14 +457,6 @@ int main_loop(void)
 			for(node = connection_tree->head; node; node = node->next) {
 				c = node->data;
 				
-				if(c->outgoing) {
-					free(c->outgoing->name);
-					if(c->outgoing->ai)
-						freeaddrinfo(c->outgoing->ai);
-					free(c->outgoing);
-					c->outgoing = NULL;
-				}
-				
 				asprintf(&fname, "%s/hosts/%s", confbase, c->name);
 				if(stat(fname, &s) || s.st_mtime > last_config_check)
 					terminate_connection(c, c->status.active);