X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=858992c846fa30ae209dd917aba53c99ceefc863;hb=b7d59f035bfa2e546428cac2b72318d4f5c517fb;hp=b9c5df7a8209bce0521bd9724543ee0f54419c03;hpb=57991e264202ad83e2c1b663777b358bf5573652;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index b9c5df7a..858992c8 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -86,10 +86,8 @@ bool node_read_ecdsa_public_key(node_t *n) {
 
 	fp = fopen(pubname, "r");
 
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", pubname, strerror(errno));
+	if(!fp)
 		goto exit;
-	}
 
 	n->ecdsa = ecdsa_read_pem_public_key(fp);
 	fclose(fp);
@@ -411,17 +409,18 @@ char *get_name(void) {
 
 	if(*name == '$') {
 		char *envname = getenv(name + 1);
+		char hostname[32] = "";
 		if(!envname) {
 			if(strcmp(name + 1, "HOST")) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Invalid Name: environment variable %s does not exist\n", name + 1);
 				return false;
 			}
-			char envname[32];
-			if(gethostname(envname, 32)) {
+			if(gethostname(hostname, sizeof hostname) || !*hostname) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
 				return false;
 			}
-			envname[31] = 0;
+			hostname[31] = 0;
+			envname = hostname;
 		}
 		free(name);
 		name = xstrdup(envname);
@@ -632,6 +631,8 @@ bool setup_myself_reloadable(void) {
 		keylifetime = 3600;
 
 	get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+	if(autoconnect < 0)
+		autoconnect = 0;
 
 	get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
 
@@ -646,6 +647,7 @@ bool setup_myself_reloadable(void) {
 static bool setup_myself(void) {
 	char *name, *hostname, *cipher, *digest, *type;
 	char *address = NULL;
+	bool port_specified = false;
 
 	if(!(name = get_name())) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
@@ -660,9 +662,8 @@ static bool setup_myself(void) {
 
 	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
 		myport = xstrdup("655");
-
-	xasprintf(&myself->hostname, "MYSELF port %s", myport);
-	myself->connection->hostname = xstrdup(myself->hostname);
+	else
+		port_specified = true;
 
 	myself->connection->options = 0;
 	myself->connection->protocol_major = PROT_MAJOR;
@@ -670,14 +671,20 @@ static bool setup_myself(void) {
 
 	myself->options |= PROT_MINOR << 24;
 
-	get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
-
-	if(experimental && !read_ecdsa_private_key())
-		return false;
+	if(!get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental)) {
+		experimental = read_ecdsa_private_key();
+		if(!experimental)
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Support for SPTPS disabled.");
+	} else {
+		if(experimental && !read_ecdsa_private_key())
+			return false;
+	}
 
 	if(!read_rsa_private_key())
 		return false;
 
+	/* Ensure myport is numeric */
+
 	if(!atoi(myport)) {
 		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
 		sockaddr_t sa;
@@ -744,7 +751,9 @@ static bool setup_myself(void) {
 	if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
 		cipher = xstrdup("blowfish");
 
-	if(!(myself->incipher = cipher_open_by_name(cipher))) {
+	if(!strcasecmp(cipher, "none")) {
+		myself->incipher = NULL;
+	} else if(!(myself->incipher = cipher_open_by_name(cipher))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
 		return false;
 	}
@@ -766,7 +775,9 @@ static bool setup_myself(void) {
 	if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
 		digest = xstrdup("sha1");
 
-	if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
+	if(!strcasecmp(digest, "none")) {
+		myself->indigest = NULL;
+	} else if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
 		return false;
 	}
@@ -946,6 +957,24 @@ static bool setup_myself(void) {
 		return false;
 	}
 
+	/* If no Port option was specified, set myport to the port used by the first listening socket. */
+
+	if(!port_specified) {
+		sockaddr_t sa;
+		socklen_t salen = sizeof sa;
+		if(!getsockname(listen_socket[0].udp.fd, &sa.sa, &salen)) {
+			free(myport);
+			sockaddr2str(&sa, NULL, &myport);
+			if(!myport)
+				myport = xstrdup("655");
+		}
+	}
+
+	xasprintf(&myself->hostname, "MYSELF port %s", myport);
+	myself->connection->hostname = xstrdup(myself->hostname);
+
+	/* Done. */
+
 	last_config_check = now.tv_sec;
 
 	return true;