X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=87deb97b60d669bf19897a54b6dbd275de644f72;hb=8c0e37e33806cc44948e49d83ebce26dae3ba86d;hp=adec200393001353c60340d9f2fe1c79ada28935;hpb=a86faaf34711d6b0f278b670d70a229a3cf0d479;p=meshlink

diff --git a/src/net.c b/src/net.c
index adec2003..87deb97b 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,9 +1,6 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@meshlink.io>
-                  2006      Scott Lamb <slamb@slamb.org>
-                  2011      Loïc Grenié <loic.grenie@gmail.com>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,8 +53,7 @@ void purge(void) {
 			logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
 
 			for splay_each(edge_t, e, n->edge_tree) {
-				if(!tunnelserver)
-					send_del_edge(everyone, e);
+				send_del_edge(everyone, e);
 				edge_del(e);
 			}
 		}
@@ -90,7 +86,7 @@ void terminate_connection(connection_t *c, bool report) {
 		c->node->connection = NULL;
 
 	if(c->edge) {
-		if(report && !tunnelserver)
+		if(report)
 			send_del_edge(everyone, c->edge);
 
 		edge_del(c->edge);
@@ -106,8 +102,7 @@ void terminate_connection(connection_t *c, bool report) {
 			edge_t *e;
 			e = lookup_edge(c->node, myself);
 			if(e) {
-				if(!tunnelserver)
-					send_del_edge(everyone, e);
+				send_del_edge(everyone, e);
 				edge_del(e);
 			}
 		}
@@ -295,8 +290,6 @@ int reload_configuration(void) {
 		return EINVAL;
 	}
 
-	read_config_options(config_tree, NULL);
-
 	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, myself->name);
 	read_config_file(config_tree, fname);
 	free(fname);