Merge pull request #2459 from Pythonix/net-fix

net: No longer send local address in addrMe
gridcoin-community · Apr 17, 2022 · 8a89e94 · 8a89e94
2 parents ff5c6ef + f749f19
commit 8a89e94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -3580,7 +3580,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // record my external IP reported by peer
-        if (addrFrom.IsRoutable() && addrMe.IsRoutable())
+        if (addrMe.IsRoutable())
             addrSeenByPeer = addrMe;
 
         // Be shy and don't send version until we hear

diff --git a/src/net.cpp b/src/net.cpp
@@ -485,7 +485,7 @@ void CNode::PushVersion()
 {
     int64_t nTime = GetAdjustedTime();
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));
-    CAddress addrMe = GetLocalAddress(&addr);
+    CAddress addrMe = CAddress(CService(), nLocalServices);
     GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
     LogPrint(BCLog::LogFlags::NET, "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%s",
         PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), addrYou.ToString(), addr.ToString());