X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=03186134579636a899407d2f620d93490865009a;hb=d93d4f9dbd09bc5e53a9b5eeb1cc94939fee32bc;hp=f2534a477af5e2a4717095ab7de6791a7b65e737;hpb=8cb4dbb04af15e95e9a302670a4c6fd21e0ebfd6;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index f2534a47..03186134 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -267,7 +267,7 @@ bool setup_myself_reloadable(void) {
 			proxytype = PROXY_EXEC;
 		} else {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
-			free(proxy);
+			free_string(proxy);
 			return false;
 		}
 
@@ -277,10 +277,10 @@ bool setup_myself_reloadable(void) {
 		free(proxyport);
 		proxyport = NULL;
 
-		free(proxyuser);
+		free_string(proxyuser);
 		proxyuser = NULL;
 
-		free(proxypass);
+		free_string(proxypass);
 		proxypass = NULL;
 
 		switch(proxytype) {
@@ -291,7 +291,7 @@ bool setup_myself_reloadable(void) {
 		case PROXY_EXEC:
 			if(!space || !*space) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
-				free(proxy);
+				free_string(proxy);
 				return false;
 			}
 
@@ -312,7 +312,7 @@ bool setup_myself_reloadable(void) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
 				proxyport = NULL;
 				proxyhost = NULL;
-				free(proxy);
+				free_string(proxy);
 				return false;
 			}
 
@@ -338,7 +338,7 @@ bool setup_myself_reloadable(void) {
 			break;
 		}
 
-		free(proxy);
+		free_string(proxy);
 	}
 
 	bool choice;
@@ -903,7 +903,8 @@ static bool setup_myself(void) {
 
 		if(!cipher_open_by_name(myself->incipher, cipher)) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
-			cipher_free(&myself->incipher);
+			cipher_free(myself->incipher);
+			myself->incipher = NULL;
 			free(cipher);
 			return false;
 		}
@@ -938,7 +939,8 @@ static bool setup_myself(void) {
 
 		if(!digest_open_by_name(myself->indigest, digest, maclength)) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
-			digest_free(&myself->indigest);
+			digest_free(myself->indigest);
+			myself->indigest = NULL;
 			free(digest);
 			return false;
 		}
@@ -948,7 +950,11 @@ static bool setup_myself(void) {
 #endif
 
 	/* Compression */
-	if(get_config_int(lookup_config(&config_tree, "Compression"), &myself->incompression)) {
+	int incompression = 0;
+
+	if(get_config_int(lookup_config(&config_tree, "Compression"), &incompression)) {
+		myself->incompression = incompression;
+
 		switch(myself->incompression) {
 		case COMPRESS_LZ4:
 #ifdef HAVE_LZ4
@@ -998,8 +1004,6 @@ static bool setup_myself(void) {
 		myself->incompression = COMPRESS_NONE;
 	}
 
-	myself->connection->outcompression = COMPRESS_NONE;
-
 	/* Done */
 
 	myself->nexthop = myself;