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

fix excessive banning, remove some redundant logic (#1172)

Browse Source 
* Since we send all mnb's now regardless of mn state, ping check for sigTime being too old is obsolete (and wrong).
Also removing fRequireEnabled, this logic is deprecated too it seems.

* remove (pre-)enabled check in CMasternodeMan::Add
This commit is contained in:
UdjinM6 2016-11-30 05:33:37 +04:00 committed by GitHub
parent 6cd6722c08
commit 17cebbed15
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/masternode.cpp
View File

@ -121,7 +121,7 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb)
nTimeLastChecked = 0; nTimeLastChecked = 0;
nTimeLastWatchdogVote = mnb.sigTime; nTimeLastWatchdogVote = mnb.sigTime;
int nDos = 0; int nDos = 0;
if(mnb.lastPing == CMasternodePing() || (mnb.lastPing != CMasternodePing() && mnb.lastPing.CheckAndUpdate(nDos, false))) { if(mnb.lastPing == CMasternodePing() || (mnb.lastPing != CMasternodePing() && mnb.lastPing.CheckAndUpdate(nDos))) {
lastPing = mnb.lastPing; lastPing = mnb.lastPing;
mnodeman.mapSeenMasternodePing.insert(std::make_pair(lastPing.GetHash(), lastPing)); mnodeman.mapSeenMasternodePing.insert(std::make_pair(lastPing.GetHash(), lastPing));
} }
@ -466,7 +466,7 @@ bool CMasternodeBroadcast::SimpleCheck(int& nDos)
} }
// empty ping or incorrect sigTime/blockhash // empty ping or incorrect sigTime/blockhash
if(lastPing == CMasternodePing() || !lastPing.CheckAndUpdate(nDos, false, true)) { if(lastPing == CMasternodePing() || !lastPing.CheckAndUpdate(nDos, true)) {
return false; return false;
} }
@ -765,7 +765,7 @@ bool CMasternodePing::CheckSignature(CPubKey& pubKeyMasternode, int &nDos)
return true; return true;
} }
bool CMasternodePing::CheckAndUpdate(int& nDos, bool fRequireEnabled, bool fSimpleCheck) bool CMasternodePing::CheckAndUpdate(int& nDos, bool fSimpleCheck)
{ {
if (sigTime > GetAdjustedTime() + 60 * 60) { if (sigTime > GetAdjustedTime() + 60 * 60) {
LogPrintf("CMasternodePing::CheckAndUpdate -- Signature rejected, too far into the future, masternode=%s\n", vin.prevout.ToStringShort()); LogPrintf("CMasternodePing::CheckAndUpdate -- Signature rejected, too far into the future, masternode=%s\n", vin.prevout.ToStringShort());
@ -773,12 +773,6 @@ bool CMasternodePing::CheckAndUpdate(int& nDos, bool fRequireEnabled, bool fSimp
return false; return false;
} }
if (sigTime <= GetAdjustedTime() - 60 * 60) {
LogPrintf("CMasternodePing::CheckAndUpdate -- Signature rejected, too far into the past: masternode=%s sigTime=%d GetAdjustedTime()=%d\n", vin.prevout.ToStringShort(), sigTime, GetAdjustedTime());
nDos = 1;
return false;
}
{ {
LOCK(cs_main); LOCK(cs_main);
BlockMap::iterator mi = mapBlockIndex.find(blockHash); BlockMap::iterator mi = mapBlockIndex.find(blockHash);
@ -811,8 +805,6 @@ bool CMasternodePing::CheckAndUpdate(int& nDos, bool fRequireEnabled, bool fSimp
return false; return false;
} }
if (fRequireEnabled && !pmn->IsEnabled() && !pmn->IsPreEnabled() && !pmn->IsWatchdogExpired()) return false;
// LogPrintf("mnping - Found corresponding mn for vin: %s\n", vin.prevout.ToStringShort()); // LogPrintf("mnping - Found corresponding mn for vin: %s\n", vin.prevout.ToStringShort());
// update only if there is no known ping for this masternode or // update only if there is no known ping for this masternode or
// last ping was more then MASTERNODE_MIN_MNP_SECONDS-60 ago comparing to this one // last ping was more then MASTERNODE_MIN_MNP_SECONDS-60 ago comparing to this one

2
src/masternode.h
View File

@ -78,7 +78,7 @@ public:
bool Sign(CKey& keyMasternode, CPubKey& pubKeyMasternode); bool Sign(CKey& keyMasternode, CPubKey& pubKeyMasternode);
bool CheckSignature(CPubKey& pubKeyMasternode, int &nDos); bool CheckSignature(CPubKey& pubKeyMasternode, int &nDos);
bool CheckAndUpdate(int& nDos, bool fRequireEnabled = true, bool fSimpleCheck = false); bool CheckAndUpdate(int& nDos, bool fSimpleCheck = false);
void Relay(); void Relay();
CMasternodePing& operator=(CMasternodePing from) CMasternodePing& operator=(CMasternodePing from)

5
src/masternodeman.cpp
View File

@ -123,9 +123,6 @@ bool CMasternodeMan::Add(CMasternode &mn)
{ {
LOCK(cs); LOCK(cs);
if (!mn.IsEnabled() && !mn.IsPreEnabled())
return false;
CMasternode *pmn = Find(mn.vin); CMasternode *pmn = Find(mn.vin);
if (pmn == NULL) { if (pmn == NULL) {
LogPrint("masternode", "CMasternodeMan::Add -- Adding new Masternode: addr=%s, %i now\n", mn.addr.ToString(), size() + 1); LogPrint("masternode", "CMasternodeMan::Add -- Adding new Masternode: addr=%s, %i now\n", mn.addr.ToString(), size() + 1);
@ -733,7 +730,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
LogPrint("masternode", "MNPING -- Masternode ping, masternode=%s new\n", mnp.vin.prevout.ToStringShort()); LogPrint("masternode", "MNPING -- Masternode ping, masternode=%s new\n", mnp.vin.prevout.ToStringShort());
int nDos = 0; int nDos = 0;
if(mnp.CheckAndUpdate(nDos, false)) return; if(mnp.CheckAndUpdate(nDos)) return;
if(nDos > 0) { if(nDos > 0) {
// if anything significant failed, mark that node // if anything significant failed, mark that node