X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=b69d5adc5d13de7d95cba1cbccc292d2ec054cd9;hb=bf81fce8ff7a244ecdfbe2d5535bdf4df07b3f35;hp=3036d124d629bd6e5ddca88351eaa06f6d559dfb;hpb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 3036d124..b69d5adc 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -31,10 +31,7 @@
 #include "route.h"
 #include "sptps.h"
 #include "utils.h"
-
-#ifndef DISABLE_LEGACY
-static bool mykeyused = false;
-#endif
+#include "compression.h"
 
 void send_key_changed(void) {
 #ifndef DISABLE_LEGACY
@@ -42,7 +39,7 @@ void send_key_changed(void) {
 
 	/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
 
-	for list_each(connection_t, c, connection_list) {
+	for list_each(connection_t, c, &connection_list) {
 		if(c->edge && c->node && c->node->status.reachable && !c->node->status.sptps) {
 			send_ans_key(c->node);
 		}
@@ -149,7 +146,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
 		/* This is a SPTPS data packet. */
 
 		char buf[MAX_STRING_SIZE];
-		int len;
+		size_t len;
 
 		if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s) to %s (%s): %s", "SPTPS_PACKET", from->name, from->hostname, to->name, to->hostname, "invalid SPTPS data");
@@ -359,7 +356,8 @@ bool send_ans_key(node_t *to) {
 	}
 
 	if(myself->indigest) {
-		to->indigest = digest_open_by_nid(digest_get_nid(myself->indigest), digest_length(myself->indigest));
+		to->indigest = digest_open_by_nid(digest_get_nid(myself->indigest),
+		                                  digest_length(myself->indigest));
 
 		if(!to->indigest) {
 			abort();
@@ -375,7 +373,6 @@ bool send_ans_key(node_t *to) {
 	bin2hex(key, key, keylen);
 
 	// Reset sequence number and late packet window
-	mykeyused = true;
 	to->received_seqno = 0;
 	to->received = 0;
 
@@ -385,11 +382,11 @@ bool send_ans_key(node_t *to) {
 
 	to->status.validkey_in = true;
 
-	return send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY,
+	return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY,
 	                    myself->name, to->name, key,
 	                    cipher_get_nid(to->incipher),
 	                    digest_get_nid(to->indigest),
-	                    (int)digest_length(to->indigest),
+	                    digest_length(to->indigest),
 	                    to->incompression);
 #endif
 }
@@ -400,10 +397,12 @@ bool ans_key_h(connection_t *c, const char *request) {
 	char key[MAX_STRING_SIZE];
 	char address[MAX_STRING_SIZE] = "";
 	char port[MAX_STRING_SIZE] = "";
-	int cipher, digest, maclength, compression;
+	int cipher, digest;
+	size_t maclength;
+	int compression;
 	node_t *from, *to;
 
-	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
+	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %zu %d "MAX_STRING" "MAX_STRING,
 	                from_name, to_name, key, &cipher, &digest, &maclength,
 	                &compression, address, port) < 7) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
@@ -469,7 +468,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 	}
 
 	switch(compression) {
-	case 12:
+	case COMPRESS_LZ4:
 #ifdef HAVE_LZ4
 		break;
 #else
@@ -478,8 +477,8 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return true;
 #endif
 
-	case 11:
-	case 10:
+	case COMPRESS_LZO_HI:
+	case COMPRESS_LZO_LO:
 #ifdef HAVE_LZO
 		break;
 #else
@@ -488,15 +487,15 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return true;
 #endif
 
-	case 9:
-	case 8:
-	case 7:
-	case 6:
-	case 5:
-	case 4:
-	case 3:
-	case 2:
-	case 1:
+	case COMPRESS_ZLIB_9:
+	case COMPRESS_ZLIB_8:
+	case COMPRESS_ZLIB_7:
+	case COMPRESS_ZLIB_6:
+	case COMPRESS_ZLIB_5:
+	case COMPRESS_ZLIB_4:
+	case COMPRESS_ZLIB_3:
+	case COMPRESS_ZLIB_2:
+	case COMPRESS_ZLIB_1:
 #ifdef HAVE_ZLIB
 		break;
 #else
@@ -505,7 +504,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return true;
 #endif
 
-	case 0:
+	case COMPRESS_NONE:
 		break;
 
 	default:
@@ -519,7 +518,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 	/* SPTPS or old-style key exchange? */
 
 	if(from->status.sptps) {
-		char buf[strlen(key)];
+		uint8_t buf[strlen(key)];
 		size_t len = b64decode(key, buf, strlen(key));
 
 		if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
@@ -573,7 +572,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 		from->outdigest = NULL;
 	}
 
-	if((size_t)maclength != digest_length(from->outdigest)) {
+	if(maclength != digest_length(from->outdigest)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus MAC length!", from->name, from->hostname);
 		return false;
 	}