Rename REQ_SPTPS to SPTPS_PACKET.

REQ_SPTPS implies the message has an ANS_ counterpart (like REQ_KEY,
ANS_KEY), but it doesn't. Therefore dropping the REQ_ seems more
appropriate, and we add a _PACKET suffix to reduce the likelihood of
naming conflicts.

diff --git a/src/net_packet.c b/src/net_packet.c
index 19ad29c..5ebfcce 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -698,7 +698,7 @@ bool send_sptps_data(node_t *to, node_t *from, int type, const void *data, size_
                        to->incompression = myself->incompression;
                        return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, from->name, to->name, buf, to->incompression);
                } else {
-                       return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, from->name, to->name, REQ_SPTPS, buf);
+                       return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, from->name, to->name, SPTPS_PACKET, buf);
                }
        }
 

diff --git a/src/protocol.c b/src/protocol.c
index efb9a18..fb90c94 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -53,7 +53,7 @@ static char (*request_name[]) = {
                "PING", "PONG",
                "ADD_SUBNET", "DEL_SUBNET",
                "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
-               "REQ_PUBKEY", "ANS_PUBKEY", "REQ_SPTPS", "UDP_INFO", "MTU_INFO",
+               "REQ_PUBKEY", "ANS_PUBKEY", "SPTPS_PACKET", "UDP_INFO", "MTU_INFO",
 };
 
 static splay_tree_t *past_request_tree;

diff --git a/src/protocol.h b/src/protocol.h
index c6a1485..9e223f8 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -48,7 +48,7 @@ typedef enum request_t {
        /* Tinc 1.1 requests */
        CONTROL,
        REQ_PUBKEY, ANS_PUBKEY,
-       REQ_SPTPS,
+       SPTPS_PACKET,
        UDP_INFO, MTU_INFO,
        LAST                                            /* Guardian for the highest request number */
 } request_t;

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 6ccb266..c183ac4 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -129,16 +129,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;
                }
 
@@ -149,7 +149,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, no
                } 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);
+                               logger(DEBUG_PROTOCOL, LOG_ERR, "Got SPTPS_PACKET from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
                                return true;
                        }
                        sptps_receive_data(&from->sptps, buf, len);