mirror of
https://github.com/markqvist/Reticulum.git
synced 2026-11-19 14:36:34 -05:00
Added per-interface hop_limiter option
This commit is contained in:
parent
e96c81c3f2
commit
bb63dd4406
7 changed files with 17 additions and 5 deletions
|
|
@ -757,6 +757,7 @@ class BackboneInterface(Interface):
|
|||
spawned_interface.announce_rate_penalty = self.announce_rate_penalty
|
||||
spawned_interface.mode = self.mode
|
||||
spawned_interface.gravity = self.gravity
|
||||
spawned_interface.hop_limiter = self.hop_limiter
|
||||
spawned_interface.recursive_prs = self.recursive_prs
|
||||
spawned_interface.announces_from_internal = self.announces_from_internal
|
||||
spawned_interface.announces_to_internal = self.announces_to_internal
|
||||
|
|
|
|||
|
|
@ -920,6 +920,7 @@ class I2PInterface(Interface):
|
|||
spawned_interface.mode = self.mode
|
||||
spawned_interface.recursive_prs = self.recursive_prs
|
||||
spawned_interface.gravity = self.gravity
|
||||
spawned_interface.hop_limiter = self.hop_limiter
|
||||
spawned_interface.HW_MTU = self.HW_MTU
|
||||
RNS.log("Spawned new I2PInterface Peer: "+str(spawned_interface), RNS.LOG_VERBOSE)
|
||||
RNS.Transport.add_interface(spawned_interface)
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ class Interface:
|
|||
self.wants_tunnel = False
|
||||
self.remote_transport = None
|
||||
self.ingress_control = True
|
||||
self.hop_limiter = None
|
||||
self.phy_keepalive = False
|
||||
self.shared_medium = False
|
||||
|
||||
|
|
|
|||
|
|
@ -648,6 +648,7 @@ class TCPServerInterface(Interface):
|
|||
spawned_interface.announce_rate_penalty = self.announce_rate_penalty
|
||||
spawned_interface.mode = self.mode
|
||||
spawned_interface.gravity = self.gravity
|
||||
spawned_interface.hop_limiter = self.hop_limiter
|
||||
spawned_interface.recursive_prs = self.recursive_prs
|
||||
spawned_interface.announces_from_internal = self.announces_from_internal
|
||||
spawned_interface.announces_to_internal = self.announces_to_internal
|
||||
|
|
|
|||
|
|
@ -975,6 +975,7 @@ class WeaveInterface(Interface):
|
|||
|
||||
spawned_interface.mode = self.mode
|
||||
spawned_interface.gravity = self.gravity
|
||||
spawned_interface.hop_limiter = self.hop_limiter
|
||||
spawned_interface.HW_MTU = self.HW_MTU
|
||||
spawned_interface._online = True
|
||||
|
||||
|
|
|
|||
|
|
@ -1010,6 +1010,11 @@ class Reticulum:
|
|||
gravity = self._default_gravity()
|
||||
if "gravity" in c: gravity = c.as_int("gravity")
|
||||
|
||||
hop_limiter = None
|
||||
if "hop_limiter" in c:
|
||||
v = c.as_int("hop_limiter")
|
||||
hop_limiter = max(0, min(v, RNS.Transport.PATHFINDER_M))
|
||||
|
||||
destination_cost = None
|
||||
if "destination_cost" in c:
|
||||
v = c.as_float("destination_cost")
|
||||
|
|
@ -1170,11 +1175,12 @@ class Reticulum:
|
|||
if "outgoing" in c and c.as_bool("outgoing") == False: interface.OUT = False
|
||||
else: interface.OUT = True
|
||||
|
||||
interface.mode = interface_mode
|
||||
interface.gravity = gravity
|
||||
interface.announce_cap = announce_cap
|
||||
interface.bootstrap_only = bootstrap_only
|
||||
if configured_bitrate: interface.bitrate = configured_bitrate
|
||||
interface.mode = interface_mode
|
||||
interface.gravity = gravity
|
||||
interface.hop_limiter = hop_limiter
|
||||
interface.announce_cap = announce_cap
|
||||
interface.bootstrap_only = bootstrap_only
|
||||
if configured_bitrate: interface.bitrate = configured_bitrate
|
||||
interface.optimise_mtu()
|
||||
|
||||
if ifac_size != None: interface.ifac_size = ifac_size
|
||||
|
|
|
|||
|
|
@ -2082,6 +2082,7 @@ class Transport:
|
|||
|
||||
packet = RNS.Packet(None, raw)
|
||||
if not packet.unpack(): return interface.protocol_violation(f"Malformed packet ({len(raw)} bytes)", level=RNS.LOG_EXTREME) if interface else None
|
||||
if interface.hop_limiter and not packet.hops < interface.hop_limiter: return interface.hop_limiter_hit()
|
||||
if not packet.hops < Transport.HOP_LIMITER: return interface.hop_limiter_hit()
|
||||
if not Transport.packet_filter(packet): return interface.packet_filter_hit()
|
||||
traffic_class = tc or Transport.TC_DATA
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue