sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 21:42:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #502 from UdjinM6/v0.12.0.x_dsee_dseep

Browse Source 
V0.12.0.x fix bug with dsee/dseep proto check
This commit is contained in:
UdjinM6 2015-08-10 13:34:09 +03:00
commit 0f428872b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/masternodeman.cpp
View File

@ -862,7 +862,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
if(count == -1 && pmn->pubkey == pubkey && (pmn->lastPing.sigTime < GetTime() - MASTERNODE_MIN_MNB_SECONDS)){ if(count == -1 && pmn->pubkey == pubkey && (pmn->lastPing.sigTime < GetTime() - MASTERNODE_MIN_MNB_SECONDS)){
if(pmn->sigTime < sigTime){ //take the newest entry if(pmn->sigTime < sigTime){ //take the newest entry
LogPrintf("dsee - Got updated entry for %s\n", addr.ToString().c_str()); LogPrintf("dsee - Got updated entry for %s\n", addr.ToString().c_str());
if(pmn->protocolVersion == MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1) { if(pmn->protocolVersion < GETHEADERS_VERSION) {
pmn->pubkey2 = pubkey2; pmn->pubkey2 = pubkey2;
pmn->sigTime = sigTime; pmn->sigTime = sigTime;
pmn->sig = vchSig; pmn->sig = vchSig;
@ -954,7 +954,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
mn.lastPing = CMasternodePing(vin); mn.lastPing = CMasternodePing(vin);
mn.Check(true); mn.Check(true);
// add v11 masternodes, v12 should be added by mnb only // add v11 masternodes, v12 should be added by mnb only
if(protocolVersion == MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1) Add(mn); if(protocolVersion < GETHEADERS_VERSION) Add(mn);
if(mn.IsEnabled()) { if(mn.IsEnabled()) {
TRY_LOCK(cs_vNodes, lockNodes); TRY_LOCK(cs_vNodes, lockNodes);
if(!lockNodes) return; if(!lockNodes) return;
@ -1017,7 +1017,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
} }
// fake ping for v11 masternodes, ignore for v12 // fake ping for v11 masternodes, ignore for v12
if(pmn->protocolVersion == MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1) pmn->lastPing = CMasternodePing(vin); if(pmn->protocolVersion < GETHEADERS_VERSION) pmn->lastPing = CMasternodePing(vin);
pmn->Check(); pmn->Check();
if(pmn->IsEnabled()) { if(pmn->IsEnabled()) {
TRY_LOCK(cs_vNodes, lockNodes); TRY_LOCK(cs_vNodes, lockNodes);