Mirror/markqvist___Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2026-04-27 14:20:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed regression in resource file transfers

Browse source
This commit is contained in:
Mark Qvist 2026-01-08 12:38:21 +01:00
commit 9e18a6d1a8
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
RNS/Link.py
View file

@ -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

3
RNS/Resource.py
View file

@ -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)

2
RNS/_version.py
View file

@ -1 +1 @@
__version__ = "1.1.1"
__version__ = "1.1.2"