diff options
| author | Patrick Strateman <patrick.strateman@gmail.com> | 2018-09-24 16:43:00 -0400 |
|---|---|---|
| committer | Patrick Strateman <patrick.strateman@gmail.com> | 2018-09-24 17:08:04 -0400 |
| commit | 2af9cff11ad3ef27893b4b2009ddbfcb208554a9 (patch) | |
| tree | 85850f82a19562b99e974fa5adfd41d49d5e26d2 /src/net.cpp | |
| parent | 7479b63d9109ccaf3708a92dc65dc24556576551 (diff) | |
| download | bitcoin-2af9cff11ad3ef27893b4b2009ddbfcb208554a9.tar.xz | |
Move InactivityCheck logic to private method.
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/src/net.cpp b/src/net.cpp index 006e094fc7..644fed5ef8 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1229,6 +1229,39 @@ void CConnman::NotifyNumConnectionsChanged() } } +void CConnman::InactivityCheck(CNode *pnode) +{ + int64_t nTime = GetSystemTimeInSeconds(); + if (nTime - pnode->nTimeConnected > 60) + { + if (pnode->nLastRecv == 0 || pnode->nLastSend == 0) + { + LogPrint(BCLog::NET, "socket no message in first 60 seconds, %d %d from %d\n", pnode->nLastRecv != 0, pnode->nLastSend != 0, pnode->GetId()); + pnode->fDisconnect = true; + } + else if (nTime - pnode->nLastSend > TIMEOUT_INTERVAL) + { + LogPrintf("socket sending timeout: %is\n", nTime - pnode->nLastSend); + pnode->fDisconnect = true; + } + else if (nTime - pnode->nLastRecv > (pnode->nVersion > BIP0031_VERSION ? TIMEOUT_INTERVAL : 90*60)) + { + LogPrintf("socket receive timeout: %is\n", nTime - pnode->nLastRecv); + pnode->fDisconnect = true; + } + else if (pnode->nPingNonceSent && pnode->nPingUsecStart + TIMEOUT_INTERVAL * 1000000 < GetTimeMicros()) + { + LogPrintf("ping timeout: %fs\n", 0.000001 * (GetTimeMicros() - pnode->nPingUsecStart)); + pnode->fDisconnect = true; + } + else if (!pnode->fSuccessfullyConnected) + { + LogPrint(BCLog::NET, "version handshake timeout from %d\n", pnode->GetId()); + pnode->fDisconnect = true; + } + } +} + void CConnman::ThreadSocketHandler() { while (!interruptNet) @@ -1425,38 +1458,7 @@ void CConnman::ThreadSocketHandler() } } - // - // Inactivity checking - // - int64_t nTime = GetSystemTimeInSeconds(); - if (nTime - pnode->nTimeConnected > 60) - { - if (pnode->nLastRecv == 0 || pnode->nLastSend == 0) - { - LogPrint(BCLog::NET, "socket no message in first 60 seconds, %d %d from %d\n", pnode->nLastRecv != 0, pnode->nLastSend != 0, pnode->GetId()); - pnode->fDisconnect = true; - } - else if (nTime - pnode->nLastSend > TIMEOUT_INTERVAL) - { - LogPrintf("socket sending timeout: %is\n", nTime - pnode->nLastSend); - pnode->fDisconnect = true; - } - else if (nTime - pnode->nLastRecv > (pnode->nVersion > BIP0031_VERSION ? TIMEOUT_INTERVAL : 90*60)) - { - LogPrintf("socket receive timeout: %is\n", nTime - pnode->nLastRecv); - pnode->fDisconnect = true; - } - else if (pnode->nPingNonceSent && pnode->nPingUsecStart + TIMEOUT_INTERVAL * 1000000 < GetTimeMicros()) - { - LogPrintf("ping timeout: %fs\n", 0.000001 * (GetTimeMicros() - pnode->nPingUsecStart)); - pnode->fDisconnect = true; - } - else if (!pnode->fSuccessfullyConnected) - { - LogPrint(BCLog::NET, "version handshake timeout from %d\n", pnode->GetId()); - pnode->fDisconnect = true; - } - } + InactivityCheck(pnode); } { LOCK(cs_vNodes); |