Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-12-20 02:42:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added missing none check on interface socket

Browse source
This commit is contained in:
Mark Qvist 2025-04-07 15:02:32 +02:00
parent 4ece3a6140
commit 06848b6731
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
RNS/Interfaces/BackboneInterface.py
View file

@ -222,7 +222,7 @@ class BackboneInterface(Interface):
if fileno in BackboneInterface.spawned_interface_filenos: if fileno in BackboneInterface.spawned_interface_filenos:
spawned_interface = BackboneInterface.spawned_interface_filenos[fileno] spawned_interface = BackboneInterface.spawned_interface_filenos[fileno]
client_socket = spawned_interface.socket client_socket = spawned_interface.socket
if fileno == client_socket.fileno() and (event & select.EPOLLIN): if client_socket and fileno == client_socket.fileno() and (event & select.EPOLLIN):
try: received_bytes = client_socket.recv(4096) try: received_bytes = client_socket.recv(4096)
except Exception as e: except Exception as e:
RNS.log(f"Error while reading from {spawned_interface}: {e}", RNS.LOG_ERROR) RNS.log(f"Error while reading from {spawned_interface}: {e}", RNS.LOG_ERROR)
@ -233,7 +233,7 @@ class BackboneInterface(Interface):
BackboneInterface.deregister_fileno(fileno); client_socket.close() BackboneInterface.deregister_fileno(fileno); client_socket.close()
spawned_interface.receive(received_bytes) spawned_interface.receive(received_bytes)
elif fileno == client_socket.fileno() and (event & select.EPOLLOUT): elif client_socket and fileno == client_socket.fileno() and (event & select.EPOLLOUT):
try: try:
written = client_socket.send(spawned_interface.transmit_buffer) written = client_socket.send(spawned_interface.transmit_buffer)
except Exception as e: except Exception as e:
@ -249,7 +249,7 @@ class BackboneInterface(Interface):
spawned_interface.txb += written spawned_interface.txb += written
if spawned_interface.parent_interface: spawned_interface.parent_interface.txb += written if spawned_interface.parent_interface: spawned_interface.parent_interface.txb += written
elif fileno == client_socket.fileno() and event & (select.EPOLLHUP): elif client_socket and fileno == client_socket.fileno() and event & (select.EPOLLHUP):
BackboneInterface.deregister_fileno(fileno) BackboneInterface.deregister_fileno(fileno)
try: client_socket.close() try: client_socket.close()
except Exception as e: RNS.log(f"Error while closing socket for {spawned_interface}: {e}", RNS.LOG_ERROR) except Exception as e: RNS.log(f"Error while closing socket for {spawned_interface}: {e}", RNS.LOG_ERROR)