Skip to content

Commit 4bd56bc

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#22894: netinfo: clarify client and server versions in header
e952d75 netinfo: clarify client and server versions in header (Jon Atack) Pull request description: Clarify in -netinfo output that both the client and the server versions are provided. before ``` Bitcoin Core v22.0.0rc3 - 70016/Satoshi:22.99.0/ ``` after ``` Bitcoin Core client v22.0.0rc3 - server 70016/Satoshi:22.99.0/ ``` Closes #22873. ACKs for top commit: benthecarman: utACK e952d75 prayank23: ACK bitcoin/bitcoin@e952d75 Zero-1729: tACK e952d75 Tree-SHA512: 3e817892d398aabacb1401fd5b1816c4d4f563b4f8cf1096bdb8b53f7c4ef82d4caee09f5c7724f1fe292f837434a332acefba735152ed24a238bb6f006df909
2 parents 78d39f8 + e952d75 commit 4bd56bc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bitcoin-cli.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class NetinfoRequestHandler : public BaseRequestHandler
514514
}
515515

516516
// Generate report header.
517-
std::string result{strprintf("%s %s%s - %i%s\n\n", PACKAGE_NAME, FormatFullVersion(), ChainToString(), networkinfo["protocolversion"].get_int(), networkinfo["subversion"].get_str())};
517+
std::string result{strprintf("%s client %s%s - server %i%s\n\n", PACKAGE_NAME, FormatFullVersion(), ChainToString(), networkinfo["protocolversion"].get_int(), networkinfo["subversion"].get_str())};
518518

519519
// Report detailed peer connections list sorted by direction and minimum ping time.
520520
if (DetailsRequested() && !m_peers.empty()) {

0 commit comments

Comments
 (0)