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

Tied link teardown to resource cancellation

Browse Source
This commit is contained in:
Mark Qvist 2018-04-21 23:15:48 +02:00
parent 260f8bbaf1
commit 23ff873c63
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RNS/Destination.py
View File

@ -123,7 +123,6 @@ class Destination:
def incomingLinkRequest(self, data, packet): def incomingLinkRequest(self, data, packet):
link = RNS.Link.validateRequest(self, data, packet) link = RNS.Link.validateRequest(self, data, packet)
if link != None: if link != None:
RNS.log(str(self)+" accepted link request", RNS.LOG_DEBUG)
self.links.append(link) self.links.append(link)
def createKeys(self): def createKeys(self):

7
RNS/Link.py
View File

@ -65,7 +65,9 @@ class Link:
if link.owner.callbacks.link_established != None: if link.owner.callbacks.link_established != None:
link.owner.callbacks.link_established(link) link.owner.callbacks.link_established(link)
RNS.log("Incoming link request "+str(link)+" accepted", RNS.LOG_VERBOSE) RNS.log("Incoming link request "+str(link)+" accepted", RNS.LOG_VERBOSE)
return link
except Exception as e: except Exception as e:
RNS.log("Validating link request failed", RNS.LOG_VERBOSE) RNS.log("Validating link request failed", RNS.LOG_VERBOSE)
@ -232,6 +234,11 @@ class Link:
pass pass
def link_closed(self): def link_closed(self):
for resource in self.incoming_resources:
resource.cancel()
for resource in self.outgoing_resources:
resource.cancel()
self.prv = None self.prv = None
self.pub = None self.pub = None
self.pub_bytes = None self.pub_bytes = None

5
RNS/Resource.py
View File

@ -364,8 +364,9 @@ class Resource:
def cancel(self): def cancel(self):
self.status = Resource.FAILED self.status = Resource.FAILED
if self.initiator: if self.initiator:
cancel_packet = RNS.Packet(self.link, self.hash, context=RNS.Packet.RESOURCE_ICL) if self.link.status == RNS.Link.ACTIVE:
cancel_packet.send() cancel_packet = RNS.Packet(self.link, self.hash, context=RNS.Packet.RESOURCE_ICL)
cancel_packet.send()
self.link.cancel_outgoing_resource(self) self.link.cancel_outgoing_resource(self)
else: else:
self.link.cancel_incoming_resource(self) self.link.cancel_incoming_resource(self)