William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-22 13:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Mark Qvist 2023-05-10 18:44:05 +02:00
parent a4c64abed4
commit 01c59ab0c6
1 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
RNS/Channel.py
View File

@ -400,16 +400,7 @@ class Channel(contextlib.AbstractContextManager):
if not is_new: if not is_new:
RNS.log("Duplicate message received on channel "+str(self), RNS.LOG_EXTREME) RNS.log("Duplicate message received on channel "+str(self), RNS.LOG_EXTREME)
return return
else: else:
# TODO: Remove
# rmsg = "RX Ring State:\n "
# for e in self._rx_ring:
# rmsg += "["+str(e.sequence)+"]"
# rmsg += "\n"
# RNS.log(rmsg)
# print(rmsg)
with self._lock: with self._lock:
contigous = [] contigous = []
for e in self._rx_ring: for e in self._rx_ring:
@ -422,14 +413,6 @@ class Channel(contextlib.AbstractContextManager):
self._rx_ring.remove(e) self._rx_ring.remove(e)
threading.Thread(target=self._run_callbacks, name="Message Callback", args=[m], daemon=True).start() threading.Thread(target=self._run_callbacks, name="Message Callback", args=[m], daemon=True).start()
# TODO: Remove
# rmsg = "RX Ring State:\n "
# for e in self._rx_ring:
# rmsg += "["+str(e.sequence)+"]"
# rmsg += "\n"
# RNS.log(rmsg)
# print(rmsg)
except Exception as ex: except Exception as ex:
RNS.log(f"Channel: Error receiving data: {ex}") RNS.log(f"Channel: Error receiving data: {ex}")
@ -515,24 +498,6 @@ class Channel(contextlib.AbstractContextManager):
self._outlet.set_packet_delivered_callback(envelope.packet, self._packet_delivered) self._outlet.set_packet_delivered_callback(envelope.packet, self._packet_delivered)
self._outlet.set_packet_timeout_callback(envelope.packet, self._packet_timeout, self._get_packet_timeout_time(envelope.tries)) self._outlet.set_packet_timeout_callback(envelope.packet, self._packet_timeout, self._get_packet_timeout_time(envelope.tries))
# TODO: Remove
# try:
# tmsg = "TX Ring State:\n "
# for e in self._tx_ring:
# estat="u"
# status = e.packet.receipt.get_status()
# if status == RNS.PacketReceipt.SENT:
# estat="s"
# if status == RNS.PacketReceipt.DELIVERED:
# estat="d"
# if status == RNS.PacketReceipt.FAILED:
# estat="f"
# tmsg += "["+str(e.sequence)+estat+"]"
# print(tmsg)
# RNS.log(tmsg)
# except:
# pass
return envelope return envelope
@property @property