From 0356efecb6385b59a69bea220057396d6daa30bc Mon Sep 17 00:00:00 2001 From: Etienne Dechamps Date: Sun, 12 Oct 2014 11:41:08 +0100 Subject: [PATCH] Don't spontaneously start SPTPS with neighbors. Currently, when tinc establishes a metaconnection, it automatically starts a VPN SPTPS tunnel with the other side of the metaconnection. It is not clear what this is trying to accomplish. Having a metaconnection with a node does not necessarily mean we're going to send packets to that node. This patch removes this behavior, thereby simplifying code paths and removing unnecessary network chatter. Naturally, this introduces a slight delay (as well as at least one initial packet loss) between the moment a metaconnection is established and the moment VPN packets can be exchanged between the two nodes. However this is no different to the non-neighbor case, so it makes things more consistent and therefore easier to reason about. --- src/graph.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/graph.c b/src/graph.c index 690f4bd5..70d65731 100644 --- a/src/graph.c +++ b/src/graph.c @@ -275,13 +275,6 @@ static void check_reachability(void) { update_node_udp(n, NULL); memset(&n->status, 0, sizeof n->status); n->options = 0; - } else if(n->connection) { - if(n->status.sptps) { - if(n->connection->outgoing) - send_req_key(n); - } else { - send_ans_key(n); - } } } -- 2.20.1