projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an autoconf check for res_init().
[oweals/tinc.git]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index e5ffc4f528bcba92daaad1aa538e0dc283f2c730..fd79fdc7ed84ee59233fbac74096e166287fd552 100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-41,6
+41,10
@@
#include "subnet.h"
#include "xalloc.h"
#include "subnet.h"
#include "xalloc.h"
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
bool do_purge = false;
volatile bool running = false;
#ifdef HAVE_PSELECT
bool do_purge = false;
volatile bool running = false;
#ifdef HAVE_PSELECT
@@
-212,6
+216,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,9
+498,13
@@
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();
+#ifdef HAVE_DECL_RES_INIT
+ res_init();
+#endif
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
- send_ping(c);
+ if(c->status.active)
+ send_ping(c);
}
sigalrm = false;
}
}
sigalrm = false;
}