X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=ac486ea6f0ba0b34b12eacc75b66990d45f7391f;hb=826ad11e419db90b66b3f76a90b54df021bb39fc;hp=f3322c73b6461deaea4a3a4e8a872e4fdbef20d7;hpb=f0e7e6b03e34e69cac5b01a2d943ad3b9b59d36c;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index f3322c73..ac486ea6 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -514,14 +514,22 @@ bool metakey_h(connection_t *c, const char *request) {
 
 	/* Check and lookup cipher and digest algorithms */
 
-	if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
-		return false;
+	if(cipher) {
+		if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
+			return false;
+		}
+	} else {
+		c->incipher = NULL;
 	}
 
-	if(!(c->indigest = digest_open_by_nid(digest, -1))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
-		return false;
+	if(digest) {
+		if(!(c->indigest = digest_open_by_nid(digest, -1))) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
+			return false;
+		}
+	} else {
+		c->indigest = NULL;
 	}
 
 	c->status.decryptin = true;
@@ -797,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);
@@ -814,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;