Git-Mirrors/LXMF
1
0
Fork 0
mirror of https://github.com/markqvist/LXMF.git synced 2025-07-28 17:44:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added message reject on too large transfer size

Browse source
This commit is contained in:
Mark Qvist 2025-01-18 21:36:08 +01:00
parent d6b1b9c94d
commit 3948c9a187
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
LXMF/LXMRouter.py
View file

@ -1777,7 +1777,9 @@ class LXMRouter:
self.failed_outbound.append(lxmessage) self.failed_outbound.append(lxmessage)
if lxmessage.state != LXMessage.REJECTED:
lxmessage.state = LXMessage.FAILED lxmessage.state = LXMessage.FAILED
if lxmessage.failed_callback != None and callable(lxmessage.failed_callback): if lxmessage.failed_callback != None and callable(lxmessage.failed_callback):
lxmessage.failed_callback(lxmessage) lxmessage.failed_callback(lxmessage)
@ -1871,6 +1873,12 @@ class LXMRouter:
if lxmessage.failed_callback != None and callable(lxmessage.failed_callback): if lxmessage.failed_callback != None and callable(lxmessage.failed_callback):
lxmessage.failed_callback(lxmessage) lxmessage.failed_callback(lxmessage)
elif lxmessage.state == LXMessage.REJECTED:
RNS.log("Receiver rejected "+str(lxmessage)+", removing from outbound queue", RNS.LOG_DEBUG)
self.pending_outbound.remove(lxmessage)
if lxmessage.failed_callback != None and callable(lxmessage.failed_callback):
lxmessage.failed_callback(lxmessage)
else: else:
RNS.log("Outbound processing for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG) RNS.log("Outbound processing for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)

8
LXMF/LXMessage.py
View file

@ -16,9 +16,10 @@ class LXMessage:
SENDING = 0x02 SENDING = 0x02
SENT = 0x04 SENT = 0x04
DELIVERED = 0x08 DELIVERED = 0x08
REJECTED = 0xFD
CANCELLED = 0xFE CANCELLED = 0xFE
FAILED = 0xFF FAILED = 0xFF
states = [GENERATING, OUTBOUND, SENDING, SENT, DELIVERED, CANCELLED, FAILED] states = [GENERATING, OUTBOUND, SENDING, SENT, DELIVERED, REJECTED, CANCELLED, FAILED]
UNKNOWN = 0x00 UNKNOWN = 0x00
PACKET = 0x01 PACKET = 0x01
@ -565,7 +566,10 @@ class LXMessage:
if resource.status == RNS.Resource.COMPLETE: if resource.status == RNS.Resource.COMPLETE:
self.__mark_delivered() self.__mark_delivered()
else: else:
if self.state != LXMessage.CANCELLED: if resource.status == RNS.Resource.REJECTED:
self.state = LXMessage.REJECTED
elif self.state != LXMessage.CANCELLED:
resource.link.teardown() resource.link.teardown()
self.state = LXMessage.OUTBOUND self.state = LXMessage.OUTBOUND