From: Guus Sliepen Date: Fri, 18 May 2007 10:29:10 +0000 (+0000) Subject: Detect duplicate outgoing connections. X-Git-Tag: release-1.1pre1~172 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=29fbce4497357580fc0aa00f087e8f1a538a2a50;p=tinc Detect duplicate outgoing connections. --- diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 70ccda17..18fbb64a 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -540,8 +540,17 @@ bool ack_h(connection_t *c) { } else { if(n->connection) { /* Oh dear, we already have a connection to this node. */ - ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), - n->name, n->hostname); + ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), n->connection->name, n->connection->hostname); + + if(n->connection->outgoing) { + if(c->outgoing) + logger(LOG_WARNING, _("Two outgoing connections to the same node!")); + else + c->outgoing = n->connection->outgoing; + + n->connection->outgoing = NULL; + } + terminate_connection(n->connection, false); /* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */ graph();