X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=ed69808d6c1a882229c1299d586305b2bda0db75;hb=1cf2b56fcc57073d952928da2338bdaff2cb7889;hp=17675aec40ace0b3f8d775875c54321961206e55;hpb=92d66492e0824674f68d26e787dd1ba4444a4601;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 17675aec..ed69808d 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -215,7 +215,7 @@ static bool read_ecdsa_private_key(void) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading Ed25519 private key file `%s': %s", fname, strerror(errno));
 
 		if(errno == ENOENT) {
-			logger(DEBUG_ALWAYS, LOG_INFO, "Create an Ed25519 keypair with `tinc -n %s generate-ed25519-keys'.", netname ? : ".");
+			logger(DEBUG_ALWAYS, LOG_INFO, "Create an Ed25519 keypair with `tinc -n %s generate-ed25519-keys'.", netname ? netname : ".");
 		}
 
 		free(fname);
@@ -307,7 +307,7 @@ static bool read_rsa_private_key(void) {
 		       fname, strerror(errno));
 
 		if(errno == ENOENT) {
-			logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA keypair with `tinc -n %s generate-rsa-keys'.", netname ? : ".");
+			logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA keypair with `tinc -n %s generate-rsa-keys'.", netname ? netname : ".");
 		}
 
 		free(fname);
@@ -687,15 +687,8 @@ bool setup_myself_reloadable(void) {
 		keylifetime = 3600;
 	}
 
-	config_t *cfg = lookup_config(config_tree, "AutoConnect");
-
-	if(cfg) {
-		if(!get_config_bool(cfg, &autoconnect)) {
-			// Some backwards compatibility with when this option was an int
-			int val = 0;
-			get_config_int(cfg, &val);
-			autoconnect = val;
-		}
+	if(!get_config_bool(lookup_config(config_tree, "AutoConnect"), &autoconnect)) {
+		autoconnect = true;
 	}
 
 	get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
@@ -949,6 +942,16 @@ static bool setup_myself(void) {
 		}
 	}
 
+	get_config_int(lookup_config(config_tree, "FWMark"), &fwmark);
+#ifndef SO_MARK
+
+	if(fwmark) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "FWMark not supported on this platform!");
+		return false;
+	}
+
+#endif
+
 	int replaywin_int;
 
 	if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
@@ -972,6 +975,7 @@ static bool setup_myself(void) {
 		myself->incipher = NULL;
 	} else if(!(myself->incipher = cipher_open_by_name(cipher))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
+		free(cipher);
 		return false;
 	}
 
@@ -999,6 +1003,7 @@ static bool setup_myself(void) {
 		myself->indigest = NULL;
 	} else if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
+		free(digest);
 		return false;
 	}