DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix some super old logging bugs, hopefully

Browse Source
This commit is contained in:
Duke Leto
2020-12-05 08:52:00 -05:00
parent 979d45a4a1
commit b20c1c9a42
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.cpp
View File

@@ -7264,9 +7264,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
if (nVersion < minVersion) if (nVersion < minVersion)
{ {
// disconnect from peers older than this proto version // disconnect from peers older than this proto version
LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion); LogPrintf("Disconnecting peer=%d using obsolete version %i < %i\n", pfrom->id, nVersion, minVersion);
pfrom->PushMessage("reject", strCommand, REJECT_OBSOLETE, pfrom->PushMessage("reject", strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", minVersion));
strprintf("Version must be %d or greater", minVersion));
pfrom->fDisconnect = true; pfrom->fDisconnect = true;
return false; return false;
} }
@@ -7276,7 +7275,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
auto currentEpoch = CurrentEpoch(GetHeight(), params); auto currentEpoch = CurrentEpoch(GetHeight(), params);
if (nVersion < params.vUpgrades[currentEpoch].nProtocolVersion) if (nVersion < params.vUpgrades[currentEpoch].nProtocolVersion)
{ {
LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, nVersion); LogPrintf("Disconnecting peer=%d using obsolete epoch version %i; disconnecting\n", pfrom->id, nVersion);
pfrom->PushMessage("reject", strCommand, REJECT_OBSOLETE, pfrom->PushMessage("reject", strCommand, REJECT_OBSOLETE,
strprintf("Version must be %d or greater", strprintf("Version must be %d or greater",
params.vUpgrades[currentEpoch].nProtocolVersion)); params.vUpgrades[currentEpoch].nProtocolVersion));
@@ -7300,13 +7299,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// Disconnect if we connected to ourself // Disconnect if we connected to ourself
if (nNonce == nLocalHostNonce && nNonce > 1) if (nNonce == nLocalHostNonce && nNonce > 1)
{ {
LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString()); LogPrintf("connected to self, lulz, at %s, disconnecting, for now\n", pfrom->addr.ToString());
pfrom->fDisconnect = true; pfrom->fDisconnect = true;
return true; return true;
} }
pfrom->nVersion = nVersion; pfrom->nVersion = nVersion;
pfrom->addrLocal = addrMe; pfrom->addrLocal = addrMe;
if (pfrom->fInbound && addrMe.IsRoutable()) if (pfrom->fInbound && addrMe.IsRoutable())
{ {