diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-06-24 12:41:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-06-24 12:41:09 +0200 |
| commit | f31b89012d5299e08ea897bf1061a5b3def8d96a (patch) | |
| tree | 2638c936e5f95127dd5db618355da28fd0f140ee /contrib/epee/include/net/net_utils_base.h | |
| parent | Merge pull request #2069 (diff) | |
| parent | Don't issue a new timedsync while one is already in progress (diff) | |
| download | monero-f31b89012d5299e08ea897bf1061a5b3def8d96a.tar.xz | |
Merge pull request #2073
07c4276c Don't issue a new timedsync while one is already in progress (Howard Chu)
cf3a376c Don't timeout a slow operation that's making progress (Howard Chu)
340830de Fix PR#2039 (Howard Chu)
Diffstat (limited to 'contrib/epee/include/net/net_utils_base.h')
| -rw-r--r-- | contrib/epee/include/net/net_utils_base.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/epee/include/net/net_utils_base.h b/contrib/epee/include/net/net_utils_base.h index ad0faa2a9..1884412dc 100644 --- a/contrib/epee/include/net/net_utils_base.h +++ b/contrib/epee/include/net/net_utils_base.h @@ -156,6 +156,7 @@ namespace net_utils const network_address m_remote_address; const bool m_is_income; const time_t m_started; + bool m_in_timedsync; time_t m_last_recv; time_t m_last_send; uint64_t m_recv_cnt; @@ -171,6 +172,7 @@ namespace net_utils m_remote_address(remote_address), m_is_income(is_income), m_started(time(NULL)), + m_in_timedsync(false), m_last_recv(last_recv), m_last_send(last_send), m_recv_cnt(recv_cnt), @@ -183,6 +185,7 @@ namespace net_utils m_remote_address(new ipv4_network_address(0,0)), m_is_income(false), m_started(time(NULL)), + m_in_timedsync(false), m_last_recv(0), m_last_send(0), m_recv_cnt(0), |