diff options
| author | Matt Corallo <git@bluematt.me> | 2017-10-05 11:49:16 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-10-13 13:25:58 -0400 |
| commit | 57edc0b0c86549020a39cd65f96496e9771c4769 (patch) | |
| tree | d5e72c1964cc4605d8bcf7aef1e397ecc4166bb9 /src/net_processing.cpp | |
| parent | 44407100ff9b478d6131a1c38ee993b50b1830df (diff) | |
| download | bitcoin-57edc0b0c86549020a39cd65f96496e9771c4769.tar.xz | |
Rename fAddnode to a more-descriptive "manual_connection"
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 39cf989eea..3b73533c0e 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1232,7 +1232,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr { connman->SetServices(pfrom->addr, nServices); } - if (!pfrom->fInbound && !pfrom->fFeeler && !pfrom->fAddnode && !HasAllDesirableServiceFlags(nServices)) + if (!pfrom->fInbound && !pfrom->fFeeler && !pfrom->m_manual_connection && !HasAllDesirableServiceFlags(nServices)) { LogPrint(BCLog::NET, "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->GetId(), nServices, GetDesirableServiceFlags(nServices)); connman->PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD, @@ -2628,8 +2628,8 @@ static bool SendRejectsAndCheckIfBanned(CNode* pnode, CConnman* connman) state.fShouldBan = false; if (pnode->fWhitelisted) LogPrintf("Warning: not punishing whitelisted peer %s!\n", pnode->addr.ToString()); - else if (pnode->fAddnode) - LogPrintf("Warning: not punishing addnoded peer %s!\n", pnode->addr.ToString()); + else if (pnode->m_manual_connection) + LogPrintf("Warning: not punishing manually-connected peer %s!\n", pnode->addr.ToString()); else { pnode->fDisconnect = true; if (pnode->addr.IsLocal()) |