|
|
|
@ -238,6 +238,10 @@ struct CBlockReject {
@@ -238,6 +238,10 @@ struct CBlockReject {
|
|
|
|
|
* and we're no longer holding the node's locks. |
|
|
|
|
*/ |
|
|
|
|
struct CNodeState { |
|
|
|
|
//! The peer's address
|
|
|
|
|
CService address; |
|
|
|
|
//! Whether we have a fully established connection.
|
|
|
|
|
bool fCurrentlyConnected; |
|
|
|
|
//! Accumulated misbehaviour score for this peer.
|
|
|
|
|
int nMisbehavior; |
|
|
|
|
//! Whether this peer should be disconnected and banned (unless whitelisted).
|
|
|
|
@ -262,6 +266,7 @@ struct CNodeState {
@@ -262,6 +266,7 @@ struct CNodeState {
|
|
|
|
|
bool fPreferredDownload; |
|
|
|
|
|
|
|
|
|
CNodeState() { |
|
|
|
|
fCurrentlyConnected = false; |
|
|
|
|
nMisbehavior = 0; |
|
|
|
|
fShouldBan = false; |
|
|
|
|
pindexBestKnownBlock = NULL; |
|
|
|
@ -305,6 +310,7 @@ void InitializeNode(NodeId nodeid, const CNode *pnode) {
@@ -305,6 +310,7 @@ void InitializeNode(NodeId nodeid, const CNode *pnode) {
|
|
|
|
|
LOCK(cs_main); |
|
|
|
|
CNodeState &state = mapNodeState.insert(std::make_pair(nodeid, CNodeState())).first->second; |
|
|
|
|
state.name = pnode->addrName; |
|
|
|
|
state.address = pnode->addr; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void FinalizeNode(NodeId nodeid) { |
|
|
|
@ -314,6 +320,10 @@ void FinalizeNode(NodeId nodeid) {
@@ -314,6 +320,10 @@ void FinalizeNode(NodeId nodeid) {
|
|
|
|
|
if (state->fSyncStarted) |
|
|
|
|
nSyncStarted--; |
|
|
|
|
|
|
|
|
|
if (state->nMisbehavior == 0 && state->fCurrentlyConnected) { |
|
|
|
|
AddressCurrentlyConnected(state->address); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BOOST_FOREACH(const QueuedBlock& entry, state->vBlocksInFlight) |
|
|
|
|
mapBlocksInFlight.erase(entry.hash); |
|
|
|
|
EraseOrphansFor(nodeid); |
|
|
|
@ -3627,6 +3637,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
@@ -3627,6 +3637,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
|
|
|
|
else if (strCommand == "verack") |
|
|
|
|
{ |
|
|
|
|
pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION)); |
|
|
|
|
|
|
|
|
|
// Mark this node as currently connected, so we update its timestamp later.
|
|
|
|
|
if (pfrom->fNetworkNode) { |
|
|
|
|
LOCK(cs_main); |
|
|
|
|
State(pfrom->GetId())->fCurrentlyConnected = true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -4271,11 +4287,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
@@ -4271,11 +4287,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Update the last seen time for this node's address
|
|
|
|
|
if (pfrom->fNetworkNode) |
|
|
|
|
if (strCommand == "version" || strCommand == "addr" || strCommand == "inv" || strCommand == "getdata" || strCommand == "ping") |
|
|
|
|
AddressCurrentlyConnected(pfrom->addr); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|