X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=60f46cbb30410115c4e138ee55d2b2246f2688e3;hp=b2fe0dece912b1662ca86bc1741594ddf0c9f7f6;hb=e913f3f232e4809b7218d081ab9f94cef1c94ac3;hpb=6430f8165eb574d78fc4ab18054d32f36c2f241d

diff --git a/src/net.c b/src/net.c
index b2fe0dec..60f46cbb 100644
--- a/src/net.c
+++ b/src/net.c
@@ -41,6 +41,10 @@
 #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
@@ -182,6 +186,12 @@ void terminate_connection(connection_t *c, bool report) {
 		closesocket(c->socket);
 
 	if(c->edge) {
+		if(!c->node) {
+			logger(LOG_ERR, "Connection to %s (%s) has an edge but node is NULL!", c->name, c->hostname);
+			// And that should never happen.
+			abort();
+		}
+
 		if(report && !tunnelserver)
 			send_del_edge(everyone, c->edge);
 
@@ -212,6 +222,12 @@ void terminate_connection(connection_t *c, bool report) {
 		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 +504,9 @@ int main_loop(void) {
 			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;
 				if(c->status.active)