nSPV full nodes to ignore nSPV messages

This commit is contained in:
jl777
2019-07-06 08:05:19 -11:00
parent d3730db5d8
commit a099b3a025

View File

@@ -7239,15 +7239,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
return false; return false;
} }
} }
else if ( (0) )
{
if ( pfrom->nServices != 0 )
{
fprintf(stderr,"debug mode, disconnect legacy peer.%d\n",pfrom->id);
pfrom->fDisconnect = true;
return false;
}
}
// Mark this node as currently connected, so we update its timestamp later. // Mark this node as currently connected, so we update its timestamp later.
if (pfrom->fNetworkNode) { if (pfrom->fNetworkNode) {
LOCK(cs_main); LOCK(cs_main);
@@ -7445,9 +7436,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
} }
else if (strCommand == "nSPV") else if (strCommand == "nSPV")
{ {
std::vector<uint8_t> payload; if ( KOMODO_NSPV != 0 )
vRecv >> payload; {
komodo_nSPVresp(pfrom,payload); std::vector<uint8_t> payload;
vRecv >> payload;
komodo_nSPVresp(pfrom,payload);
}
return(true); return(true);
} }
else if ( KOMODO_NSPV != 0 ) else if ( KOMODO_NSPV != 0 )
@@ -8240,9 +8234,11 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
} }
state.fShouldBan = false; state.fShouldBan = false;
} }
komodo_nSPV(pto);
if ( KOMODO_NSPV != 0 ) if ( KOMODO_NSPV != 0 )
{
komodo_nSPV(pto);
return(true); return(true);
}
BOOST_FOREACH(const CBlockReject& reject, state.rejects) BOOST_FOREACH(const CBlockReject& reject, state.rejects)
pto->PushMessage("reject", (string)"block", reject.chRejectCode, reject.strRejectReason, reject.hashBlock); pto->PushMessage("reject", (string)"block", reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
state.rejects.clear(); state.rejects.clear();