mirror of
https://github.com/markqvist/Reticulum.git
synced 2024-11-22 13:40:19 +00:00
Prioritize interfaces according to bitrate
This commit is contained in:
parent
a666bb6e73
commit
2329181c88
@ -301,12 +301,23 @@ class Transport:
|
|||||||
RNS.log("Transport instance "+str(Transport.identity)+" started", RNS.LOG_VERBOSE)
|
RNS.log("Transport instance "+str(Transport.identity)+" started", RNS.LOG_VERBOSE)
|
||||||
Transport.start_time = time.time()
|
Transport.start_time = time.time()
|
||||||
|
|
||||||
|
# Sort interfaces according to bitrate
|
||||||
|
Transport.prioritize_interfaces()
|
||||||
|
|
||||||
# Synthesize tunnels for any interfaces wanting it
|
# Synthesize tunnels for any interfaces wanting it
|
||||||
for interface in Transport.interfaces:
|
for interface in Transport.interfaces:
|
||||||
interface.tunnel_id = None
|
interface.tunnel_id = None
|
||||||
if hasattr(interface, "wants_tunnel") and interface.wants_tunnel:
|
if hasattr(interface, "wants_tunnel") and interface.wants_tunnel:
|
||||||
Transport.synthesize_tunnel(interface)
|
Transport.synthesize_tunnel(interface)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def prioritize_interfaces():
|
||||||
|
try:
|
||||||
|
Transport.interfaces.sort(key=lambda interface: interface.bitrate, reverse=True)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
RNS.log(f"Could not prioritize interfaces according to bitrate. The contained exception was: {e}", RNS.LOG_ERROR)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def jobloop():
|
def jobloop():
|
||||||
while (True):
|
while (True):
|
||||||
@ -664,6 +675,7 @@ class Transport:
|
|||||||
Transport.tables_last_culled = time.time()
|
Transport.tables_last_culled = time.time()
|
||||||
|
|
||||||
if time.time() > Transport.interface_last_jobs + Transport.interface_jobs_interval:
|
if time.time() > Transport.interface_last_jobs + Transport.interface_jobs_interval:
|
||||||
|
Transport.prioritize_interfaces()
|
||||||
for interface in Transport.interfaces:
|
for interface in Transport.interfaces:
|
||||||
interface.process_held_announces()
|
interface.process_held_announces()
|
||||||
Transport.interface_last_jobs = time.time()
|
Transport.interface_last_jobs = time.time()
|
||||||
|
Loading…
Reference in New Issue
Block a user