Skip to content

Commit ac02708

Browse files
UdjinM6UdjinM6
authored
Respect logips config option in few more log outputs (#3078)
* Introduce CNode::GetLogString() and use it where appropriate * All other cases * fix typo * drop useless argument
1 parent d26b6a8 commit ac02708

File tree

7 files changed

+59
-17
lines changed

7 files changed

+59
-17
lines changed

‎src/addrman.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,9 @@ void CAddrMan::Good_(const CService& addr, int64_t nTime)
248248
if (nUBucket == -1)
249249
return;
250250

251-
LogPrint(BCLog::ADDRMAN, "Moving %s to tried\n", addr.ToString());
251+
if (fLogIPs) {
252+
LogPrint(BCLog::ADDRMAN, "Moving %s to tried\n", addr.ToString());
253+
}
252254

253255
// move nId to the tried tables
254256
MakeTried(info, nId);

‎src/governance/governance.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
121121
} else {
122122
SyncSingleObjVotes(pfrom, nProp, filter, connman);
123123
}
124-
LogPrint(BCLog::GOBJECT, "MNGOVERNANCESYNC -- syncing governance objects to our peer at %s\n", pfrom->addr.ToString());
124+
LogPrint(BCLog::GOBJECT, "MNGOVERNANCESYNC -- syncing governance objects to our peer %s\n", pfrom->GetLogString());
125125
}
126126

127127
// A NEW GOVERNANCE OBJECT HAS ARRIVED
@@ -320,7 +320,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
320320
}
321321
}
322322

323-
LogPrintf("CGovernanceManager::AddGovernanceObject -- %s new, received from %s\n", strHash, pfrom ? pfrom->GetAddrName() : "nullptr");
323+
LogPrintf("CGovernanceManager::AddGovernanceObject -- %s new, received from peer %s\n", strHash, pfrom ? pfrom->GetLogString() : "nullptr");
324324
govobj.Relay(connman);
325325

326326
// Update the rate buffer

‎src/masternode/masternode-utils.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ void CMasternodeUtils::ProcessMasternodeConnections(CConnman& connman)
3939
}
4040
if (fFound) return; // do NOT disconnect mixing masternodes
4141
#endif // ENABLE_WALLET
42-
LogPrintf("Closing Masternode connection: peer=%d, addr=%s\n", pnode->GetId(), pnode->addr.ToString());
42+
if (fLogIPs) {
43+
LogPrintf("Closing Masternode connection: peer=%d, addr=%s\n", pnode->GetId(), pnode->addr.ToString());
44+
} else {
45+
LogPrintf("Closing Masternode connection: peer=%d\n", pnode->GetId());
46+
}
4347
pnode->fDisconnect = true;
4448
}
4549
});

‎src/net.cpp‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,14 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
392392
}
393393

394394
/// debug print
395-
LogPrint(BCLog::NET, "trying connection %s lastseen=%.1fhrs\n",
396-
pszDest ? pszDest : addrConnect.ToString(),
397-
pszDest ? 0.0 : (double)(GetAdjustedTime() - addrConnect.nTime)/3600.0);
395+
if (fLogIPs) {
396+
LogPrint(BCLog::NET, "trying connection %s lastseen=%.1fhrs\n",
397+
pszDest ? pszDest : addrConnect.ToString(),
398+
pszDest ? 0.0 : (double)(GetAdjustedTime() - addrConnect.nTime)/3600.0);
399+
} else {
400+
LogPrint(BCLog::NET, "trying connection lastseen=%.1fhrs\n",
401+
pszDest ? 0.0 : (double)(GetAdjustedTime() - addrConnect.nTime)/3600.0);
402+
}
398403

399404
// Connect
400405
SOCKET hSocket;
@@ -655,6 +660,11 @@ void CNode::SetAddrLocal(const CService& addrLocalIn) {
655660
}
656661
}
657662

663+
std::string CNode::GetLogString() const
664+
{
665+
return fLogIPs ? addr.ToString() : strprintf("%d", id);
666+
}
667+
658668
#undef X
659669
#define X(name) stats.name = name
660670
void CNode::copyStats(CNodeStats &stats)
@@ -1131,15 +1141,22 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11311141
return;
11321142
}
11331143

1144+
std::string strDropped;
1145+
if (fLogIPs) {
1146+
strDropped = strprintf("connection from %s dropped", addr.ToString());
1147+
} else {
1148+
strDropped = "connection dropped";
1149+
}
1150+
11341151
if (!fNetworkActive) {
1135-
LogPrintf("connection from %s dropped: not accepting new connections\n", addr.ToString());
1152+
LogPrintf("%s: not accepting new connections\n", strDropped);
11361153
CloseSocket(hSocket);
11371154
return;
11381155
}
11391156

11401157
if (!IsSelectableSocket(hSocket))
11411158
{
1142-
LogPrintf("connection from %s dropped: non-selectable socket\n", addr.ToString());
1159+
LogPrintf("%s: non-selectable socket\n", strDropped);
11431160
CloseSocket(hSocket);
11441161
return;
11451162
}
@@ -1150,7 +1167,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11501167

11511168
if (IsBanned(addr) && !whitelisted)
11521169
{
1153-
LogPrintf("connection from %s dropped (banned)\n", addr.ToString());
1170+
LogPrintf("%s (banned)\n", strDropped);
11541171
CloseSocket(hSocket);
11551172
return;
11561173
}
@@ -1187,7 +1204,11 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11871204
pnode->fWhitelisted = whitelisted;
11881205
GetNodeSignals().InitializeNode(pnode, *this);
11891206

1190-
LogPrint(BCLog::NET, "connection from %s accepted\n", addr.ToString());
1207+
if (fLogIPs) {
1208+
LogPrint(BCLog::NET, "connection from %s accepted\n", addr.ToString());
1209+
} else {
1210+
LogPrint(BCLog::NET, "connection accepted\n");
1211+
}
11911212

11921213
{
11931214
LOCK(cs_vNodes);
@@ -1211,8 +1232,13 @@ void CConnman::ThreadSocketHandler()
12111232
{
12121233
if (pnode->fDisconnect)
12131234
{
1214-
LogPrintf("ThreadSocketHandler -- removing node: peer=%d addr=%s nRefCount=%d fInbound=%d fMasternode=%d\n",
1235+
if (fLogIPs) {
1236+
LogPrintf("ThreadSocketHandler -- removing node: peer=%d addr=%s nRefCount=%d fInbound=%d fMasternode=%d\n",
12151237
pnode->GetId(), pnode->addr.ToString(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
1238+
} else {
1239+
LogPrintf("ThreadSocketHandler -- removing node: peer=%d nRefCount=%d fInbound=%d fMasternode=%d\n",
1240+
pnode->GetId(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
1241+
}
12161242

12171243
// remove from vNodes
12181244
vNodes.erase(remove(vNodes.begin(), vNodes.end(), pnode), vNodes.end());
@@ -1957,7 +1983,11 @@ void CConnman::ThreadOpenConnections()
19571983
int randsleep = GetRandInt(FEELER_SLEEP_WINDOW * 1000);
19581984
if (!interruptNet.sleep_for(std::chrono::milliseconds(randsleep)))
19591985
return;
1960-
LogPrint(BCLog::NET, "Making feeler connection to %s\n", addrConnect.ToString());
1986+
if (fLogIPs) {
1987+
LogPrint(BCLog::NET, "Making feeler connection to %s\n", addrConnect.ToString());
1988+
} else {
1989+
LogPrint(BCLog::NET, "Making feeler connection\n");
1990+
}
19611991
}
19621992

19631993
OpenNetworkConnection(addrConnect, (int)setConnected.size() >= std::min(nMaxConnections - 1, 2), &grant, nullptr, false, fFeeler);

‎src/net.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,8 @@ class CNode
10201020
std::string GetAddrName() const;
10211021
//! Sets the addrName only if it was not previously set
10221022
void MaybeSetAddrName(const std::string& addrNameIn);
1023+
1024+
std::string GetLogString() const;
10231025
};
10241026

10251027
class CExplicitNetCleanup

‎src/net_processing.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2987,13 +2987,13 @@ static bool SendRejectsAndCheckIfBanned(CNode* pnode, CConnman& connman)
29872987
if (state.fShouldBan) {
29882988
state.fShouldBan = false;
29892989
if (pnode->fWhitelisted)
2990-
LogPrintf("Warning: not punishing whitelisted peer %s!\n", pnode->addr.ToString());
2990+
LogPrintf("Warning: not punishing whitelisted peer %s!\n", pnode->GetLogString());
29912991
else if (pnode->fAddnode)
2992-
LogPrintf("Warning: not punishing addnoded peer %s!\n", pnode->addr.ToString());
2992+
LogPrintf("Warning: not punishing addnoded peer %s!\n", pnode->GetLogString());
29932993
else {
29942994
pnode->fDisconnect = true;
29952995
if (pnode->addr.IsLocal())
2996-
LogPrintf("Warning: not banning local peer %s!\n", pnode->addr.ToString());
2996+
LogPrintf("Warning: not banning local peer %s!\n", pnode->GetLogString());
29972997
else
29982998
{
29992999
connman.Ban(pnode->addr, BanReasonNodeMisbehaving);

‎src/privatesend/privatesend-server.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
7272

7373
int64_t nLastDsq = mmetaman.GetMetaInfo(dmn->proTxHash)->GetLastDsq();
7474
if (nLastDsq != 0 && nLastDsq + mnList.GetValidMNsCount() / 5 > mmetaman.GetDsqCount()) {
75-
LogPrint(BCLog::PRIVATESEND, "DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
75+
if (fLogIPs) {
76+
LogPrint(BCLog::PRIVATESEND, "DSACCEPT -- last dsq too recent, must wait: peer=%d, addr=%s\n", pfrom->GetId(), pfrom->addr.ToString());
77+
} else {
78+
LogPrint(BCLog::PRIVATESEND, "DSACCEPT -- last dsq too recent, must wait: peer=%d\n", pfrom->GetId());
79+
}
7680
PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
7781
return;
7882
}

0 commit comments

Comments
 (0)