William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-23 06:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed spawned interface count sometimes being inaccurate on TCP and I2P interfaces

Browse Source
This commit is contained in:
Mark Qvist 2024-11-22 12:02:18 +01:00
parent c02e59e3ab
commit e81c22cf53
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RNS/Interfaces/I2PInterface.py
View File

@ -815,8 +815,8 @@ class I2PInterfacePeer(Interface):
self.IN = False self.IN = False
if hasattr(self, "parent_interface") and self.parent_interface != None: if hasattr(self, "parent_interface") and self.parent_interface != None:
if self.parent_interface.clients > 0: while self in self.parent_interface.spawned_interfaces:
self.parent_interface.clients -= 1 self.parent_interface.spawned_interfaces.remove(self)
if self in RNS.Transport.interfaces: if self in RNS.Transport.interfaces:
if not self.initiator: if not self.initiator:
@ -831,6 +831,10 @@ class I2PInterface(Interface):
BITRATE_GUESS = 256*1000 BITRATE_GUESS = 256*1000
DEFAULT_IFAC_SIZE = 16 DEFAULT_IFAC_SIZE = 16
@property
def clients(self):
return len(self.spawned_interfaces)
def __init__(self, owner, configuration): def __init__(self, owner, configuration):
super().__init__() super().__init__()
@ -846,7 +850,7 @@ class I2PInterface(Interface):
self.HW_MTU = 1064 self.HW_MTU = 1064
self.online = False self.online = False
self.clients = 0 self.spawned_interfaces = []
self.owner = owner self.owner = owner
self.connectable = connectable self.connectable = connectable
self.i2p_tunneled = True self.i2p_tunneled = True
@ -966,7 +970,9 @@ class I2PInterface(Interface):
spawned_interface.HW_MTU = self.HW_MTU spawned_interface.HW_MTU = self.HW_MTU
RNS.log("Spawned new I2PInterface Peer: "+str(spawned_interface), RNS.LOG_VERBOSE) RNS.log("Spawned new I2PInterface Peer: "+str(spawned_interface), RNS.LOG_VERBOSE)
RNS.Transport.interfaces.append(spawned_interface) RNS.Transport.interfaces.append(spawned_interface)
self.clients += 1 while spawned_interface in self.spawned_interfaces:
self.spawned_interfaces.remove(spawned_interface)
self.spawned_interfaces.append(spawned_interface)
spawned_interface.read_loop() spawned_interface.read_loop()
def processOutgoing(self, data): def processOutgoing(self, data):

18
RNS/Interfaces/TCPInterface.py
View File

@ -87,8 +87,8 @@ class TCPClientInterface(Interface):
c = Interface.get_config_obj(configuration) c = Interface.get_config_obj(configuration)
name = c["name"] name = c["name"]
target_ip = c["target_host"] if "target_host" in c else None target_ip = c["target_host"] if "target_host" in c and c["target_host"] != None else None
target_port = int(c["target_port"]) if "target_port" in c else None target_port = int(c["target_port"]) if "target_port" in c and c["target_host"] != None else None
kiss_framing = False kiss_framing = False
if "kiss_framing" in c and c.as_bool("kiss_framing") == True: if "kiss_framing" in c and c.as_bool("kiss_framing") == True:
kiss_framing = True kiss_framing = True
@ -413,7 +413,8 @@ class TCPClientInterface(Interface):
self.IN = False self.IN = False
if hasattr(self, "parent_interface") and self.parent_interface != None: if hasattr(self, "parent_interface") and self.parent_interface != None:
self.parent_interface.clients -= 1 while self in self.parent_interface.spawned_interfaces:
self.parent_interface.spawned_interfaces.remove(self)
if self in RNS.Transport.interfaces: if self in RNS.Transport.interfaces:
if not self.initiator: if not self.initiator:
@ -464,7 +465,10 @@ class TCPServerInterface(Interface):
raise SystemError(f"No suitable kernel interface available for address \"{name}\" for TCPServerInterface to bind to") raise SystemError(f"No suitable kernel interface available for address \"{name}\" for TCPServerInterface to bind to")
# def __init__(self, owner, name, device=None, bindip=None, bindport=None, i2p_tunneled=False, prefer_ipv6=False): @property
def clients(self):
return len(self.spawned_interfaces)
def __init__(self, owner, configuration): def __init__(self, owner, configuration):
super().__init__() super().__init__()
@ -483,7 +487,7 @@ class TCPServerInterface(Interface):
self.HW_MTU = 1064 self.HW_MTU = 1064
self.online = False self.online = False
self.clients = 0 self.spawned_interfaces = []
self.IN = True self.IN = True
self.OUT = False self.OUT = False
@ -578,7 +582,9 @@ class TCPServerInterface(Interface):
spawned_interface.online = True spawned_interface.online = True
RNS.log("Spawned new TCPClient Interface: "+str(spawned_interface), RNS.LOG_VERBOSE) RNS.log("Spawned new TCPClient Interface: "+str(spawned_interface), RNS.LOG_VERBOSE)
RNS.Transport.interfaces.append(spawned_interface) RNS.Transport.interfaces.append(spawned_interface)
self.clients += 1 while spawned_interface in self.spawned_interfaces:
self.spawned_interfaces.remove(spawned_interface)
self.spawned_interfaces.append(spawned_interface)
spawned_interface.read_loop() spawned_interface.read_loop()
def received_announce(self, from_spawned=False): def received_announce(self, from_spawned=False):