-static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, int reqno) {
- switch(reqno) {
- case REQ_PUBKEY: {
- if(!node_read_ecdsa_public_key(from)) {
- /* Request their key *before* we send our key back. Otherwise the first SPTPS packet from them will get dropped. */
- logger(DEBUG_PROTOCOL, LOG_DEBUG, "Preemptively requesting Ed25519 key for %s (%s)", from->name, from->hostname);
- send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, from->name, REQ_PUBKEY);
- }
- char *pubkey = ecdsa_get_base64_public_key(myself->connection->ecdsa);
- send_request(from->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, from->name, ANS_PUBKEY, pubkey);
- free(pubkey);
+static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, node_t *to, int reqno) {
+ (void)c;
+
+ /* 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 == SPTPS_PACKET) && to->via == myself) {
+ send_udp_info(myself, from);
+ }
+
+ if(reqno == SPTPS_PACKET) {
+ /* This is a SPTPS data packet. */
+
+ char buf[MAX_STRING_SIZE];
+ size_t len;
+
+ if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode_tinc(buf, buf, strlen(buf)))) {
+ 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");