X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=74c57c5dd07cfadbcaaa3a9ebc94034da3716aaf;hb=717ea66d7ba0c23f27d86b3d5c6992b751135455;hp=b1a8476ddbee6c51066e3852751fe71537109b6d;hpb=ff306f0cdaedb50de1472e7c1fb55de922a6ca60;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index b1a8476d..74c57c5d 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -50,6 +50,7 @@ char *proxyport;
 char *proxyuser;
 char *proxypass;
 proxytype_t proxytype;
+int autoconnect;
 
 char *scriptinterpreter;
 char *scriptextension;
@@ -167,7 +168,7 @@ bool read_rsa_public_key(connection_t *c) {
 	result = rsa_read_pem_public_key(&c->rsa, fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!result)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
@@ -207,7 +208,7 @@ static bool read_ecdsa_private_key(void) {
 	result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!result)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
@@ -263,7 +264,7 @@ static bool read_rsa_private_key(void) {
 	result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!result)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
@@ -294,11 +295,6 @@ void load_all_subnets(void) {
 	DIR *dir;
 	struct dirent *ent;
 	char *dname;
-	char *fname;
-	splay_tree_t *config_tree;
-	config_t *cfg;
-	subnet_t *s, *s2;
-	node_t *n;
 
 	xasprintf(&dname, "%s" SLASH "hosts", confbase);
 	dir = opendir(dname);
@@ -312,13 +308,16 @@ void load_all_subnets(void) {
 		if(!check_id(ent->d_name))
 			continue;
 
-		n = lookup_node(ent->d_name);
+		node_t *n = lookup_node(ent->d_name);
 		#ifdef _DIRENT_HAVE_D_TYPE
 		//if(ent->d_type != DT_REG)
 		//	continue;
 		#endif
 
+		char *fname;
 		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
+
+		splay_tree_t *config_tree;
 		init_configuration(&config_tree);
 		read_config_options(config_tree, ent->d_name);
 		read_config_file(config_tree, fname);
@@ -330,7 +329,9 @@ void load_all_subnets(void) {
 			node_add(n);
 		}
 
-		for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+		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;
 
@@ -347,6 +348,36 @@ void load_all_subnets(void) {
 	closedir(dir);
 }
 
+void load_all_nodes(void) {
+	DIR *dir;
+	struct dirent *ent;
+	char *dname;
+
+	xasprintf(&dname, "%s" SLASH "hosts", confbase);
+	dir = opendir(dname);
+	if(!dir) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+		free(dname);
+		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);
+	}
+
+	closedir(dir);
+}
+
+
 char *get_name(void) {
 	char *name = NULL;
 
@@ -359,12 +390,12 @@ char *get_name(void) {
 		char *envname = getenv(name + 1);
 		if(!envname) {
 			if(strcmp(name + 1, "HOST")) {
-				fprintf(stderr, "Invalid Name: environment variable %s does not exist\n", name + 1);
+				logger(DEBUG_ALWAYS, LOG_ERR, "Invalid Name: environment variable %s does not exist\n", name + 1);
 				return false;
 			}
 			envname = alloca(32);
 			if(gethostname(envname, 32)) {
-				fprintf(stderr, "Could not get hostname: %s\n", strerror(errno));
+				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
 				return false;
 			}
 			envname[31] = 0;
@@ -398,7 +429,7 @@ bool setup_myself_reloadable(void) {
 	scriptinterpreter = NULL;
 	get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
 
-	
+
 	free(scriptextension);
 	if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension))
 #ifdef HAVE_MINGW
@@ -480,7 +511,7 @@ bool setup_myself_reloadable(void) {
 
 	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
 	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
-	
+
 	if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
 		if(!strcasecmp(rmode, "router"))
 			routing_mode = RMODE_ROUTER;
@@ -570,6 +601,8 @@ bool setup_myself_reloadable(void) {
 	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
 		keylifetime = 3600;
 
+	get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+
 	return true;
 }
 
@@ -577,15 +610,9 @@ bool setup_myself_reloadable(void) {
   Configure node_t myself and set up the local sockets (listen only)
 */
 static bool setup_myself(void) {
-	config_t *cfg;
-	subnet_t *subnet;
 	char *name, *hostname, *cipher, *digest, *type;
 	char *fname = NULL;
 	char *address = NULL;
-	char *envp[5];
-	struct addrinfo *ai, *aip, hint = {0};
-	int i, err;
-	int replaywin_int;
 
 	if(!(name = get_name())) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
@@ -633,15 +660,13 @@ static bool setup_myself(void) {
 
 	/* Read in all the subnets specified in the host configuration file */
 
-	cfg = lookup_config(config_tree, "Subnet");
+	for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+		subnet_t *subnet;
 
-	while(cfg) {
 		if(!get_config_subnet(cfg, &subnet))
 			return false;
 
 		subnet_add(myself, subnet);
-
-		cfg = lookup_config_next(config_tree, cfg);
 	}
 
 	/* Check some options */
@@ -669,12 +694,14 @@ static bool setup_myself(void) {
 		}
 	}
 
+	int replaywin_int;
 	if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
 		if(replaywin_int < 0) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "ReplayWindow cannot be negative!");
 			return false;
 		}
 		replaywin = (unsigned)replaywin_int;
+		sptps_replaywin = replaywin;
 	}
 
 	/* Generate packet encryption key */
@@ -687,6 +714,8 @@ static bool setup_myself(void) {
 		return false;
 	}
 
+	free(cipher);
+
 	regenerate_key();
 
 	/* Check if we want to use message authentication codes... */
@@ -707,6 +736,8 @@ static bool setup_myself(void) {
 		return false;
 	}
 
+	free(digest);
+
 	/* Compression */
 
 	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
@@ -732,6 +763,8 @@ static bool setup_myself(void) {
 
 	if(strictsubnets)
 		load_all_subnets();
+	else if(autoconnect)
+		load_all_nodes();
 
 	/* Open device */
 
@@ -768,6 +801,7 @@ static bool setup_myself(void) {
 	}
 
 	/* Run tinc-up script to further initialize the tap interface */
+	char *envp[5];
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
 	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
 	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
@@ -776,7 +810,7 @@ static bool setup_myself(void) {
 
 	execute_script("tinc-up", envp);
 
-	for(i = 0; i < 4; i++)
+	for(int i = 0; i < 4; i++)
 		free(envp[i]);
 
 	/* Run subnet-up scripts for our own subnets */
@@ -799,7 +833,7 @@ static bool setup_myself(void) {
 			return false;
 		}
 
-		for(i = 0; i < listen_sockets; i++) {
+		for(int i = 0; i < listen_sockets; i++) {
 			salen = sizeof sa;
 			if(getsockname(i + 3, &sa.sa, &salen) < 0) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(errno));
@@ -809,7 +843,7 @@ static bool setup_myself(void) {
 			listen_socket[i].tcp = i + 3;
 
 #ifdef FD_CLOEXEC
-		        fcntl(i + 3, F_SETFD, FD_CLOEXEC);
+			fcntl(i + 3, F_SETFD, FD_CLOEXEC);
 #endif
 
 			listen_socket[i].udp = setup_vpn_in_socket(&sa);
@@ -838,7 +872,7 @@ static bool setup_myself(void) {
 		}
 	} else {
 		listen_sockets = 0;
-		cfg = lookup_config(config_tree, "BindToAddress");
+		config_t *cfg = lookup_config(config_tree, "BindToAddress");
 
 		do {
 			get_config_string(cfg, &address);
@@ -858,12 +892,13 @@ static bool setup_myself(void) {
 					*address = 0;
 			}
 
+			struct addrinfo *ai, hint = {0};
 			hint.ai_family = addressfamily;
 			hint.ai_socktype = SOCK_STREAM;
 			hint.ai_protocol = IPPROTO_TCP;
 			hint.ai_flags = AI_PASSIVE;
 
-			err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+			int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
 			free(address);
 
 			if(err || !ai) {
@@ -872,7 +907,7 @@ static bool setup_myself(void) {
 				return false;
 			}
 
-			for(aip = ai; aip; aip = aip->ai_next) {
+			for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
 				if(listen_sockets >= MAXSOCKETS) {
 					logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 					return false;