From: thorkill <thkr@hannover.ccc.de>
Date: Tue, 7 Jul 2015 19:19:26 +0000 (+0200)
Subject: Make sure we do not allocate new edge when talking to old nodes and the same edge... 
X-Git-Tag: release-1.1pre12~103
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=1e7ef381980a5c4c84d699522265290dde5ac728

Make sure we do not allocate new edge when talking to old nodes and the same edge already exists

When tinc gets ADD_EDGE from older versions it will allocate
new edge in protocol_edge.c:189 due to missed case in lines 149-171 where
local_address is not defined.
---

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 0879613c..1924ee35 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -167,6 +167,8 @@ bool add_edge_h(connection_t *c, const char *request) {
 				if(!tunnelserver)
 					forward_request(c, request);
 
+				return true;
+			} else {
 				return true;
 			}
 		} else {