projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch from Scott Lamb preventing an infinite loop when sending SIGALRM.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
81a0d89
..
f6b1470
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-424,17
+424,12
@@
int main_loop(void)
while((event = get_expired_event())) {
event->handler(event->data);
while((event = get_expired_event())) {
event->handler(event->data);
- free(event);
+ free
_event
(event);
}
if(sigalrm) {
logger(LOG_INFO, _("Flushing event queue"));
}
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_events();
sigalrm = false;
}
sigalrm = false;
}
@@
-463,7
+458,8
@@
int main_loop(void)
if(c->outgoing) {
free(c->outgoing->name);
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;
}
free(c->outgoing);
c->outgoing = NULL;
}