X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=9293c1189bd014d576d62c2e79113fb2edca4895;hb=edc1efed3c0cf5aebb1c765066c0413757229a31;hp=38fed521a64dae1ece4831c27c28285e268d17f0;hpb=7418e9077f84db10ef6bb082a375870a7130bd7d;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 38fed521..9293c118 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -324,10 +324,7 @@ void regenerate_key(void) {
 		n->status.validkey_in = false;
 }
 
-/*
-  Read Subnets from all host config files
-*/
-void load_all_subnets(void) {
+void load_all_nodes(void) {
 	DIR *dir;
 	struct dirent *ent;
 	char dname[PATH_MAX];
@@ -344,10 +341,6 @@ void load_all_subnets(void) {
 			continue;
 
 		node_t *n = lookup_node(ent->d_name);
-		#ifdef _DIRENT_HAVE_D_TYPE
-		//if(ent->d_type != DT_REG)
-		//	continue;
-		#endif
 
 		splay_tree_t *config_tree;
 		init_configuration(&config_tree);
@@ -360,55 +353,31 @@ void load_all_subnets(void) {
 			node_add(n);
 		}
 
-		for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
-			subnet_t *s, *s2;
+		if(strictsubnets) {
+			for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+				subnet_t *s, *s2;
 
-			if(!get_config_subnet(cfg, &s))
-				continue;
+				if(!get_config_subnet(cfg, &s))
+					continue;
 
-			if((s2 = lookup_subnet(n, s))) {
-				s2->expires = -1;
-				free(s);
-			} else {
-				subnet_add(n, s);
+				if((s2 = lookup_subnet(n, s))) {
+					s2->expires = -1;
+					free(s);
+				} else {
+					subnet_add(n, s);
+				}
 			}
 		}
 
-		exit_configuration(&config_tree);
-	}
-
-	closedir(dir);
-}
+		if(lookup_config(config_tree, "Address"))
+			n->status.has_address = true;
 
-void load_all_nodes(void) {
-	DIR *dir;
-	struct dirent *ent;
-	char dname[PATH_MAX];
-
-	snprintf(dname, sizeof dname, "%s" SLASH "hosts", confbase);
-	dir = opendir(dname);
-	if(!dir) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-		return;
-	}
-
-	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name))
-			continue;
-
-		node_t *n = lookup_node(ent->d_name);
-		if(n)
-			continue;
-
-		n = new_node();
-		n->name = xstrdup(ent->d_name);
-		node_add(n);
+		exit_configuration(&config_tree);
 	}
 
 	closedir(dir);
 }
 
-
 char *get_name(void) {
 	char *name = NULL;
 	char *returned_name;
@@ -591,9 +560,14 @@ bool setup_myself_reloadable(void) {
 		subnet_add(NULL, s);
 	}
 
-#if !defined(SOL_IP) || !defined(IP_TOS)
+#if !defined(IPPROTO_IP) || !defined(IP_TOS)
+	if(priorityinheritance)
+		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv4 connections", "PriorityInheritance");
+#endif
+
+#if !defined(IPPROTO_IPV6) || !defined(IPV6_TCLASS)
 	if(priorityinheritance)
-		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
+		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv6 connections", "PriorityInheritance");
 #endif
 
 	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@ -702,7 +676,7 @@ static bool add_listen_address(char *address, bool bindto) {
 
 		int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-		if(tcp_fd < 0) {
+		if(udp_fd < 0) {
 			close(tcp_fd);
 			continue;
 		}
@@ -883,7 +857,7 @@ static bool setup_myself(void) {
 	/* Generate packet encryption key */
 
 	if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
-		cipher = xstrdup("blowfish");
+		cipher = xstrdup("aes-256-cbc");
 
 	if(!strcasecmp(cipher, "none")) {
 		myself->incipher = NULL;
@@ -907,7 +881,7 @@ static bool setup_myself(void) {
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
-		digest = xstrdup("sha1");
+		digest = xstrdup("sha256");
 
 	if(!strcasecmp(digest, "none")) {
 		myself->indigest = NULL;
@@ -942,10 +916,7 @@ static bool setup_myself(void) {
 
 	graph();
 
-	if(strictsubnets)
-		load_all_subnets();
-	else if(autoconnect)
-		load_all_nodes();
+	load_all_nodes();
 
 	/* Open device */
 
@@ -1149,8 +1120,7 @@ void close_network_connections(void) {
 
 	if(myself && myself->connection) {
 		subnet_update(myself, NULL, false);
-		terminate_connection(myself->connection, false);
-		free_connection(myself->connection);
+		connection_del(myself->connection);
 	}
 
 	for(int i = 0; i < listen_sockets; i++) {