aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-07-24 14:31:59 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-07-24 14:31:59 -0500
commite05873d87340152786864c34e6e9b67593cc389e (patch)
treed20e98558f340f391f5c8f08265f102c6a6b28df /src
parentMerge pull request #5605 (diff)
parentrpc: use ip address string representation for peer::host field (diff)
downloadmonero-e05873d87340152786864c34e6e9b67593cc389e.tar.xz
Merge pull request #5606
cf8cb68 rpc: use ip address string representation for peer::host field (xiphon)
Diffstat (limited to 'src')
-rw-r--r--src/rpc/core_rpc_server_commands_defs.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 53c975392..39ee2edd8 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -29,6 +29,9 @@
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#pragma once
+
+#include "string_tools.h"
+
#include "cryptonote_protocol/cryptonote_protocol_defs.h"
#include "cryptonote_basic/cryptonote_basic.h"
#include "cryptonote_basic/difficulty.h"
@@ -1198,7 +1201,7 @@ namespace cryptonote
: id(id), host(host), ip(0), port(0), rpc_port(rpc_port), last_seen(last_seen), pruning_seed(pruning_seed)
{}
peer(uint64_t id, uint32_t ip, uint16_t port, uint64_t last_seen, uint32_t pruning_seed, uint16_t rpc_port)
- : id(id), host(std::to_string(ip)), ip(ip), port(port), rpc_port(rpc_port), last_seen(last_seen), pruning_seed(pruning_seed)
+ : id(id), host(epee::string_tools::get_ip_string_from_int32(ip)), ip(ip), port(port), rpc_port(rpc_port), last_seen(last_seen), pruning_seed(pruning_seed)
{}
BEGIN_KV_SERIALIZE_MAP()