X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=8d0a0cf481ce9ca34197526ec68752785e487972;hp=fd79fdc7ed84ee59233fbac74096e166287fd552;hb=035c8e14f3630424c87be520c1c296a58e67424a;hpb=745a5d0d3eae05f8aa94b7948ee4c796accbb09c

diff --git a/src/net.c b/src/net.c
index fd79fdc7..8d0a0cf4 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
 		  2011      Loïc Grenié <loic.grenie@gmail.com>
 
@@ -41,6 +41,10 @@
 #include "subnet.h"
 #include "xalloc.h"
 
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
 #ifdef HAVE_RESOLV_H
 #include <resolv.h>
 #endif
@@ -186,6 +190,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);
 
@@ -498,7 +508,7 @@ int main_loop(void) {
 			avl_node_t *node;
 			logger(LOG_INFO, "Flushing event queue");
 			expire_events();
-#ifdef HAVE_DECL_RES_INIT
+#if HAVE_DECL_RES_INIT
 			res_init();
 #endif
 			for(node = connection_tree->head; node; node = node->next) {