oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Longer timeout for tor peers

Browse source
This commit is contained in:
shortcutme 2018-01-27 12:19:57 +01:00
parent fd14a4ac80
commit 18d3e8905e
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Connection/ConnectionServer.py
View file

@ -187,6 +187,11 @@ class ConnectionServer:
last_message_time = 0 last_message_time = 0
s = time.time() s = time.time()
for connection in self.connections[:]: # Make a copy for connection in self.connections[:]: # Make a copy
if connection.ip.endswith(".onion"):
timeout_multipler = 2
else:
timeout_multipler = 1
idle = time.time() - max(connection.last_recv_time, connection.start_time, connection.last_message_time) idle = time.time() - max(connection.last_recv_time, connection.start_time, connection.last_message_time)
last_message_time = max(last_message_time, connection.last_message_time) last_message_time = max(last_message_time, connection.last_message_time)
@ -207,16 +212,16 @@ class ConnectionServer:
if not connection.ping(): if not connection.ping():
connection.close("[Cleanup] Ping timeout") connection.close("[Cleanup] Ping timeout")
elif idle > 10 and connection.incomplete_buff_recv > 0: elif idle > 10 * timeout_multipler and connection.incomplete_buff_recv > 0:
# Incomplete data with more than 10 sec idle # Incomplete data with more than 10 sec idle
connection.close("[Cleanup] Connection buff stalled") connection.close("[Cleanup] Connection buff stalled")
elif idle > 10 and connection.protocol == "?": # No connection after 10 sec elif idle > 10 * timeout_multipler and connection.protocol == "?": # No connection after 10 sec
connection.close( connection.close(
"[Cleanup] Connect timeout: %.3fs" % idle "[Cleanup] Connect timeout: %.3fs" % idle
) )
elif idle > 10 and connection.waiting_requests and time.time() - connection.last_send_time > 10: elif idle > 10 * timeout_multipler and connection.waiting_requests and time.time() - connection.last_send_time > 10 * timeout_multipler:
# Sent command and no response in 10 sec # Sent command and no response in 10 sec
connection.close( connection.close(
"[Cleanup] Command %s timeout: %.3fs" % (connection.last_cmd_sent, time.time() - connection.last_send_time) "[Cleanup] Command %s timeout: %.3fs" % (connection.last_cmd_sent, time.time() - connection.last_send_time)