X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=93d84a354fb67699afe09328667d7800de77f4f5;hb=1296f715b57c88c17299cacadaccdc0be898e0b1;hp=d373858c95977c05068229852b3b6f3adbc0b45b;hpb=6056f1c13bb37bf711dff9c25a6eaea99f14d31f;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index d373858c..93d84a35 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -87,9 +87,13 @@ bool key_changed_h(connection_t *c, const char *request) {
 	return true;
 }
 
+static bool send_sptps_data_myself(void *handle, uint8_t type, const void *data, size_t len) {
+	return send_sptps_data(handle, myself, type, data, len);
+}
+
 static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 	node_t *to = handle;
-	to->sptps.send_data = send_sptps_data;
+	to->sptps.send_data = send_sptps_data_myself;
 	char buf[len * 4 / 3 + 5];
 	b64encode(data, buf, len);
 	return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_KEY, buf);
@@ -176,8 +180,9 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 			from->status.validkey = false;
 			from->status.waitingforkey = true;
 			from->last_req_key = now.tv_sec;
-			sptps_start(&from->sptps, from, false, true, myself->connection->ecdsa, from->ecdsa, label, sizeof label, send_sptps_data, receive_sptps_record);
+			sptps_start(&from->sptps, from, false, true, myself->connection->ecdsa, from->ecdsa, label, sizeof label, send_sptps_data_myself, receive_sptps_record);
 			sptps_receive_data(&from->sptps, buf, len);
+			send_mtu_info(myself, from, MTU);
 			return true;
 		}
 
@@ -194,6 +199,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 				return true;
 			}
 			sptps_receive_data(&from->sptps, buf, len);
+			send_mtu_info(myself, from, MTU);
 			return true;
 		}
 
@@ -236,6 +242,13 @@ bool req_key_h(connection_t *c, const char *request) {
 		return true;
 	}
 
+	/* 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(experimental && (reqno == REQ_KEY || reqno == REQ_SPTPS) && to->via == myself)
+		send_udp_info(myself, from);
+
 	/* Check if this key request is for us */
 
 	if(to == myself) {                      /* Yes */
@@ -408,11 +421,13 @@ bool ans_key_h(connection_t *c, const char *request) {
 			}
 		}
 
+		send_mtu_info(myself, from, MTU);
+
 		return true;
 	}
 
 #ifdef DISABLE_LEGACY
-	logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%) uses legacy protocol!", from->name, from->hostname);
+	logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses legacy protocol!", from->name, from->hostname);
 	return false;
 #else
 	/* Check and lookup cipher and digest algorithms */