X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=77b829b323633635b4cdd37202211e7d9dbf693e;hb=b18d5b572992debb04a7851e43143711319243a0;hp=58a3bd207c87b4ba25bbb1180d34542eb2851093;hpb=1c475ecb575367a6b3f9328b0f643ad636155341;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 58a3bd20..77b829b3 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -27,14 +27,10 @@
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "prf.h"
 #include "protocol.h"
 #include "route.h"
 #include "sptps.h"
 #include "utils.h"
-#include "xalloc.h"
-
-static bool mykeyused = false;
 
 void send_key_changed(void) {
 #ifndef DISABLE_LEGACY
@@ -42,20 +38,22 @@ 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);
 		}
+	}
 
 #endif
 
 	/* Force key exchange for connections using SPTPS */
 
 	if(experimental) {
-		for splay_each(node_t, n, node_tree)
+		for splay_each(node_t, n, node_tree) {
 			if(n->status.reachable && n->status.validkey && n->status.sptps) {
 				sptps_force_kex(&n->sptps);
 			}
+		}
 	}
 }
 
@@ -293,6 +291,12 @@ bool req_key_h(connection_t *c, const char *request) {
 	/* Check if this key request is for us */
 
 	if(to == myself) {                      /* Yes */
+		if(!from->status.reachable) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which is not reachable",
+			       "REQ_KEY", c->name, c->hostname, from_name);
+			return true;
+		}
+
 		/* Is this an extended REQ_KEY message? */
 		if(experimental && reqno) {
 			return req_key_ext_h(c, request, from, to, reqno);
@@ -367,7 +371,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;
 
@@ -460,8 +463,49 @@ bool ans_key_h(connection_t *c, const char *request) {
 		from->status.validkey = false;
 	}
 
-	if(compression < 0 || compression > 11) {
+	switch(compression) {
+	case 12:
+#ifdef HAVE_LZ4
+		break;
+#else
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "LZ4 compression is unavailable on this node.");
+		return true;
+#endif
+
+	case 11:
+	case 10:
+#ifdef HAVE_LZO
+		break;
+#else
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "LZO compression is unavailable on this node.");
+		return true;
+#endif
+
+	case 9:
+	case 8:
+	case 7:
+	case 6:
+	case 5:
+	case 4:
+	case 3:
+	case 2:
+	case 1:
+#ifdef HAVE_ZLIB
+		break;
+#else
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "ZLIB compression is unavailable on this node.");
+		return true;
+#endif
+
+	case 0:
+		break;
+
+	default:
 		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Compression level %i is unrecognized by this node.", compression);
 		return true;
 	}