aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2020-12-28 22:52:02 +0100
committerWladimir J. van der Laan <laanwj@protonmail.com>2020-12-28 23:56:23 +0100
commitd875bcc8f9ace495845df945018c2bc9db5bbafc (patch)
tree249b52384b5ebe69e725c9f93f3c2c35703b570e /src/net.h
parente3dd0a56cfa76eb50bcc46c41b1e3d4b0e445f26 (diff)
parente262a19b0ba07d8d2334551f49ca1577ab2999fc (diff)
downloadbitcoin-d875bcc8f9ace495845df945018c2bc9db5bbafc.tar.xz
Merge #162: Add network to peers window and peer details
e262a19b0ba07d8d2334551f49ca1577ab2999fc gui: display network in peer details (Jon Atack) 913695307360d3582f74ffe225cb122b2e48023d gui: rename peer tab column headers, initialize in .h (Hennadii Stepanov) 05c08c696a1bc45ab28abe6f82bebbdbd6239c23 gui: add network column in peers tab/window (Jon Atack) e0e55060bf697fe8b9ed43ff62383a0451e9c0ce gui: fix broken doxygen formatting in src/qt/guiutil.h (Jon Atack) 0d5613f9ded846aa20a95c757672e9560c664c4c gui: create GUIUtil::NetworkToQString() utility function (Jon Atack) af9103cc792e17f35249f1d4cb30f0d6958ceb75 net, rpc: change CNodeStats::m_network from string to Network (Jon Atack) Pull request description: and rename peers window column headers from NodeId and Node/Service to Peer Id and Address. ![Screenshot from 2020-12-27 14-45-31](https://user-images.githubusercontent.com/2415484/103172228-efec8600-4849-11eb-8cee-04a3d2ab1273.png) ACKs for top commit: laanwj: ACK e262a19b0ba07d8d2334551f49ca1577ab2999fc Tree-SHA512: 709c2a805c109c2dd033aca7b6b6dc94ebe2ce7a0168c71249e1e661c9c57d1f1c781a5b9ccf3b776bedeb83ae2fb5c505637337c45b1eb9a418cb1693a89761
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.h b/src/net.h
index 7c396a99cf..6316c73eee 100644
--- a/src/net.h
+++ b/src/net.h
@@ -720,8 +720,8 @@ public:
CAddress addr;
// Bind address of our side of the connection
CAddress addrBind;
- // Name of the network the peer connected through
- std::string m_network;
+ // Network the peer connected through
+ Network m_network;
uint32_t m_mapped_as;
std::string m_conn_type_string;
};