From 5eae02068df763141557addd63b62cb9dad7b490 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 21 Sep 2021 11:58:39 -0400 Subject: [PATCH] Fix bass ackwards addresses making RENDEZVOUS packets not make it, improve P2P. --- root/root.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root/root.cpp b/root/root.cpp index 6cccba8b3..7e7d680da 100644 --- a/root/root.cpp +++ b/root/root.cpp @@ -574,7 +574,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt) } if (likely(sourcePeer)) { if ((sourcePeer->v6s >= 0)&&(forwardTo->v6s >= 0)) { - Packet outp(source,s_self.address(),Packet::VERB_RENDEZVOUS); + Packet outp(dest,s_self.address(),Packet::VERB_RENDEZVOUS); outp.append((uint8_t)0); dest.appendTo(outp); outp.append((uint16_t)sourcePeer->ip6.port()); @@ -586,7 +586,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt) s_outputRate.log(now,outp.size()); forwardTo->lastSend = now; - outp.reset(dest,s_self.address(),Packet::VERB_RENDEZVOUS); + outp.reset(source,s_self.address(),Packet::VERB_RENDEZVOUS); outp.append((uint8_t)0); source.appendTo(outp); outp.append((uint16_t)forwardTo->ip6.port()); @@ -600,7 +600,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt) } if ((sourcePeer->v4s >= 0)&&(forwardTo->v4s >= 0)) { - Packet outp(source,s_self.address(),Packet::VERB_RENDEZVOUS); + Packet outp(dest,s_self.address(),Packet::VERB_RENDEZVOUS); outp.append((uint8_t)0); dest.appendTo(outp); outp.append((uint16_t)sourcePeer->ip4.port()); @@ -612,7 +612,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt) s_outputRate.log(now,outp.size()); forwardTo->lastSend = now; - outp.reset(dest,s_self.address(),Packet::VERB_RENDEZVOUS); + outp.reset(source,s_self.address(),Packet::VERB_RENDEZVOUS); outp.append((uint8_t)0); source.appendTo(outp); outp.append((uint16_t)forwardTo->ip4.port());