From: Etienne Dechamps <etienne@edechamps.fr>
Date: Sun, 10 May 2015 17:46:47 +0000 (+0100)
Subject: Use the correct originator node when relaying SPTPS UDP packets.
X-Git-Tag: release-1.1pre12~170
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=8e43a2fc744559956640d3eb9a7a26a945d94fde;p=tinc

Use the correct originator node when relaying SPTPS UDP packets.

Currently, when relaying SPTPS UDP packets, the code uses the direct
sender as the originator, instead of preserving the original source ID.

This wouldn't cause any issues in most cases because the originator and
the sender are the same in simple one-hop relay chains, but this will
break as soon as there is more than one relay.
---

diff --git a/src/net_packet.c b/src/net_packet.c
index ddfc8721..27a6542c 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1404,7 +1404,7 @@ skip_harder:
 		/* If we're not the final recipient, relay the packet. */
 
 		if(to != myself) {
-			send_sptps_data_priv(to, n, 0, DATA(&pkt), pkt.len - 2 * sizeof(node_id_t));
+			send_sptps_data_priv(to, from, 0, DATA(&pkt), pkt.len - 2 * sizeof(node_id_t));
 			try_tx_sptps(to, true);
 			return;
 		}