projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reload /etc/resolv.conf in SIGALRM handler
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
b2fe0de
..
392aa7a
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-40,6
+40,7
@@
#include "route.h"
#include "subnet.h"
#include "xalloc.h"
#include "route.h"
#include "subnet.h"
#include "xalloc.h"
+#include "resolv.h"
bool do_purge = false;
volatile bool running = false;
bool do_purge = false;
volatile bool running = false;
@@
-212,6
+213,12
@@
void terminate_connection(connection_t *c, bool report) {
c->status.remove = false;
do_outgoing_connection(c);
}
c->status.remove = false;
do_outgoing_connection(c);
}
+
+#ifndef HAVE_MINGW
+ /* Clean up dead proxy processes */
+
+ while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
}
/*
}
/*
@@
-488,6
+495,7
@@
int main_loop(void) {
avl_node_t *node;
logger(LOG_INFO, "Flushing event queue");
expire_events();
avl_node_t *node;
logger(LOG_INFO, "Flushing event queue");
expire_events();
+ res_init();
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
if(c->status.active)
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
if(c->status.active)