diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:24:58 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:24:58 +0200 |
| commit | 6db8a60a18c3678824016234b2153b4b0f0dbbdd (patch) | |
| tree | 7a36b079ad838f6d8046844e3a7596027f12bfdf /src/cryptonote_protocol/cryptonote_protocol_defs.h | |
| parent | Merge pull request #2138 (diff) | |
| parent | core: thread most of handle_incoming_tx (diff) | |
| download | monero-6db8a60a18c3678824016234b2153b4b0f0dbbdd.tar.xz | |
Merge pull request #2149
158c3ecf core: thread most of handle_incoming_tx (moneromooo-monero)
f57ee382 cryptonote_protocol: retry stale spans early (moneromooo-monero)
90df52e1 cryptonote_protocol: light cleanup (moneromooo-monero)
84e23156 cryptonote_protocol: avoid spurious SYNCHRONIZED OK messages (moneromooo-monero)
5be43fcd cryptonote_protocol_handler: sync speedup (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_protocol/cryptonote_protocol_defs.h')
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_defs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h index 6f6c1a803..042ae49f6 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_defs.h +++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h @@ -74,6 +74,8 @@ namespace cryptonote uint32_t support_flags; + boost::uuids::uuid connection_id; + BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(incoming) KV_SERIALIZE(localhost) @@ -94,6 +96,7 @@ namespace cryptonote KV_SERIALIZE(avg_upload) KV_SERIALIZE(current_upload) KV_SERIALIZE(support_flags) + KV_SERIALIZE_VAL_POD_AS_BLOB(connection_id) END_KV_SERIALIZE_MAP() }; |