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