LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Avoid advertising the node's address when it is not listening or IsInitialBlockDownload().

Browse source 
This also avoids flushing setAddrKnown until 24 hours has passed,
and avoids contacting the external IP services when not listening.

Advertising non-listening nodes is just addr message spam.
It doesn't help the network, in fact it hurts the network,
and it also hurts user's privacy.

Advertising far out of sync nodes doesn't help the network—
they can't even forward (most) transactions and wastes nodes
outbound slots.
This commit is contained in:
Gregory Maxwell 2012-02-01 18:08:03 -05:00
parent d2291cce92
commit 5d1b8f1725
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.cpp
View file

@ -2107,7 +2107,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (!pfrom->fInbound) if (!pfrom->fInbound)
{ {
// Advertise our address // Advertise our address
if (addrLocalHost.IsRoutable() && !fUseProxy) if (!fNoListen && !fUseProxy && addrLocalHost.IsRoutable() &&
!IsInitialBlockDownload())
{ {
CAddress addr(addrLocalHost); CAddress addr(addrLocalHost);
addr.nTime = GetAdjustedTime(); addr.nTime = GetAdjustedTime();
@ -2703,18 +2704,18 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
// Address refresh broadcast // Address refresh broadcast
static int64 nLastRebroadcast; static int64 nLastRebroadcast;
if (GetTime() - nLastRebroadcast > 24 * 60 * 60) if (!IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > 24 * 60 * 60))
{ {
nLastRebroadcast = GetTime();
CRITICAL_BLOCK(cs_vNodes) CRITICAL_BLOCK(cs_vNodes)
{ {
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
{ {
// Periodically clear setAddrKnown to allow refresh broadcasts // Periodically clear setAddrKnown to allow refresh broadcasts
if (nLastRebroadcast)
pnode->setAddrKnown.clear(); pnode->setAddrKnown.clear();
// Rebroadcast our address // Rebroadcast our address
if (addrLocalHost.IsRoutable() && !fUseProxy) if (!fNoListen && !fUseProxy && addrLocalHost.IsRoutable())
{ {
CAddress addr(addrLocalHost); CAddress addr(addrLocalHost);
addr.nTime = GetAdjustedTime(); addr.nTime = GetAdjustedTime();
@ -2722,6 +2723,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
} }
} }
} }
nLastRebroadcast = GetTime();
} }
// Clear out old addresses periodically so it's not too much work at once // Clear out old addresses periodically so it's not too much work at once

2
src/net.cpp
View file

@ -141,7 +141,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
const char* pszGet; const char* pszGet;
const char* pszKeyword; const char* pszKeyword;
if (fUseProxy) if (fNoListen||fUseProxy)
return false; return false;
for (int nLookup = 0; nLookup <= 1; nLookup++) for (int nLookup = 0; nLookup <= 1; nLookup++)