X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=6721aa44463e90aeb44396a6a9e8d204b3c32ef3;hb=2cb216d83d825fcca2fa2b66c756b253f8f0828b;hp=6ccb26693c59e838c2f3c587c6f2962a0249754b;hpb=10c1f60c643607d9dafd79271c3475cddf81e903;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 6ccb2669..6721aa44 100644
--- 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 */
 
@@ -129,16 +131,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 +151,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);