Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-10-01 03:15:44 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed race condition for link initiators on timed out link establishment

Browse Source
This commit is contained in:
Mark Qvist 2023-06-13 19:20:54 +02:00
parent 420d58527d
commit 049733c4b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RNS/Link.py
View File

@ -277,8 +277,8 @@ class Link:
signature = packet.data[:RNS.Identity.SIGLENGTH//8] signature = packet.data[:RNS.Identity.SIGLENGTH//8]
if self.destination.identity.validate(signature, signed_data): if self.destination.identity.validate(signature, signed_data):
if self.status != Link.PENDING: if self.status != Link.HANDSHAKE:
raise IOError("Invalid link state for proof validation") raise IOError("Invalid link state for proof validation: "+str(self.status))
self.rtt = time.time() - self.request_time self.rtt = time.time() - self.request_time
self.attached_interface = packet.receiving_interface self.attached_interface = packet.receiving_interface

4
RNS/Transport.py
View File

@ -1741,8 +1741,8 @@ class Transport:
def activate_link(link): def activate_link(link):
RNS.log("Activating link "+str(link), RNS.LOG_EXTREME) RNS.log("Activating link "+str(link), RNS.LOG_EXTREME)
if link in Transport.pending_links: if link in Transport.pending_links:
if link.status != Link.PENDING: if link.status != RNS.Link.ACTIVE:
raise IOError("Invalid link state for link activation") raise IOError("Invalid link state for link activation: "+str(link.status))
Transport.pending_links.remove(link) Transport.pending_links.remove(link)
Transport.active_links.append(link) Transport.active_links.append(link)
link.status = RNS.Link.ACTIVE link.status = RNS.Link.ACTIVE