nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2291

Browse Source 
b59cd074 befor -> before (Nano Akron)
This commit is contained in:
Riccardo Spagni 2017-08-17 21:35:48 +02:00
commit 1d32a5a445
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryptonote_basic/connection_context.h
View File

@ -39,12 +39,12 @@ namespace cryptonote
struct cryptonote_connection_context: public epee::net_utils::connection_context_base 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) {} m_last_known_hash(cryptonote::null_hash) {}
enum state enum state
{ {
state_befor_handshake = 0, //default state state_before_handshake = 0, //default state
state_synchronizing, state_synchronizing,
state_idle, state_idle,
state_normal state_normal
@ -65,8 +65,8 @@ namespace cryptonote
{ {
switch (s) switch (s)
{ {
case cryptonote_connection_context::state_befor_handshake: case cryptonote_connection_context::state_before_handshake:
return "state_befor_handshake"; return "state_before_handshake";
case cryptonote_connection_context::state_synchronizing: case cryptonote_connection_context::state_synchronizing:
return "state_synchronizing"; return "state_synchronizing";
case cryptonote_connection_context::state_idle: case cryptonote_connection_context::state_idle:

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -252,7 +252,7 @@ namespace cryptonote
template<class t_core> 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) 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; return true;
if(context.m_state == cryptonote_connection_context::state_synchronizing) if(context.m_state == cryptonote_connection_context::state_synchronizing)