X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=7485d21f60507ac6de8dbe1f592038b4beb320a2;hb=8a77df9e28114cbfd83351070fdb266cf31fc310;hp=00273cfe1007f2e3b0a64c4c2c2e0f246c898498;hpb=d1ec010660905ae0b99d783737350ccc08b37b16;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 00273cfe..7485d21f 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;
@@ -284,7 +285,7 @@ void regenerate_key(void) {
 		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
 	}
 
-	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+	event_add(&keyexpire_event, &(struct timeval){keylifetime, rand() % 100000});
 }
 
 /*
@@ -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);
+			char envname[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;
 }
 
@@ -668,6 +701,7 @@ static bool setup_myself(void) {
 			return false;
 		}
 		replaywin = (unsigned)replaywin_int;
+		sptps_replaywin = replaywin;
 	}
 
 	/* Generate packet encryption key */
@@ -729,6 +763,8 @@ static bool setup_myself(void) {
 
 	if(strictsubnets)
 		load_all_subnets();
+	else if(autoconnect)
+		load_all_nodes();
 
 	/* Open device */
 
@@ -807,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);