diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-17 21:35:48 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-17 21:35:48 +0200 |
| commit | 1d32a5a445b06d68ddd3c60613452f8a4106f329 (patch) | |
| tree | 92d6c6a765df863b2c77e8ebc31861432e505fcb | |
| parent | Merge pull request #2287 (diff) | |
| parent | befor -> before (diff) | |
| download | monero-1d32a5a445b06d68ddd3c60613452f8a4106f329.tar.xz | |
Merge pull request #2291
b59cd074 befor -> before (Nano Akron)
| -rw-r--r-- | src/cryptonote_basic/connection_context.h | 8 | ||||
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler.inl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cryptonote_basic/connection_context.h b/src/cryptonote_basic/connection_context.h index 06f66120b..5c4cda9eb 100644 --- a/src/cryptonote_basic/connection_context.h +++ b/src/cryptonote_basic/connection_context.h @@ -39,12 +39,12 @@ namespace cryptonote struct cryptonote_connection_context: public epee::net_utils::connection_context_base { - cryptonote_connection_context(): m_state(state_befor_handshake), m_remote_blockchain_height(0), m_last_response_height(0), + cryptonote_connection_context(): m_state(state_before_handshake), m_remote_blockchain_height(0), m_last_response_height(0), m_last_known_hash(cryptonote::null_hash) {} enum state { - state_befor_handshake = 0, //default state + state_before_handshake = 0, //default state state_synchronizing, state_idle, state_normal @@ -65,8 +65,8 @@ namespace cryptonote { switch (s) { - case cryptonote_connection_context::state_befor_handshake: - return "state_befor_handshake"; + case cryptonote_connection_context::state_before_handshake: + return "state_before_handshake"; case cryptonote_connection_context::state_synchronizing: return "state_synchronizing"; case cryptonote_connection_context::state_idle: diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 265e60b3f..c78aae67e 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -252,7 +252,7 @@ namespace cryptonote template<class t_core> bool t_cryptonote_protocol_handler<t_core>::process_payload_sync_data(const CORE_SYNC_DATA& hshd, cryptonote_connection_context& context, bool is_inital) { - if(context.m_state == cryptonote_connection_context::state_befor_handshake && !is_inital) + if(context.m_state == cryptonote_connection_context::state_before_handshake && !is_inital) return true; if(context.m_state == cryptonote_connection_context::state_synchronizing) |