William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 15:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved link authentication callback

Browse Source
This commit is contained in:
Mark Qvist 2022-05-22 19:08:03 +02:00
parent e63e6821e0
commit 0ace84367b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RNS/Link.py
View File

@ -650,7 +650,7 @@ class Link:
self.__remote_identity = identity self.__remote_identity = identity
if self.callbacks.remote_identified != None: if self.callbacks.remote_identified != None:
try: try:
self.callbacks.remote_identified(self.__remote_identity) self.callbacks.remote_identified(self, self.__remote_identity)
except Exception as e: except Exception as e:
RNS.log("Error while executing remote identified callback from "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("Error while executing remote identified callback from "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR)
@ -699,7 +699,9 @@ class Link:
elif self.resource_strategy == Link.ACCEPT_APP: elif self.resource_strategy == Link.ACCEPT_APP:
if self.callbacks.resource != None: if self.callbacks.resource != None:
try: try:
if self.callbacks.resource(resource): resource_advertisement = RNS.ResourceAdvertisement.unpack(packet.plaintext)
resource_advertisement.link = self
if self.callbacks.resource(resource_advertisement):
RNS.Resource.accept(packet, self.callbacks.resource_concluded) RNS.Resource.accept(packet, self.callbacks.resource_concluded)
except Exception as e: except Exception as e:
RNS.log("Error while executing resource accept callback from "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("Error while executing resource accept callback from "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR)
@ -830,7 +832,7 @@ class Link:
the resource will be accepted. If it returns *False* it will the resource will be accepted. If it returns *False* it will
be ignored. be ignored.
:param callback: A function or method with the signature *callback(resource)* to be called. :param callback: A function or method with the signature *callback(resource)* to be called. Please note that only the basic information of the resource is available at this time, such as *get_transfer_size()*, *get_data_size()*, *get_parts()* and *is_compressed()*.
""" """
self.callbacks.resource = callback self.callbacks.resource = callback
@ -857,7 +859,7 @@ class Link:
Registers a function to be called when an initiating peer has Registers a function to be called when an initiating peer has
identified over this link. identified over this link.
:param callback: A function or method with the signature *callback(identity)* to be called. :param callback: A function or method with the signature *callback(link, identity)* to be called.
""" """
self.callbacks.remote_identified = callback self.callbacks.remote_identified = callback