From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 8 Mar 2012 20:15:08 +0000 (+0100)
Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
X-Git-Tag: release-1.1pre3~142
X-Git-Url: http://tinc-vpn.org/git/browse?a=commitdiff_plain;h=40c28589328a2aa96c2ce1419c5d90616c758b3d;hp=8ac096b5bf9da1b3961a3ac4a03d083629222a63;p=tinc

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
	src/net_packet.c
---

diff --git a/src/net_packet.c b/src/net_packet.c
index 66bcfe4b..ac3b0cc5 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -524,7 +524,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 			if(n->mtu >= origlen)
 				n->mtu = origlen - 1;
 		} else
-			logger(DEBUG_ALWAYS, LOG_ERR, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
+			logger(DEBUG_TRAFFIC, LOG_WARNING, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
 	}
 
 end:
diff --git a/src/net_setup.c b/src/net_setup.c
index f63059f8..28e08644 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -292,7 +292,6 @@ void load_all_subnets(void) {
 	config_t *cfg;
 	subnet_t *s, *s2;
 	node_t *n;
-	bool result;
 
 	xasprintf(&dname, "%s/hosts", confbase);
 	dir = opendir(dname);
@@ -314,10 +313,9 @@ void load_all_subnets(void) {
 
 		xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
 		init_configuration(&config_tree);
-		result = read_config_file(config_tree, fname);
+		read_config_options(config_tree, ent->d_name);
+		read_config_file(config_tree, fname);
 		free(fname);
-		if(!result)
-			continue;
 
 		if(!n) {
 			n = new_node();