diff --git a/RNS/Link.py b/RNS/Link.py index 17ffb2b..698ce52 100644 --- a/RNS/Link.py +++ b/RNS/Link.py @@ -946,8 +946,7 @@ class Link: # is a file response, and we'll pass the open # file handle directly. if resource.has_metadata: - def job(): self.handle_response(resource.request_id, resource.data, resource.total_size, resource.size, metadata=resource.metadata) - threading.Thread(target=job, daemon=True).start() + self.handle_response(resource.request_id, resource.data, resource.total_size, resource.size, metadata=resource.metadata) # If not, we'll unpack the response data and # pass the unpacked structure to the handler @@ -956,8 +955,7 @@ class Link: unpacked_response = umsgpack.unpackb(packed_response) request_id = unpacked_response[0] response_data = unpacked_response[1] - def job(): self.handle_response(request_id, response_data, resource.total_size, resource.size) - threading.Thread(target=job, daemon=True).start() + self.handle_response(request_id, response_data, resource.total_size, resource.size) else: RNS.log("Incoming response resource failed with status: "+RNS.hexrep([resource.status]), RNS.LOG_DEBUG) @@ -1183,7 +1181,8 @@ class Link: resource_hash = packet.data[0:RNS.Identity.HASHLENGTH//8] for resource in self.outgoing_resources: if resource_hash == resource.hash: - resource.validate_proof(packet.data) + def job(): resource.validate_proof(packet.data) + threading.Thread(target=job, daemon=True).start() self.__update_phy_stats(packet, query_shared=True) self.watchdog_lock = False diff --git a/RNS/Resource.py b/RNS/Resource.py index 7f20bbc..3632850 100644 --- a/RNS/Resource.py +++ b/RNS/Resource.py @@ -1093,7 +1093,8 @@ class Resource: if self.callback != None: try: self.link.resource_concluded(self) - self.callback(self) + def job(): self.callback(self) + threading.Thread(target=job, daemon=True).start() except Exception as e: RNS.log("Error while executing callbacks on resource reject from "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR) diff --git a/RNS/_version.py b/RNS/_version.py index a82b376..72f26f5 100644 --- a/RNS/_version.py +++ b/RNS/_version.py @@ -1 +1 @@ -__version__ = "1.1.1" +__version__ = "1.1.2"