X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=6a7a9196f4d18854271015f57e3593e4683870af;hb=ad2e8db4730e3c4355db2cea911422e7efd6a1ee;hp=d7cbbd4867a77e563d3fbee3c219a5f3124b277a;hpb=d93d4f9dbd09bc5e53a9b5eeb1cc94939fee32bc;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index d7cbbd48..6a7a9196 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -44,6 +44,7 @@
 #include "random.h"
 #include "compression.h"
 #include "proxy.h"
+#include "address_cache.h"
 
 #include "ed25519/sha512.h"
 #include "keys.h"
@@ -82,6 +83,7 @@ static bool send_proxyrequest(connection_t *c) {
 	case PROXY_EXEC:
 		return true;
 
+	case PROXY_NONE:
 	default:
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
 		return false;
@@ -138,6 +140,22 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
 
 	logger(DEBUG_CONNECTIONS, LOG_INFO, "Key successfully received from %s (%s)", c->name, c->hostname);
 
+	if(!c->node) {
+		c->node = lookup_node(c->name);
+	}
+
+	if(!c->node) {
+		c->node = new_node(c->name);
+		c->node->connection = c;
+		node_add(c->node);
+	}
+
+	if(!c->node->address_cache) {
+		c->node->address_cache = open_address_cache(c->node);
+	}
+
+	add_recent_address(c->node->address_cache, &c->address);
+
 	// Call invitation-accepted script
 	environment_t env;
 	char *address, *port;
@@ -341,7 +359,17 @@ bool id_h(connection_t *c, const char *request) {
 
 		c->protocol_minor = 2;
 
-		return sptps_start(&c->sptps, c, false, false, invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
+		sptps_params_t params = {
+			.handle = c,
+			.initiator = false,
+			.mykey = invitation_key,
+			.hiskey = c->ecdsa,
+			.label = "tinc invitation",
+			.send_data = send_meta_sptps,
+			.receive_record = receive_invitation_sptps,
+		};
+
+		return sptps_start(&c->sptps, &params);
 	}
 
 	/* Check if identity is a valid name */
@@ -436,7 +464,18 @@ bool id_h(connection_t *c, const char *request) {
 			snprintf(label, labellen, "tinc TCP key expansion %s %s", c->name, myself->name);
 		}
 
-		return sptps_start(&c->sptps, c, c->outgoing, false, myself->connection->ecdsa, c->ecdsa, label, labellen, send_meta_sptps, receive_meta_sptps);
+		sptps_params_t params = {
+			.handle = c,
+			.initiator = c->outgoing,
+			.mykey = myself->connection->ecdsa,
+			.hiskey = c->ecdsa,
+			.label = label,
+			.labellen = sizeof(label),
+			.send_data = send_meta_sptps,
+			.receive_record = receive_meta_sptps,
+		};
+
+		return sptps_start(&c->sptps, &params);
 	} else {
 		return send_metakey(c);
 	}
@@ -935,8 +974,7 @@ bool ack_h(connection_t *c, const char *request) {
 	n = lookup_node(c->name);
 
 	if(!n) {
-		n = new_node();
-		n->name = xstrdup(c->name);
+		n = new_node(c->name);
 		node_add(n);
 	} else {
 		if(n->connection) {