tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2073

Browse Source 
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)
This commit is contained in:
Riccardo Spagni
2017-06-24 12:41:09 +02:00
parent f09f18fc64 07c4276cbe
commit f31b89012d
3 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/epee/include/net/net_utils_base.h
+3
View File
@@ -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),