Fix mnp and mnv invs (#1775)

* Fix mnp inv

Add an entry to mapSeenMasternodePing when sending invs in DSEG response,
otherwise we won't be able to send data in ProcessGetData later and thus
peer that asked us won't be able to clear setAskFor.

* Fix mnv inv

The issue is similar to the one for mnp
This commit is contained in:
UdjinM6 2017-12-13 15:42:37 +03:00 committed by GitHub
parent 6915ee45e6
commit 930afd7df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -851,14 +851,15 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
LogPrint("masternode", "DSEG -- Sending Masternode entry: masternode=%s addr=%s\n", mnpair.first.ToStringShort(), mnpair.second.addr.ToString()); LogPrint("masternode", "DSEG -- Sending Masternode entry: masternode=%s addr=%s\n", mnpair.first.ToStringShort(), mnpair.second.addr.ToString());
CMasternodeBroadcast mnb = CMasternodeBroadcast(mnpair.second); CMasternodeBroadcast mnb = CMasternodeBroadcast(mnpair.second);
uint256 hash = mnb.GetHash(); CMasternodePing mnp = mnpair.second.lastPing;
pfrom->PushInventory(CInv(MSG_MASTERNODE_ANNOUNCE, hash)); uint256 hashMNB = mnb.GetHash();
pfrom->PushInventory(CInv(MSG_MASTERNODE_PING, mnpair.second.lastPing.GetHash())); uint256 hashMNP = mnp.GetHash();
pfrom->PushInventory(CInv(MSG_MASTERNODE_ANNOUNCE, hashMNB));
pfrom->PushInventory(CInv(MSG_MASTERNODE_PING, hashMNP));
nInvCount++; nInvCount++;
if (!mapSeenMasternodeBroadcast.count(hash)) { mapSeenMasternodeBroadcast.insert(std::make_pair(hashMNB, std::make_pair(GetTime(), mnb)));
mapSeenMasternodeBroadcast.insert(std::make_pair(hash, std::make_pair(GetTime(), mnb))); mapSeenMasternodePing.insert(std::make_pair(hashMNP, mnp));
}
if (vin.prevout == mnpair.first) { if (vin.prevout == mnpair.first) {
LogPrintf("DSEG -- Sent 1 Masternode inv to peer %d\n", pfrom->id); LogPrintf("DSEG -- Sent 1 Masternode inv to peer %d\n", pfrom->id);
@ -1178,6 +1179,7 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
} }
mWeAskedForVerification[pnode->addr] = mnv; mWeAskedForVerification[pnode->addr] = mnv;
mapSeenMasternodeVerification.insert(std::make_pair(mnv.GetHash(), mnv));
mnv.Relay(); mnv.Relay();
} else { } else {