Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 77b829b..29fe509 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -31,6 +31,7 @@
 #include "route.h"
 #include "sptps.h"
 #include "utils.h"
+#include "compression.h"
 
 void send_key_changed(void) {
 #ifndef DISABLE_LEGACY
@@ -145,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");
@@ -355,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();
@@ -380,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
 }
@@ -395,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,
@@ -464,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
@@ -473,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
@@ -483,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
@@ -500,7 +504,7 @@ bool ans_key_h(connection_t *c, const char *request) {
                return true;
 #endif
 
-       case 0:
+       case COMPRESS_NONE:
                break;
 
        default:
@@ -514,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)) {
@@ -568,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;
        }