jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented path updating for moving nodes

Browse Source
This commit is contained in:
Mark Qvist 2021-10-09 22:13:27 +02:00
parent e8ee26f78d
commit 66ce58f0f4
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RNS/Destination.py
View File

@ -149,9 +149,6 @@ class Destination:
destination_hash = self.hash destination_hash = self.hash
random_hash = RNS.Identity.get_random_hash()[0:5]+int(time.time()).to_bytes(5, "big") random_hash = RNS.Identity.get_random_hash()[0:5]+int(time.time()).to_bytes(5, "big")
# TODO: Remove
RNS.log("ArB: "+RNS.hexrep(random_hash))
if app_data == None and self.default_app_data != None: if app_data == None and self.default_app_data != None:
if isinstance(self.default_app_data, bytes): if isinstance(self.default_app_data, bytes):
app_data = self.default_app_data app_data = self.default_app_data

25
RNS/Transport.py
View File

@ -775,12 +775,8 @@ class Transport:
# First, check that the announce is not for a destination # First, check that the announce is not for a destination
# local to this system, and that hops are less than the max # local to this system, and that hops are less than the max
if (not any(packet.destination_hash == d.hash for d in Transport.destinations) and packet.hops < Transport.PATHFINDER_M+1): if (not any(packet.destination_hash == d.hash for d in Transport.destinations) and packet.hops < Transport.PATHFINDER_M+1):
random_blob = packet.data[RNS.Identity.KEYSIZE//8+10:RNS.Identity.KEYSIZE//8+20] random_blob = packet.data[RNS.Identity.KEYSIZE//8:RNS.Identity.KEYSIZE//8+RNS.Reticulum.TRUNCATED_HASHLENGTH//8]
announce_emitted = int.from_bytes(random_blob[5:10], "big") announce_emitted = int.from_bytes(random_blob[5:10], "big")
# TODO: Remove
RNS.log("ArB: "+RNS.hexrep(random_blob))
RNS.log("Announce timestamp is: "+str(announce_emitted))
random_blobs = [] random_blobs = []
if packet.destination_hash in Transport.destination_table: if packet.destination_hash in Transport.destination_table:
random_blobs = Transport.destination_table[packet.destination_hash][4] random_blobs = Transport.destination_table[packet.destination_hash][4]
@ -807,17 +803,12 @@ class Transport:
path_expires = Transport.destination_table[packet.destination_hash][3] path_expires = Transport.destination_table[packet.destination_hash][3]
path_announce_emitted = 0 path_announce_emitted = 0
for random_blob in random_blobs: for path_random_blob in random_blobs:
path_announce_emitted = max(path_announce_emitted, int.from_bytes(random_blob[5:10], "big")) path_announce_emitted = max(path_announce_emitted, int.from_bytes(path_random_blob[5:10], "big"))
if path_announce_emitted > announce_emitted: if path_announce_emitted >= announce_emitted:
break break
# TODO: Remove if (now >= path_expires):
RNS.log("PA e: "+str(path_announce_emitted))
RNS.log("A e: "+str(announce_emitted))
##############
if (now >= path_expires or announce_emitted >= path_announce_emitted):
# We also check that the announce hash is # We also check that the announce hash is
# different from ones we've already heard, # different from ones we've already heard,
# to avoid loops in the network # to avoid loops in the network
@ -828,8 +819,14 @@ class Transport:
should_add = True should_add = True
else: else:
should_add = False should_add = False
else:
if (announce_emitted > path_announce_emitted):
if not random_blob in random_blobs:
RNS.log("Replacing destination table entry for "+str(RNS.prettyhexrep(packet.destination_hash))+" with new announce, since it was more recently emitted", RNS.LOG_DEBUG)
should_add = True
else: else:
should_add = False should_add = False
else: else:
# If this destination is unknown in our table # If this destination is unknown in our table
# we should add it # we should add it