diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-02 09:23:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-02 09:23:22 +0200 |
| commit | ed8fc8ac1c694344e30d07f1cb1a5cb904b13f52 (patch) | |
| tree | c63e40a023ccc16bedbd2ec4447bc94b2f0a6b0c /src/cryptonote_protocol | |
| parent | 4adcacd800a3b9c15eb9fd392fa6ca77a90d9796 (diff) | |
| parent | 310b790a64648b088badeb5cbedaddce7fe8c35b (diff) | |
| download | monzero-core-ed8fc8ac1c694344e30d07f1cb1a5cb904b13f52.tar.gz monzero-core-ed8fc8ac1c694344e30d07f1cb1a5cb904b13f52.tar.xz monzero-core-ed8fc8ac1c694344e30d07f1cb1a5cb904b13f52.zip | |
Merge pull request #2838
310b790a make connection_id a string in RPC (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_protocol')
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_defs.h | 4 | ||||
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler.inl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h index 1804cc101..7cf7e4a4d 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_defs.h +++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h @@ -74,7 +74,7 @@ namespace cryptonote uint32_t support_flags; - boost::uuids::uuid connection_id; + std::string connection_id; uint64_t height; @@ -98,7 +98,7 @@ namespace cryptonote KV_SERIALIZE(avg_upload) KV_SERIALIZE(current_upload) KV_SERIALIZE(support_flags) - KV_SERIALIZE_VAL_POD_AS_BLOB(connection_id) + KV_SERIALIZE(connection_id) KV_SERIALIZE(height) END_KV_SERIALIZE_MAP() }; diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 73433a8d8..9ae24551c 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -244,7 +244,7 @@ namespace cryptonote cnx.current_download = cntxt.m_current_speed_down / 1024; cnx.current_upload = cntxt.m_current_speed_up / 1024; - cnx.connection_id = cntxt.m_connection_id; + cnx.connection_id = epee::string_tools::pod_to_hex(cntxt.m_connection_id); cnx.height = cntxt.m_remote_blockchain_height; |