diff options
| author | Thomas Winget <tewinget@gmail.com> | 2014-07-23 06:06:33 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2014-07-23 06:06:33 -0400 |
| commit | 55b92e39997a32ac889c72dc393fb74fa6759136 (patch) | |
| tree | 4f4aee0b943c302e8033f67e9b361b7ef589a0f9 /src | |
| parent | Merge pull request #67 from mikezackles/get_info (diff) | |
| parent | Changed time_t to uint64_t for serialization (diff) | |
| download | monero-55b92e39997a32ac889c72dc393fb74fa6759136.tar.xz | |
Merge pull request #68 from tewinget/daemon_rpc
daemon rpc get_connections call minor changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_defs.h | 6 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server_commands_defs.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h index eddb3b67b..850108858 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_defs.h +++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h @@ -27,14 +27,14 @@ namespace cryptonote std::string peer_id; uint64_t recv_count; - time_t recv_idle_time; + uint64_t recv_idle_time; uint64_t send_count; - time_t send_idle_time; + uint64_t send_idle_time; std::string state; - time_t live_time; + uint64_t live_time; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(incoming) diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 39acadb04..bd8aff706 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -495,6 +495,7 @@ namespace cryptonote std::list<connection_info> connections; BEGIN_KV_SERIALIZE_MAP() + KV_SERIALIZE(status) KV_SERIALIZE(connections) END_KV_SERIALIZE_MAP() }; |