From eca357ed916c9782a64a68a2f30b144d84027795 Mon Sep 17 00:00:00 2001 From: Etienne Dechamps Date: Sun, 31 May 2015 20:19:48 +0100 Subject: [PATCH] Don't try to relay packets to unreachable nodes. It is not unusual for tinc to receive SPTPS packets to be relayed to nodes that just became unreachable, due to state propagation delays in the metagraph. Unfortunately, the current code doesn't handle that situation correctly, and still tries to relay the packet to the unreachable node. This typically ends up segfaulting. This commit fixes the issue by checking for reachability before relaying the packet. --- src/net_packet.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/net_packet.c b/src/net_packet.c index e4b839ef..69835eef 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -454,6 +454,13 @@ bool receive_tcppacket_sptps(connection_t *c, const char *data, int len) { return true; } + if(!to->status.reachable) { + /* This can happen in the form of a race condition + if the node just became unreachable. */ + logger(DEBUG_TRAFFIC, LOG_WARNING, "Cannot relay TCP packet from %s (%s) because the destination, %s (%s), is unreachable", from->name, from->hostname, to->name, to->hostname); + return; + } + /* Help the sender reach us over UDP. Note that we only do this if we're the destination or the static relay; otherwise every hop would initiate its own UDP info message, resulting in elevated chatter. */ @@ -1461,6 +1468,13 @@ skip_harder: return; } + if(!to->status.reachable) { + /* This can happen in the form of a race condition + if the node just became unreachable. */ + logger(DEBUG_TRAFFIC, LOG_WARNING, "Cannot relay packet from %s (%s) because the destination, %s (%s), is unreachable", from->name, from->hostname, to->name, to->hostname); + return; + } + /* The packet is supposed to come from the originator or its static relay (i.e. with no dynamic relays in between). If it did not, "help" the static relay by sending it UDP info. -- 2.20.1