X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet_setup.c;h=2684514392dac017d4b3faeba8f8b4aa510bce69;hp=dfed7e56f8424a7018dc01880f728fd0ac878c19;hb=9dea33f5301119dd4423eb962956cf2d246af3f3;hpb=8420a0c8bde1781db04dd2436eb9d5dca5a1732a

diff --git a/src/net_setup.c b/src/net_setup.c
index dfed7e5..2684514 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -221,7 +221,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);
@@ -243,10 +242,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();
@@ -356,6 +354,7 @@ static bool setup_myself(void) {
 	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
 	get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
 	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
 	strictsubnets |= tunnelserver;
 
 	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
@@ -580,6 +579,7 @@ static bool setup_myself(void) {
 
 	/* Open sockets */
 
+	listen_sockets = 0;
 	cfg = lookup_config(config_tree, "BindToAddress");
 
 	do {
@@ -601,9 +601,12 @@ static bool setup_myself(void) {
 			return false;
 		}
 
-		listen_sockets = 0;
-
 		for(aip = ai; aip; aip = aip->ai_next) {
+			if(listen_sockets >= MAXSOCKETS) {
+				logger(LOG_ERR, "Too many listening sockets");
+				return false;
+			}
+
 			listen_socket[listen_sockets].tcp =
 				setup_listen_socket((sockaddr_t *) aip->ai_addr);