William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-01-18 16:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved packet filter performance

Browse Source
This commit is contained in:
Mark Qvist 2025-01-11 14:24:40 +01:00
parent d4ed20c7d5
commit 5b17dbdfd6
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
RNS/Transport.py
View File

@ -85,7 +85,8 @@ class Transport:
destinations = [] # All active destinations destinations = [] # All active destinations
pending_links = [] # Links that are being established pending_links = [] # Links that are being established
active_links = [] # Links that are active active_links = [] # Links that are active
packet_hashlist = [] # A list of packet hashes for duplicate detection packet_hashlist = set() # A list of packet hashes for duplicate detection
packet_hashlist_prev = set()
receipts = [] # Receipts of all outgoing packets for proof processing receipts = [] # Receipts of all outgoing packets for proof processing
# TODO: "destination_table" should really be renamed to "path_table" # TODO: "destination_table" should really be renamed to "path_table"
@ -165,7 +166,8 @@ class Transport:
if os.path.isfile(packet_hashlist_path): if os.path.isfile(packet_hashlist_path):
try: try:
file = open(packet_hashlist_path, "rb") file = open(packet_hashlist_path, "rb")
Transport.packet_hashlist = umsgpack.unpackb(file.read()) hashlist_data = umsgpack.unpackb(file.read())
Transport.packet_hashlist = set(hashlist_data)
file.close() file.close()
except Exception as e: except Exception as e:
RNS.log("Could not load packet hashlist from storage, the contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("Could not load packet hashlist from storage, the contained exception was: "+str(e), RNS.LOG_ERROR)
@ -446,8 +448,9 @@ class Transport:
# Cull the packet hashlist if it has reached its max size # Cull the packet hashlist if it has reached its max size
if len(Transport.packet_hashlist) > Transport.hashlist_maxsize: if len(Transport.packet_hashlist) > Transport.hashlist_maxsize//2:
Transport.packet_hashlist = Transport.packet_hashlist[len(Transport.packet_hashlist)-Transport.hashlist_maxsize:len(Transport.packet_hashlist)-1] Transport.packet_hashlist_prev = Transport.packet_hashlist
Transport.packet_hashlist = set()
# Cull the path request tags list if it has reached its max size # Cull the path request tags list if it has reached its max size
if len(Transport.discovery_pr_tags) > Transport.max_pr_tags: if len(Transport.discovery_pr_tags) > Transport.max_pr_tags:
@ -986,7 +989,7 @@ class Transport:
if should_transmit: if should_transmit:
if not stored_hash: if not stored_hash:
Transport.packet_hashlist.append(packet.packet_hash) Transport.packet_hashlist.add(packet.packet_hash)
stored_hash = True stored_hash = True
# TODO: Re-evaluate potential for blocking # TODO: Re-evaluate potential for blocking
@ -1052,7 +1055,7 @@ class Transport:
RNS.log("Dropped invalid GROUP announce packet", RNS.LOG_DEBUG) RNS.log("Dropped invalid GROUP announce packet", RNS.LOG_DEBUG)
return False return False
if not packet.packet_hash in Transport.packet_hashlist: if not packet.packet_hash in Transport.packet_hashlist and not packet.packet_hash in Transport.packet_hashlist_prev:
return True return True
else: else:
if packet.packet_type == RNS.Packet.ANNOUNCE: if packet.packet_type == RNS.Packet.ANNOUNCE:
@ -1197,7 +1200,7 @@ class Transport:
remember_packet_hash = False remember_packet_hash = False
if remember_packet_hash: if remember_packet_hash:
Transport.packet_hashlist.append(packet.packet_hash) Transport.packet_hashlist.add(packet.packet_hash)
# TODO: Enable when caching has been redesigned # TODO: Enable when caching has been redesigned
# Transport.cache(packet) # Transport.cache(packet)
@ -1286,7 +1289,6 @@ class Transport:
path_mtu = RNS.Link.mtu_from_lr_packet(packet) path_mtu = RNS.Link.mtu_from_lr_packet(packet)
nh_mtu = outbound_interface.HW_MTU nh_mtu = outbound_interface.HW_MTU
if path_mtu: if path_mtu:
RNS.log(f"Seeing transported LR path MTU of {RNS.prettysize(path_mtu)}") # TODO: Remove debug
if outbound_interface.HW_MTU == None: if outbound_interface.HW_MTU == None:
RNS.log(f"No next-hop HW MTU, disabling link MTU upgrade") # TODO: Remove debug RNS.log(f"No next-hop HW MTU, disabling link MTU upgrade") # TODO: Remove debug
path_mtu = None path_mtu = None
@ -1360,7 +1362,7 @@ class Transport:
# Add this packet to the filter hashlist if we # Add this packet to the filter hashlist if we
# have determined that it's actually our turn # have determined that it's actually our turn
# to process it. # to process it.
Transport.packet_hashlist.append(packet.packet_hash) Transport.packet_hashlist.add(packet.packet_hash)
new_raw = packet.raw[0:1] new_raw = packet.raw[0:1]
new_raw += struct.pack("!B", packet.hops) new_raw += struct.pack("!B", packet.hops)
@ -1857,7 +1859,7 @@ class Transport:
# Add this packet to the filter hashlist if we # Add this packet to the filter hashlist if we
# have determined that it's actually destined # have determined that it's actually destined
# for this system, and then validate the proof # for this system, and then validate the proof
Transport.packet_hashlist.append(packet.packet_hash) Transport.packet_hashlist.add(packet.packet_hash)
link.validate_proof(packet) link.validate_proof(packet)
elif packet.context == RNS.Packet.RESOURCE_PRF: elif packet.context == RNS.Packet.RESOURCE_PRF:
@ -2679,13 +2681,13 @@ class Transport:
save_start = time.time() save_start = time.time()
if not RNS.Reticulum.transport_enabled(): if not RNS.Reticulum.transport_enabled():
Transport.packet_hashlist = [] Transport.packet_hashlist = set()
else: else:
RNS.log("Saving packet hashlist to storage...", RNS.LOG_DEBUG) RNS.log("Saving packet hashlist to storage...", RNS.LOG_DEBUG)
packet_hashlist_path = RNS.Reticulum.storagepath+"/packet_hashlist" packet_hashlist_path = RNS.Reticulum.storagepath+"/packet_hashlist"
file = open(packet_hashlist_path, "wb") file = open(packet_hashlist_path, "wb")
file.write(umsgpack.packb(Transport.packet_hashlist)) file.write(umsgpack.packb(list(Transport.packet_hashlist)))
file.close() file.close()
save_time = time.time() - save_start save_time = time.time() - save_start