From 2e7126ef395665af3b569529093e1b7c5d5c6fec Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 27 Aug 2021 22:51:16 +0200 Subject: [PATCH] Cleaned up log statements --- RNS/Identity.py | 6 ------ RNS/Interfaces/AX25KISSInterface.py | 1 - RNS/Link.py | 6 +++--- RNS/Transport.py | 24 ++++++++---------------- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/RNS/Identity.py b/RNS/Identity.py index 670e865..40c3cfa 100644 --- a/RNS/Identity.py +++ b/RNS/Identity.py @@ -64,16 +64,13 @@ class Identity: :param destination_hash: Destination hash as *bytes*. :returns: An :ref:`RNS.Identity` instance that can be used to create an outgoing :ref:`RNS.Destination`, or *None* if the destination is unknown. """ - RNS.log("Searching for "+RNS.prettyhexrep(destination_hash)+"...", RNS.LOG_EXTREME) if destination_hash in Identity.known_destinations: identity_data = Identity.known_destinations[destination_hash] identity = Identity(create_keys=False) identity.load_public_key(identity_data[2]) identity.app_data = identity_data[3] - RNS.log("Found "+RNS.prettyhexrep(destination_hash)+" in known destinations", RNS.LOG_EXTREME) return identity else: - RNS.log("Could not find "+RNS.prettyhexrep(destination_hash)+" in known destinations", RNS.LOG_EXTREME) return None @staticmethod @@ -84,13 +81,10 @@ class Identity: :param destination_hash: Destination hash as *bytes*. :returns: *Bytes* containing app_data, or *None* if the destination is unknown. """ - RNS.log("Searching for app_data for "+RNS.prettyhexrep(destination_hash)+"...", RNS.LOG_EXTREME) if destination_hash in Identity.known_destinations: app_data = Identity.known_destinations[destination_hash][3] - RNS.log("Found "+RNS.prettyhexrep(destination_hash)+" app_data in known destinations", RNS.LOG_EXTREME) return app_data else: - RNS.log("Could not find "+RNS.prettyhexrep(destination_hash)+" app_data in known destinations", RNS.LOG_EXTREME) return None @staticmethod diff --git a/RNS/Interfaces/AX25KISSInterface.py b/RNS/Interfaces/AX25KISSInterface.py index 820e258..2566eea 100644 --- a/RNS/Interfaces/AX25KISSInterface.py +++ b/RNS/Interfaces/AX25KISSInterface.py @@ -224,7 +224,6 @@ class AX25KISSInterface(Interface): kiss_frame = bytes([KISS.FEND])+bytes([0x00])+data+bytes([KISS.FEND]) if (self.txdelay > 0): - RNS.log(str(self.name)+" delaying TX for "+str(self.txdelay)+" seconds", RNS.LOG_EXTREME) sleep(self.txdelay) written = self.serial.write(kiss_frame) diff --git a/RNS/Link.py b/RNS/Link.py index a1edc54..521a812 100644 --- a/RNS/Link.py +++ b/RNS/Link.py @@ -242,7 +242,6 @@ class Link: RNS.log("Link "+str(self)+" established with "+str(self.destination)+", RTT is "+str(self.rtt), RNS.LOG_VERBOSE) rtt_data = umsgpack.packb(self.rtt) rtt_packet = RNS.Packet(self, rtt_data, context=RNS.Packet.LRRTT) - RNS.log("Sending RTT packet", RNS.LOG_EXTREME); rtt_packet.send() self.had_outbound() @@ -691,6 +690,7 @@ class Link: return ciphertext except Exception as e: RNS.log("Encryption on link "+str(self)+" failed. The contained exception was: "+str(e), RNS.LOG_ERROR) + raise e def decrypt(self, ciphertext): @@ -705,8 +705,8 @@ class Link: except Exception as e: RNS.log("Decryption failed on link "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log(traceback.format_exc(), RNS.LOG_ERROR) - # TODO: Do we really need to do this? Or can we recover somehow? - self.teardown() + # TODO: Think long about implications here + # self.teardown() def sign(self, message): diff --git a/RNS/Transport.py b/RNS/Transport.py index ddd75c5..c918b6e 100755 --- a/RNS/Transport.py +++ b/RNS/Transport.py @@ -180,7 +180,7 @@ class Transport: while len(Transport.receipts) > Transport.MAX_RECEIPTS: culled_receipt = Transport.receipts.pop(0) culled_receipt.timeout = -1 - receipt.check_timeout() + culled_receipt.check_timeout() for receipt in Transport.receipts: receipt.check_timeout() @@ -246,8 +246,8 @@ class Transport: # Cull the packet hashlist if it has reached max size - while (len(Transport.packet_hashlist) > Transport.hashlist_maxsize): - Transport.packet_hashlist.pop(0) + if len(Transport.packet_hashlist) > Transport.hashlist_maxsize: + Transport.packet_hashlist = Transport.packet_hashlist[len(Transport.packet_hashlist)-Transport.hashlist_maxsize:len(Transport.packet_hashlist)-1] if time.time() > Transport.tables_last_culled + Transport.tables_cull_interval: # Cull the reverse table according to timeout @@ -338,8 +338,6 @@ class Transport: new_raw += packet.raw[1:2] new_raw += Transport.destination_table[packet.destination_hash][1] new_raw += packet.raw[2:] - # TODO: Remove at some point - # RNS.log("Packet was inserted into transport via "+RNS.prettyhexrep(Transport.destination_table[packet.destination_hash][1])+" on: "+str(outbound_interface), RNS.LOG_EXTREME) outbound_interface.processOutgoing(new_raw) Transport.destination_table[packet.destination_hash][0] = time.time() sent = True @@ -359,8 +357,6 @@ class Transport: new_raw += packet.raw[1:2] new_raw += Transport.destination_table[packet.destination_hash][1] new_raw += packet.raw[2:] - # TODO: Remove at some point - # RNS.log("Packet was inserted into transport via "+RNS.prettyhexrep(Transport.destination_table[packet.destination_hash][1])+" on: "+str(outbound_interface), RNS.LOG_EXTREME) outbound_interface.processOutgoing(new_raw) Transport.destination_table[packet.destination_hash][0] = time.time() sent = True @@ -390,9 +386,6 @@ class Transport: should_transmit = False if should_transmit: - RNS.log("Transmitting "+str(len(packet.raw))+" bytes on: "+str(interface), RNS.LOG_EXTREME) - RNS.log("Hash is "+RNS.prettyhexrep(packet.packet_hash), RNS.LOG_EXTREME) - if not stored_hash: Transport.packet_hashlist.append(packet.packet_hash) @@ -452,8 +445,7 @@ class Transport: @staticmethod def inbound(raw, interface=None): while (Transport.jobs_running): - # TODO: Decrease this for performance - sleep(0.1) + sleep(0.01) Transport.jobs_locked = True @@ -462,8 +454,6 @@ class Transport: packet.receiving_interface = interface packet.hops += 1 - RNS.log(str(interface)+" received packet with hash "+RNS.prettyhexrep(packet.packet_hash), RNS.LOG_EXTREME) - if len(Transport.local_client_interfaces) > 0: if Transport.is_local_client_interface(interface): @@ -528,11 +518,13 @@ class Transport: # accordingly if we are. if packet.transport_id != None and packet.packet_type != RNS.Packet.ANNOUNCE: if packet.transport_id == Transport.identity.hash: - RNS.log("Received packet in transport for "+RNS.prettyhexrep(packet.destination_hash)+" with matching transport ID, transporting it...", RNS.LOG_DEBUG) + # TODO: Remove at some point + # RNS.log("Received packet in transport for "+RNS.prettyhexrep(packet.destination_hash)+" with matching transport ID, transporting it...", RNS.LOG_DEBUG) if packet.destination_hash in Transport.destination_table: next_hop = Transport.destination_table[packet.destination_hash][1] remaining_hops = Transport.destination_table[packet.destination_hash][2] - RNS.log("Next hop to destination is "+RNS.prettyhexrep(next_hop)+" with "+str(remaining_hops)+" hops remaining, transporting it.", RNS.LOG_DEBUG) + # TODO: Remove at some point + # RNS.log("Next hop to destination is "+RNS.prettyhexrep(next_hop)+" with "+str(remaining_hops)+" hops remaining, transporting it.", RNS.LOG_DEBUG) if remaining_hops > 1: # Just increase hop count and transmit new_raw = packet.raw[0:1]