From 9cf82bed3205d8405f56838d0e2ca0c72023a081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rinc?= Date: Fri, 16 Jan 2026 21:51:42 +0100 Subject: [PATCH] log: show placeholders for missing peer fields Avoid logging an empty field when peer user agent or collision entry is missing. Co-authored-by: naiyoma --- src/addrman.cpp | 4 ++-- src/net_processing.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/addrman.cpp b/src/addrman.cpp index 2e5149093c4..398c51b3251 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -663,8 +663,8 @@ bool AddrManImpl::Good_(const CService& addr, bool test_before_evict, NodeSecond } // Output the entry we'd be colliding with, for debugging purposes auto colliding_entry = mapInfo.find(vvTried[tried_bucket][tried_bucket_pos]); - LogDebug(BCLog::ADDRMAN, "Collision with %s while attempting to move %s to tried table. Collisions=%d\n", - colliding_entry != mapInfo.end() ? colliding_entry->second.ToStringAddrPort() : "", + LogDebug(BCLog::ADDRMAN, "Collision with %s while attempting to move %s to tried table. Collisions=%d", + colliding_entry != mapInfo.end() ? colliding_entry->second.ToStringAddrPort() : "", addr.ToStringAddrPort(), m_tried_collisions.size()); return false; diff --git a/src/net_processing.cpp b/src/net_processing.cpp index e5b4bc7772d..b79c42244be 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3669,8 +3669,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string } const auto mapped_as{m_connman.GetMappedAS(pfrom.addr)}; - LogDebug(BCLog::NET, "receive version message: %s: version %d, blocks=%d, us=%s, txrelay=%d, peer=%d%s%s\n", - cleanSubVer, pfrom.nVersion, + LogDebug(BCLog::NET, "receive version message: %s: version %d, blocks=%d, us=%s, txrelay=%d, peer=%d%s%s", + cleanSubVer.empty() ? "" : cleanSubVer, pfrom.nVersion, peer.m_starting_height, addrMe.ToStringAddrPort(), fRelay, pfrom.GetId(), pfrom.LogIP(fLogIPs), (mapped_as ? strprintf(", mapped_as=%d", mapped_as) : ""));