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

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 58a3bd20..b93bec18 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -34,7 +34,9 @@
 #include "utils.h"
 #include "xalloc.h"
 
+#ifndef DISABLE_LEGACY
 static bool mykeyused = false;
+#endif
 
 void send_key_changed(void) {
 #ifndef DISABLE_LEGACY
@@ -460,8 +462,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;
 	}