X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=1de5f1fb711530eff4420f212062ef26424e06bc;hb=116065afe352221ac6c2c8e34c109252004d6a59;hp=1682705da74153241b3a96571ab5f8b6f37bdf54;hpb=e9576632dc4b780b867044269d06cc50f76d8c05;p=tinc diff --git a/src/net.c b/src/net.c index 1682705d..1de5f1fb 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;