jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved TCP client interface recovery

Browse Source
This commit is contained in:
Mark Qvist 2021-09-24 11:20:10 +02:00
parent 544e15afdf
commit 9323fd22ee
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
RNS/Interfaces/TCPInterface.py
View File

@ -42,6 +42,9 @@ class TCPClientInterface(Interface):
self.initiator = False self.initiator = False
self.reconnecting = False self.reconnecting = False
self.never_connected = True self.never_connected = True
self.owner = owner
self.writing = False
self.online = False
if max_reconnect_tries == None: if max_reconnect_tries == None:
self.max_reconnect_tries = TCPClientInterface.RECONNECT_MAX_TRIES self.max_reconnect_tries = TCPClientInterface.RECONNECT_MAX_TRIES
@ -63,18 +66,18 @@ class TCPClientInterface(Interface):
self.receives = True self.receives = True
self.target_ip = target_ip self.target_ip = target_ip
self.target_port = target_port self.target_port = target_port
self.connect() self.initiator = True
if not self.connect(initial=True):
thread = threading.Thread(target=self.reconnect)
thread.setDaemon(False)
thread.start()
else:
thread = threading.Thread(target=self.read_loop)
thread.setDaemon(True)
thread.start()
self.wants_tunnel = True
self.owner = owner
self.online = True
self.writing = False
if connected_socket == None:
self.initiator = True
thread = threading.Thread(target=self.read_loop)
thread.setDaemon(True)
thread.start()
self.wants_tunnel = True
def set_timeouts_linux(self): def set_timeouts_linux(self):
self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_USER_TIMEOUT, int(TCPClientInterface.TCP_USER_TIMEOUT * 1000)) self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_USER_TIMEOUT, int(TCPClientInterface.TCP_USER_TIMEOUT * 1000))
@ -93,9 +96,20 @@ class TCPClientInterface(Interface):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
sock.setsockopt(socket.IPPROTO_TCP, TCP_KEEPIDLE, int(TCPClientInterface.TCP_PROBE_AFTER)) sock.setsockopt(socket.IPPROTO_TCP, TCP_KEEPIDLE, int(TCPClientInterface.TCP_PROBE_AFTER))
def connect(self): def connect(self, initial=False):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) try:
self.socket.connect((self.target_ip, self.target_port)) self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.connect((self.target_ip, self.target_port))
self.online = True
except Exception as e:
if initial:
RNS.log("Initial connection for "+str(self)+" could not be established: "+str(e), RNS.LOG_ERROR)
RNS.log("Leaving unconnected and retrying connection in "+str(TCPClientInterface.RECONNECT_WAIT)+" seconds.", RNS.LOG_ERROR)
return False
else:
raise e
if platform.system() == "Linux": if platform.system() == "Linux":
self.set_timeouts_linux() self.set_timeouts_linux()
@ -106,6 +120,8 @@ class TCPClientInterface(Interface):
self.writing = False self.writing = False
self.never_connected = False self.never_connected = False
return True
def reconnect(self): def reconnect(self):
if self.initiator: if self.initiator: