neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix AskForMN (#1217)

Browse Source 
Should also store/check node we asked for mn list entry, not outpoint only. This should help to get mn list in sync when some nodes refuse to answer thus blocking such requests for the same outpoint for the next 3h and increasing mn list inconsistency.
This commit is contained in:
UdjinM6 2016-12-21 03:55:55 +04:00 committed by GitHub
parent 0e65968384
commit 1c6c0d8b7e
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/masternodeman.cpp
View File

@ -136,17 +136,29 @@ void CMasternodeMan::AskForMN(CNode* pnode, const CTxIn &vin)
{ {
if(!pnode) return; if(!pnode) return;
std::map<COutPoint, int64_t>::iterator it = mWeAskedForMasternodeListEntry.find(vin.prevout); LOCK(cs);
if (it != mWeAskedForMasternodeListEntry.end() && GetTime() < (*it).second) {
std::map<COutPoint, std::map<CNetAddr, int64_t> >::iterator it1 = mWeAskedForMasternodeListEntry.find(vin.prevout);
if (it1 != mWeAskedForMasternodeListEntry.end()) {
std::map<CNetAddr, int64_t>::iterator it2 = it1->second.find(pnode->addr);
if (it2 != it1->second.end()) {
if (GetTime() < it2->second) {
// we've asked recently, should not repeat too often or we could get banned // we've asked recently, should not repeat too often or we could get banned
return; return;
} }
// we asked this node for this outpoint but it's ok to ask again already
LogPrintf("CMasternodeMan::AskForMN -- Asking same peer %s for missing masternode entry again: %s\n", pnode->addr.ToString(), vin.prevout.ToStringShort());
} else {
// we already asked for this outpoint but not this node
LogPrintf("CMasternodeMan::AskForMN -- Asking new peer %s for missing masternode entry: %s\n", pnode->addr.ToString(), vin.prevout.ToStringShort());
}
} else {
// we never asked any node for this outpoint
LogPrintf("CMasternodeMan::AskForMN -- Asking peer %s for missing masternode entry for the first time: %s\n", pnode->addr.ToString(), vin.prevout.ToStringShort());
}
mWeAskedForMasternodeListEntry[vin.prevout][pnode->addr] = GetTime() + DSEG_UPDATE_SECONDS;
// ask for the mnb info once from the node that sent mnp
LogPrintf("CMasternodeMan::AskForMN -- Asking node for missing masternode entry: %s\n", vin.prevout.ToStringShort());
pnode->PushMessage(NetMsgType::DSEG, vin); pnode->PushMessage(NetMsgType::DSEG, vin);
mWeAskedForMasternodeListEntry[vin.prevout] = GetTime() + DSEG_UPDATE_SECONDS;;
} }
void CMasternodeMan::Check() void CMasternodeMan::Check()
@ -214,9 +226,17 @@ void CMasternodeMan::CheckAndRemove()
} }
// check which Masternodes we've asked for // check which Masternodes we've asked for
std::map<COutPoint, int64_t>::iterator it2 = mWeAskedForMasternodeListEntry.begin(); std::map<COutPoint, std::map<CNetAddr, int64_t> >::iterator it2 = mWeAskedForMasternodeListEntry.begin();
while(it2 != mWeAskedForMasternodeListEntry.end()){ while(it2 != mWeAskedForMasternodeListEntry.end()){
if((*it2).second < GetTime()){ std::map<CNetAddr, int64_t>::iterator it3 = it2->second.begin();
while(it3 != it2->second.end()){
if(it3->second < GetTime()){
it2->second.erase(it3++);
} else {
++it3;
}
}
if(it2->second.empty()) {
mWeAskedForMasternodeListEntry.erase(it2++); mWeAskedForMasternodeListEntry.erase(it2++);
} else { } else {
++it2; ++it2;

2
src/masternodeman.h
View File

@ -117,7 +117,7 @@ private:
// who we asked for the Masternode list and the last time // who we asked for the Masternode list and the last time
std::map<CNetAddr, int64_t> mWeAskedForMasternodeList; std::map<CNetAddr, int64_t> mWeAskedForMasternodeList;
// which Masternodes we've asked for // which Masternodes we've asked for
std::map<COutPoint, int64_t> mWeAskedForMasternodeListEntry; std::map<COutPoint, std::map<CNetAddr, int64_t> > mWeAskedForMasternodeListEntry;
// who we asked for the masternode verification // who we asked for the masternode verification
std::map<CNetAddr, CMasternodeVerification> mWeAskedForVerification; std::map<CNetAddr, CMasternodeVerification> mWeAskedForVerification;