projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change flush_events() to expire_events().
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
1682705
..
1de5f1f
100644
(file)
--- 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)) {
/* check input from kernel */
if(FD_ISSET(device_fd, readset)) {
- if(read_packet(&packet))
+ if(read_packet(&packet)) {
+ packet.priority = 0;
route(myself, &packet);
route(myself, &packet);
+ }
}
/* check meta connections */
}
/* 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);
}
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;
if(sighup) {
connection_t *c;
avl_node_t *node;