tinc-gui: Reformat codebase according to PEP8

[tinc] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 6ccb266..b409a35 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -36,6 +36,7 @@
 static bool mykeyused = false;
 
 void send_key_changed(void) {
+#ifndef DISABLE_LEGACY
        send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name);
 
        /* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
@@ -43,6 +44,7 @@ void send_key_changed(void) {
        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 */
 
@@ -107,9 +109,6 @@ bool send_req_key(node_t *to) {
                        return true;
                }
 
-               if(to->sptps.label)
-                       logger(DEBUG_ALWAYS, LOG_DEBUG, "send_req_key(%s) called while sptps->label != NULL!", to->name);
-
                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);
@@ -129,16 +128,16 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
        /* 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. */
-       if((reqno == REQ_KEY || reqno == REQ_SPTPS) && to->via == myself)
+       if((reqno == REQ_KEY || reqno == SPTPS_PACKET) && to->via == myself)
                send_udp_info(myself, from);
 
-       if(reqno == REQ_SPTPS) {
+       if(reqno == SPTPS_PACKET) {
                /* This is a SPTPS data packet. */
 
                char buf[MAX_STRING_SIZE];
                int 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", "REQ_SPTPS", from->name, from->hostname, to->name, to->hostname, "invalid SPTPS data");
+                       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");
                        return true;
                }
 
@@ -148,11 +147,16 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
                        try_tx(to, true);
                } else {
                        /* The packet is for us */
-                       if(!from->status.validkey) {
-                               logger(DEBUG_PROTOCOL, LOG_ERR, "Got REQ_SPTPS from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
+                       if(!sptps_receive_data(&from->sptps, buf, len)) {
+                               /* Uh-oh. It might be that the tunnel is stuck in some corrupted state,
+                                  so let's restart SPTPS in case that helps. But don't do that too often
+                                  to prevent storms. */
+                               if(from->last_req_key < now.tv_sec - 10) {
+                                       logger(DEBUG_PROTOCOL, LOG_ERR, "Failed to decode TCP packet from %s (%s), restarting SPTPS", from->name, from->hostname);
+                                       send_req_key(from);
+                               }
                                return true;
                        }
-                       sptps_receive_data(&from->sptps, buf, len);
                        send_mtu_info(myself, from, MTU);
                }
 
@@ -428,9 +432,18 @@ 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));
-
-               if(!len || !sptps_receive_data(&from->sptps, buf, len))
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Error processing SPTPS data from %s (%s)", from->name, from->hostname);
+               if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
+                       /* Uh-oh. It might be that the tunnel is stuck in some corrupted state,
+                          so let's restart SPTPS in case that helps. But don't do that too often
+                          to prevent storms.
+                          Note that simply relying on handshake timeout is not enough, because
+                          that doesn't apply to key regeneration. */
+                       if(from->last_req_key < now.tv_sec - 10) {
+                               logger(DEBUG_PROTOCOL, LOG_ERR, "Failed to decode handshake TCP packet from %s (%s), restarting SPTPS", from->name, from->hostname);
+                               send_req_key(from);
+                       }
+                       return true;
+               }
 
                if(from->status.validkey) {
                        if(*address && *port) {