X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=73a591edb1e976e75bca7d09c58f43012ad7a725;hb=5716c8877fd705d5af36d82e27632b123fa5dde0;hp=b8d4ee8e7a0658ff1e353fa00f36d5a0ab472fbe;hpb=b0d80c7f28528c2c8857c5662b4aca779b3184bb;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index b8d4ee8e..73a591ed 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -379,8 +379,8 @@ bool id_h(connection_t *c, const char *request) {
 		}
 
 		if(experimental)
-			if(!read_ecdsa_public_key(c))
-				return false;
+			read_ecdsa_public_key(c);
+			/* Ignore failures if no key known yet */
 	} else {
 		if(c->protocol_minor && !ecdsa_active(c->ecdsa))
 			c->protocol_minor = 1;
@@ -805,7 +805,6 @@ bool ack_h(connection_t *c, const char *request) {
 	/* Activate this connection */
 
 	c->allow_request = ALL;
-	c->status.active = true;
 
 	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection with %s (%s) activated", c->name,
 			   c->hostname);
@@ -822,6 +821,16 @@ bool ack_h(connection_t *c, const char *request) {
 	sockaddr2str(&c->address, &hisaddress, NULL);
 	c->edge->address = str2sockaddr(hisaddress, hisport);
 	free(hisaddress);
+	sockaddr_t local_sa;
+	socklen_t local_salen = sizeof local_sa;
+	if (getsockname(c->socket, &local_sa.sa, &local_salen) < 0)
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Could not get local socket address for connection with %s", c->name);
+	else {
+		char *local_address;
+		sockaddr2str(&local_sa, &local_address, NULL);
+		c->edge->local_address = str2sockaddr(local_address, myport);
+		free(local_address);
+	}
 	c->edge->weight = (weight + c->estimated_weight) / 2;
 	c->edge->connection = c;
 	c->edge->options = c->options;