Let the GUI handle the new dump format.

[tinc] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index bbe0239..f9afb4f 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -114,6 +114,9 @@ bool send_req_key(node_t *to) {
                }
                 char label[25 + strlen(myself->name) + strlen(to->name)];
                snprintf(label, sizeof label, "tinc UDP key expansion %s %s", myself->name, to->name);
+               sptps_stop(&to->sptps);
+               to->status.validkey = false;
+               to->incompression = myself->incompression;
                return sptps_start(&to->sptps, to, true, true, myself->connection->ecdsa, to->ecdsa, label, sizeof label, send_initial_sptps_data, receive_sptps_record); 
        }
 
@@ -167,6 +170,8 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 
                        char label[25 + strlen(from->name) + strlen(myself->name)];
                        snprintf(label, sizeof label, "tinc UDP key expansion %s %s", from->name, myself->name);
+                       sptps_stop(&from->sptps);
+                       from->status.validkey = false;
                        sptps_start(&from->sptps, from, false, true, myself->connection->ecdsa, from->ecdsa, label, sizeof label, send_sptps_data, receive_sptps_record); 
                        sptps_receive_data(&from->sptps, buf, len);
                        return true;
@@ -329,6 +334,13 @@ bool ans_key_h(connection_t *c, const char *request) {
                return send_request(to->nexthop->connection, "%s", request);
        }
 
+       if(compression < 0 || compression > 11) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+               return true;
+       }
+
+       from->outcompression = compression;
+
        /* SPTPS or old-style key exchange? */
 
        if(from->status.sptps) {
@@ -369,13 +381,6 @@ bool ans_key_h(connection_t *c, const char *request) {
                return false;
        }
 
-       if(compression < 0 || compression > 11) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
-               return true;
-       }
-
-       from->outcompression = compression;
-
        /* Process key */
 
        keylen = hex2bin(key, key, sizeof key);