Mirrors
/
Reticulum
mirror of https://github.com/markqvist/Reticulum.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added check for link state before sending

This commit is contained in:
Mark Qvist 2023-03-04 18:31:07 +01:00
parent 07484725a0
commit bbfdd37935
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RNS/Channel.py
View File

@ -299,7 +299,8 @@ class Channel(contextlib.AbstractContextManager):
:param callback: handler to remove :param callback: handler to remove
""" """
with self._lock: with self._lock:
self._message_callbacks.remove(callback) if callback in self._message_callbacks:
self._message_callbacks.remove(callback)
def _shutdown(self): def _shutdown(self):
with self._lock: with self._lock:
@ -464,7 +465,8 @@ class LinkChannelOutlet(ChannelOutletBase):
def send(self, raw: bytes) -> RNS.Packet: def send(self, raw: bytes) -> RNS.Packet:
packet = RNS.Packet(self.link, raw, context=RNS.Packet.CHANNEL) packet = RNS.Packet(self.link, raw, context=RNS.Packet.CHANNEL)
packet.send() if self.link.status == RNS.Link.ACTIVE:
packet.send()
return packet return packet
def resend(self, packet: RNS.Packet) -> RNS.Packet: def resend(self, packet: RNS.Packet) -> RNS.Packet:
@ -485,6 +487,9 @@ class LinkChannelOutlet(ChannelOutletBase):
return True # had issues looking at Link.status return True # had issues looking at Link.status
def get_packet_state(self, packet: TPacket) -> MessageState: def get_packet_state(self, packet: TPacket) -> MessageState:
if packet.receipt == None:
return MessageState.MSGSTATE_FAILED
status = packet.receipt.get_status() status = packet.receipt.get_status()
if status == RNS.PacketReceipt.SENT: if status == RNS.PacketReceipt.SENT:
return MessageState.MSGSTATE_SENT return MessageState.MSGSTATE_SENT