Remove unused global variables.

[tinc] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index a0a1846..77b829b 100644 (file)
--- 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);
                        }
+               }
        }
 }
 
@@ -100,10 +98,13 @@ static bool send_sptps_data_myself(void *handle, uint8_t type, const void *data,
 }
 
 static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
+       (void)type;
        node_t *to = handle;
        to->sptps.send_data = send_sptps_data_myself;
        char buf[len * 4 / 3 + 5];
+
        b64encode(data, buf, len);
+
        return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_KEY, buf);
 }
 
@@ -131,6 +132,8 @@ bool send_req_key(node_t *to) {
 /* REQ_KEY is overloaded to allow arbitrary requests to be routed between two nodes. */
 
 static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, node_t *to, int reqno) {
+       (void)c;
+
        /* If this is a SPTPS packet, see if sending UDP info helps.
           Note that we only do this if we're the destination or the static relay;
           otherwise every hop would initiate its own UDP info message, resulting in elevated chatter. */
@@ -227,7 +230,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
                }
 
                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): %s", "REQ_SPTPS_START", from->name, from->hostname, "invalid SPTPS data");
@@ -288,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);
@@ -362,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;
 
@@ -455,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;
        }
 
@@ -466,7 +515,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 
        if(from->status.sptps) {
                char buf[strlen(key)];
-               int len = b64decode(key, buf, strlen(key));
+               size_t len = b64decode(key, buf, strlen(key));
 
                if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
                        /* Uh-oh. It might be that the tunnel is stuck in some corrupted state,
@@ -519,14 +568,14 @@ bool ans_key_h(connection_t *c, const char *request) {
                from->outdigest = NULL;
        }
 
-       if(maclength != digest_length(from->outdigest)) {
+       if((size_t)maclength != digest_length(from->outdigest)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus MAC length!", from->name, from->hostname);
                return false;
        }
 
        /* Process key */
 
-       int keylen = hex2bin(key, key, sizeof(key));
+       size_t keylen = hex2bin(key, key, sizeof(key));
 
        if(keylen != (from->outcipher ? cipher_keylength(from->outcipher) : 1)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);