From: Etienne Dechamps <etienne@edechamps.fr>
Date: Mon, 18 May 2015 20:06:16 +0000 (+0100)
Subject: Fix direct UDP communciation with pre-relaying 1.1 nodes.
X-Git-Tag: release-1.1pre12~149
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a196e9b0fde1e8a67108eacd51ac663eac5a63ae;p=oweals%2Ftinc.git

Fix direct UDP communciation with pre-relaying 1.1 nodes.

try_tx_sptps() gives up on UDP communication if the recipient doesn't
support relaying. This is too restrictive - we only need the other node
to support relaying if we actually want to relay through them. If the
packet is sent directly, it's fine to send it to an old pre-node-IDs
tinc-1.1 node.
---

diff --git a/src/net_packet.c b/src/net_packet.c
index 4c06045..fc24c9a 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1190,15 +1190,13 @@ static void try_tx_sptps(node_t *n, bool mtu) {
 
 	node_t *via = (n->via == myself) ? n->nexthop : n->via;
 
-	/* If the static relay doesn't support SPTPS, everything goes via TCP anyway. */
+	/* If we do have a static relay, try everything with that one instead, if it supports relaying. */
 
-	if((via->options >> 24) < 4)
-		return;
-
-	/* If we do have a static relay, try everything with that one instead. */
-
-	if(via != n)
+	if(via != n) {
+		if((via->options >> 24) < 4)
+			return;
 		return try_tx_sptps(via, mtu);
+	}
 
 	/* Otherwise, try to establish UDP connectivity. */