Mirror/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2026-07-21 23:48:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implemented valid discovery announce caching and sequential validation lock to reduce processing load on CPU-constrained systems

Browse Source
This commit is contained in:
Mark Qvist
2026-07-20 17:21:41 +02:00
parent a5728be421
commit fa4d4c6716
1 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RNS/Discovery.py
+34 -15
View File
@@ -225,11 +225,14 @@ class InterfaceAnnounceHandler:
RNS.log("You can install it with the command: pip install lxmf", RNS.LOG_CRITICAL) RNS.log("You can install it with the command: pip install lxmf", RNS.LOG_CRITICAL)
RNS.panic() RNS.panic()
self.aspect_filter = APP_NAME+".discovery.interface" self.aspect_filter = APP_NAME+".discovery.interface"
self.required_value = required_value self.required_value = required_value
self.callback = callback self.callback = callback
self.stamper = LXStamper self.stamper = LXStamper
self.invalid_cache = deque(maxlen=2048) self.valid_cache = {}
self.valid_cache_max = 2048
self.invalid_cache = deque(maxlen=2048)
self.validation_lock = threading.Lock()
@staticmethod @staticmethod
def sanitize_name(name): def sanitize_name(name):
@@ -258,17 +261,33 @@ class InterfaceAnnounceHandler:
RNS.log(f"Ignored previously discovered interface with insufficient stamp value", RNS.LOG_PATHING) if RNS.sl(RNS.LOG_PATHING) else None RNS.log(f"Ignored previously discovered interface with insufficient stamp value", RNS.LOG_PATHING) if RNS.sl(RNS.LOG_PATHING) else None
return return
if encrypted: if fullhash in self.valid_cache:
if not RNS.Transport.has_network_identity(): return RNS.log(f"Discovery announce cache hit", RNS.LOG_PATHING) if RNS.sl(RNS.LOG_PATHING) else None
app_data = RNS.Transport.network_identity.decrypt(app_data) cache_entry = self.valid_cache[fullhash]
if not app_data: return stamp = cache_entry["stamp"]
packed = cache_entry["packed"]
value = cache_entry["value"]
valid = cache_entry["valid"]
stamp = app_data[-self.stamper.STAMP_SIZE:] else:
packed = app_data[:-self.stamper.STAMP_SIZE] if encrypted:
infohash = RNS.Identity.full_hash(packed) if not RNS.Transport.has_network_identity(): return
workblock = self.stamper.stamp_workblock(infohash, expand_rounds=InterfaceAnnouncer.WORKBLOCK_EXPAND_ROUNDS) app_data = RNS.Transport.network_identity.decrypt(app_data)
value = self.stamper.stamp_value(workblock, stamp) if not app_data: return
valid = self.stamper.stamp_valid(stamp, self.required_value, workblock)
if self.validation_lock.locked():
RNS.log(f"Dropping received interface discovery announce, already validating other discovery stamp", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None
return
with self.validation_lock:
stamp = app_data[-self.stamper.STAMP_SIZE:]
packed = app_data[:-self.stamper.STAMP_SIZE]
infohash = RNS.Identity.full_hash(packed)
workblock = self.stamper.stamp_workblock(infohash, expand_rounds=InterfaceAnnouncer.WORKBLOCK_EXPAND_ROUNDS)
value = self.stamper.stamp_value(workblock, stamp)
valid = self.stamper.stamp_valid(stamp, self.required_value, workblock)
self.valid_cache[fullhash] = {"valid": valid, "value": value, "packed": packed, "stamp": stamp}
while len(self.valid_cache) > self.valid_cache_max: self.valid_cache.pop(next(iter(self.valid_cache)))
if not valid: if not valid:
RNS.log(f"Ignored discovered interface with insufficient stamp value {value}", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None RNS.log(f"Ignored discovered interface with insufficient stamp value {value}", RNS.LOG_DEBUG) if RNS.sl(RNS.LOG_DEBUG) else None