Merge acd893a6e6 into dae40f2684

RNS/Link.py

@@ -168,19 +168,16 @@ class Link:
         self.type = RNS.Destination.LINK
         self.owner = owner
         self.destination = destination
-        self.expected_hops = None
         self.attached_interface = None
         self.__remote_identity = None
         self.__track_phy_stats = False
         self._channel = None
-
         if self.destination == None:
             self.initiator = False
             self.prv     = X25519PrivateKey.generate()
             self.sig_prv = self.owner.identity.sig_prv
         else:
             self.initiator = True
-            self.expected_hops = RNS.Transport.hops_to(self.destination.hash)
             self.establishment_timeout  = RNS.Reticulum.get_instance().get_first_hop_timeout(destination.hash)
             self.establishment_timeout += Link.ESTABLISHMENT_TIMEOUT_PER_HOP * max(1, RNS.Transport.hops_to(destination.hash))
             self.prv     = X25519PrivateKey.generate()

RNS/Transport.py

@@ -64,8 +64,8 @@ class Transport:
     LOCAL_REBROADCASTS_MAX = 2          # How many local rebroadcasts of an announce is allowed
 
     PATH_REQUEST_TIMEOUT = 15           # Default timuout for client path requests in seconds
-    PATH_REQUEST_GRACE   = 0.4          # Grace time before a path announcement is made, allows directly reachable peers to respond first
+    PATH_REQUEST_GRACE   = 0.35         # Grace time before a path announcement is made, allows directly reachable peers to respond first
-    PATH_REQUEST_RG      = 0.6          # Extra grace time for roaming-mode interfaces to allow more suitable peers to respond first
+    PATH_REQUEST_RW      = 2            # Path request random window
     PATH_REQUEST_MI      = 20           # Minimum interval in seconds for automated path requests
 
     STATE_UNKNOWN        = 0x00
@@ -746,8 +746,7 @@ class Transport:
                 packet.receipt = RNS.PacketReceipt(packet)
                 Transport.receipts.append(packet.receipt)
             
-            # TODO: Enable when caching has been redesigned
+            Transport.cache(packet)
-            # Transport.cache(packet)
 
         # Check if we have a known path for the destination in the path table
         if packet.packet_type != RNS.Packet.ANNOUNCE and packet.destination.type != RNS.Destination.PLAIN and packet.destination.type != RNS.Destination.GROUP and packet.destination_hash in Transport.destination_table:
@@ -973,13 +972,6 @@ class Transport:
         # TODO: Think long and hard about this.
         # Is it even strictly necessary with the current
         # transport rules?
-
-        # Filter packets intended for other transport instances
-        if packet.transport_id != None and packet.packet_type != RNS.Packet.ANNOUNCE:
-            if packet.transport_id != Transport.identity.hash:
-                RNS.log("Ignored packet "+RNS.prettyhexrep(packet.packet_hash)+" in transport for other transport instance", RNS.LOG_EXTREME)
-                return False
-
         if packet.context == RNS.Packet.KEEPALIVE:
             return True
         if packet.context == RNS.Packet.RESOURCE_REQ:
@@ -1144,31 +1136,10 @@ class Transport:
         elif Transport.interface_to_shared_instance(interface):
             packet.hops -= 1
 
+
         if Transport.packet_filter(packet):
-            # By default, remember packet hashes to avoid routing
+            Transport.packet_hashlist.append(packet.packet_hash)
-            # loops in the network, using the packet filter.
+            Transport.cache(packet)
-            remember_packet_hash = True
-
-            # If this packet belongs to a link in our link table,
-            # we'll have to defer adding it to the filter list.
-            # In some cases, we might see a packet over a shared-
-            # medium interface, belonging to a link that transports
-            # or terminates with this instance, but before it would
-            # normally reach us. If the packet is appended to the
-            # filter list at this point, link transport will break.
-            if packet.destination_hash in Transport.link_table:
-                remember_packet_hash = False
-
-            # If this is a link request proof, don't add it until
-            # we are sure it's not actually somewhere else in the
-            # routing chain.
-            if packet.packet_type == RNS.Packet.PROOF and packet.context == RNS.Packet.LRPROOF:
-                remember_packet_hash = False
-
-            if remember_packet_hash:
-                Transport.packet_hashlist.append(packet.packet_hash)
-                # TODO: Enable when caching has been redesigned
-                # Transport.cache(packet)
             
             # Check special conditions for local clients connected
             # through a shared Reticulum instance
@@ -1289,7 +1260,7 @@ class Transport:
                         link_entry = Transport.link_table[packet.destination_hash]
                         # If receiving and outbound interface is
                         # the same for this link, direction doesn't
-                        # matter, and we simply repeat the packet.
+                        # matter, and we simply send the packet on.
                         outbound_interface = None
                         if link_entry[2] == link_entry[4]:
                             # But check that taken hops matches one
@@ -1310,11 +1281,6 @@ class Transport:
                                     outbound_interface = link_entry[2]
 
                         if outbound_interface != None:
-                            # Add this packet to the filter hashlist if we
-                            # have determined that it's actually our turn
-                            # to process it.
-                            Transport.packet_hashlist.append(packet.packet_hash)
-
                             new_raw = packet.raw[0:1]
                             new_raw += struct.pack("!B", packet.hops)
                             new_raw += packet.raw[2:]
@@ -1746,24 +1712,7 @@ class Transport:
                         # pending link
                         for link in Transport.pending_links:
                             if link.link_id == packet.destination_hash:
-                                # We need to also allow an expected hops value of
+                                link.validate_proof(packet)
-                                # PATHFINDER_M, since in some cases, the number of hops
-                                # to the destination will be unknown at link creation
-                                # time. The real chance of this occuring is likely to be
-                                # extremely small, and this allowance could probably
-                                # be discarded without major issues, but it is kept
-                                # for now to ensure backwards compatibility.
-
-                                # TODO: Probably reset check back to
-                                # if packet.hops == link.expected_hops:
-                                # within one of the next releases
-
-                                if packet.hops == link.expected_hops or link.expected_hops == RNS.Transport.PATHFINDER_M:
-                                    # Add this packet to the filter hashlist if we
-                                    # have determined that it's actually destined
-                                    # for this system, and then validate the proof
-                                    Transport.packet_hashlist.append(packet.packet_hash)
-                                    link.validate_proof(packet)
 
                 elif packet.context == RNS.Packet.RESOURCE_PRF:
                     for link in Transport.active_links:
@@ -1780,7 +1729,7 @@ class Transport:
                     else:
                         proof_hash = None
 
-                    # Check if this proof needs to be transported
+                    # Check if this proof neds to be transported
                     if (RNS.Reticulum.transport_enabled() or from_local_client or proof_for_local_client) and packet.destination_hash in Transport.reverse_table:
                         reverse_entry = Transport.reverse_table.pop(packet.destination_hash)
                         if packet.receiving_interface == reverse_entry[1]:
@@ -2175,7 +2124,6 @@ class Transport:
         else:
             return False
 
-    @staticmethod
     def path_is_unresponsive(destination_hash):
         if destination_hash in Transport.path_states:
             if Transport.path_states[destination_hash] == Transport.STATE_UNRESPONSIVE:
@@ -2340,18 +2288,8 @@ class Transport:
                     if is_from_local_client:
                         retransmit_timeout = now
                     else:
-                        if Transport.is_local_client_interface(Transport.next_hop_interface(destination_hash)):
+                        # TODO: Look at this timing
-                            RNS.log("Path request destination "+RNS.prettyhexrep(destination_hash)+" is on a local client interface, rebroadcasting immediately", RNS.LOG_EXTREME)
+                        retransmit_timeout = now + Transport.PATH_REQUEST_GRACE # + (RNS.rand() * Transport.PATHFINDER_RW)
-                            retransmit_timeout = now
-
-                        else:
-                            retransmit_timeout = now + Transport.PATH_REQUEST_GRACE
-
-                            # If we are answering on a roaming-mode interface, wait a
-                            # little longer, to allow potential more well-connected
-                            # peers to answer first.
-                            if attached_interface.mode == RNS.Interfaces.Interface.Interface.MODE_ROAMING:
-                                retransmit_timeout += Transport.PATH_REQUEST_RG
 
                     # This handles an edge case where a peer sends a past
                     # request for a destination just after an announce for

RNS/Utilities/rnodeconf.py

@@ -56,8 +56,6 @@ fw_filename = None
 fw_url = None
 mapped_model = None
 
-# TODO: Create and use constants for megas, kilos, etc (Avoid using magic numbers)
-
 class KISS():
     FEND            = 0xC0
     FESC            = 0xDB
@@ -282,7 +280,7 @@ try:
         os.makedirs(ROM_DIR)
 
 except Exception as e:
-    print("".join(["No access to directory ", str(CNF_DIR), ". This utility needs file system access to store firmware and data files. Cannot continue."]))
+    print("No access to directory "+str(CNF_DIR)+". This utility needs file system access to store firmware and data files. Cannot continue.")
     print("The contained exception was:")
     print(str(e))
     exit(99)
@@ -413,7 +411,7 @@ class RNode():
                                 command_buffer = command_buffer+bytes([byte])
                                 if (len(command_buffer) == 4):
                                     self.r_frequency = command_buffer[0] << 24 | command_buffer[1] << 16 | command_buffer[2] << 8 | command_buffer[3]
-                                    RNS.log("".join(["Radio reporting frequency is ", str(self.r_frequency/1000000.0), " MHz"]))
+                                    RNS.log("Radio reporting frequency is "+str(self.r_frequency/1000000.0)+" MHz")
                                     self.updateBitrate()
 
                         elif (command == KISS.CMD_BANDWIDTH):
@@ -429,7 +427,7 @@ class RNode():
                                 command_buffer = command_buffer+bytes([byte])
                                 if (len(command_buffer) == 4):
                                     self.r_bandwidth = command_buffer[0] << 24 | command_buffer[1] << 16 | command_buffer[2] << 8 | command_buffer[3]
-                                    RNS.log("".join(["Radio reporting bandwidth is ", str(self.r_bandwidth/1000.0), " KHz"]))
+                                    RNS.log("Radio reporting bandwidth is "+str(self.r_bandwidth/1000.0)+" KHz")
                                     self.updateBitrate()
 
                         elif (command == KISS.CMD_BT_PIN):
@@ -503,7 +501,7 @@ class RNode():
 
                         elif (command == KISS.CMD_TXPOWER):
                             self.r_txpower = byte
-                            RNS.log("".join(["Radio reporting TX power is ", str(self.r_txpower), " dBm"]))
+                            RNS.log("Radio reporting TX power is "+str(self.r_txpower)+" dBm")
                         elif (command == KISS.CMD_SF):
                             self.r_sf = byte
                             RNS.log("Radio reporting spreading factor is "+str(self.r_sf))
@@ -551,11 +549,11 @@ class RNode():
                             self.r_random = byte
                         elif (command == KISS.CMD_ERROR):
                             if (byte == KISS.ERROR_INITRADIO):
-                                RNS.log("".join([str(self), " hardware initialisation error (code ", RNS.hexrep(byte), ")"]))
+                                RNS.log(str(self)+" hardware initialisation error (code "+RNS.hexrep(byte)+")")
                             elif (byte == KISS.ERROR_TXFAILED):
-                                RNS.log("".join([str(self), " hardware TX error (code ", RNS.hexrep(byte), ")"]))
+                                RNS.log(str(self)+" hardware TX error (code "+RNS.hexrep(byte)+")")
                             else:
-                                RNS.log("".join([str(self), " hardware error (code ", RNS.hexrep(byte), ")"]))
+                                RNS.log(str(self)+" hardware error (code "+RNS.hexrep(byte)+")")
                         elif (command == KISS.CMD_DETECT):
                             if byte == KISS.DETECT_RESP:
                                 self.detected = True
@@ -932,7 +930,7 @@ class RNode():
                             print("     ")
                             print("     To initialise this device to a verifiable state, please run:")
                             print("     ")
-                            print("".join(["              rnodeconf ", str(self.serial.name), " --autoinstall"]))
+                            print("              rnodeconf "+str(self.serial.name)+" --autoinstall")
                             print("")
 
 
@@ -967,7 +965,7 @@ class RNode():
 
 selected_version = None
 selected_hash = None
-firmware_version_url = "".join(["https://unsigned.io/firmware/latest/?v=", program_version, "&variant="])
+firmware_version_url = "https://unsigned.io/firmware/latest/?v="+program_version+"&variant="
 fallback_firmware_version_url = "https://github.com/markqvist/rnode_firmware/releases/latest/download/release.json"
 def ensure_firmware_file(fw_filename):
     global selected_version, selected_hash, upd_nocheck
@@ -983,7 +981,7 @@ def ensure_firmware_file(fw_filename):
             ]
             parts_missing = False
             for rf in required_files:
-                if not os.path.isfile("".join([EXT_DIR, "/", rf])):
+                if not os.path.isfile(EXT_DIR+"/"+rf):
                     parts_missing = True
 
             if parts_missing:
@@ -996,7 +994,7 @@ def ensure_firmware_file(fw_filename):
             release_info = vf.read().decode("utf-8").strip()
             selected_version = release_info.split()[0]
             selected_hash = release_info.split()[1]
-            RNS.log("".join(["Using existing firmware file: ", fw_filename, " for version ", selected_version]))
+            RNS.log("Using existing firmware file: "+fw_filename+" for version "+selected_version)
         else:
             RNS.log("No extracted firmware is available, cannot continue.")
             RNS.log("Extract a firmware from an existing RNode first, using the --extract-firmware option.")
@@ -1008,19 +1006,17 @@ def ensure_firmware_file(fw_filename):
                 try:
                     # if custom firmware url, download latest release
                     if selected_version == None and fw_url == None:
-                        version_url = firmware_version_url + fw_filename
+                        version_url = firmware_version_url+fw_filename
                         RNS.log("Retrieving latest version info from "+version_url)
-                        urlretrieve(version_url, "".join([UPD_DIR, "/", fw_filename, ".version.latest"]))
+                        urlretrieve(firmware_version_url+fw_filename, UPD_DIR+"/"+fw_filename+".version.latest")
                     else:
                         if fw_url != None:
                             if selected_version == None:
                                 version_url = fw_url+"latest/download/release.json"
                             else:
-                                version_url = "".join([fw_url, "download/", selected_version, "/release.json"])
+                                version_url = fw_url+"download/"+selected_version+"/release.json"
                         else:
-                            if selected_version is None:
+                                version_url = firmware_update_url+selected_version+"/release.json"
-                                selected_version = ""
-                            version_url = "".join([firmware_update_url, selected_version, "/release.json"])
                         try:
                             RNS.log("Retrieving specified version info from "+version_url)
                             urlretrieve(version_url, UPD_DIR+"/version_release_info.json")
@@ -1028,9 +1024,8 @@ def ensure_firmware_file(fw_filename):
                             with open(UPD_DIR+"/version_release_info.json", "rb") as rif:
                                 rdat = json.loads(rif.read())
                                 variant = rdat[fw_filename]
-                                with open("".join([UPD_DIR, "/", fw_filename, ".version.latest"]), "wb") as verf:
+                                with open(UPD_DIR+"/"+fw_filename+".version.latest", "wb") as verf:
                                     inf_str = str(variant["version"])+" "+str(variant["hash"])
-                                    inf_str = "".join([str(variant["version"]), " ", str(variant["hash"])])
                                     verf.write(inf_str.encode("utf-8"))
                         except Exception as e:
                             RNS.log("Failed to retrive version information for your board.")
@@ -1060,7 +1055,7 @@ def ensure_firmware_file(fw_filename):
                         with open(UPD_DIR+"/fallback_release_info.json", "rb") as rif:
                             rdat = json.loads(rif.read())
                             variant = rdat[fw_filename]
-                            with open("".join([UPD_DIR, "/", fw_filename, ".version.latest"]), "wb") as verf:
+                            with open(UPD_DIR+"/"+fw_filename+".version.latest", "wb") as verf:
                                 inf_str = str(variant["version"])+" "+str(variant["hash"])
                                 verf.write(inf_str.encode("utf-8"))
 
@@ -1069,7 +1064,7 @@ def ensure_firmware_file(fw_filename):
                         raise e
 
                 import shutil
-                file = open("".join([UPD_DIR, "/", fw_filename, ".version.latest"]), "rb")
+                file = open(UPD_DIR+"/"+fw_filename+".version.latest", "rb")
                 release_info = file.read().decode("utf-8").strip()
                 selected_version = release_info.split()[0]
                 if selected_version == "not":
@@ -1079,7 +1074,7 @@ def ensure_firmware_file(fw_filename):
                 selected_hash = release_info.split()[1]
                 if not os.path.isdir(UPD_DIR+"/"+selected_version):
                     os.makedirs(UPD_DIR+"/"+selected_version)
-                shutil.copy("".join([UPD_DIR, "/", fw_filename, ".version.latest"]), "".join([UPD_DIR, "/", selected_version, "/", fw_filename, ".version"]))
+                shutil.copy(UPD_DIR+"/"+fw_filename+".version.latest", UPD_DIR+"/"+selected_version+"/"+fw_filename+".version")
                 RNS.log("The selected firmware for this board is version "+selected_version)
 
             else:
@@ -1089,32 +1084,32 @@ def ensure_firmware_file(fw_filename):
 
             # if custom firmware url, use it
             if fw_url != None:
-                update_target_url = "".join([fw_url, "download/", selected_version, "/", fw_filename])
+                update_target_url = fw_url+"download/"+selected_version+"/"+fw_filename
                 RNS.log("Retrieving firmware from custom url "+update_target_url)
             else:
-                update_target_url = "".join([firmware_update_url, selected_version, "/", fw_filename])
+                update_target_url = firmware_update_url+selected_version+"/"+fw_filename
 
             try:
                 if not os.path.isdir(UPD_DIR+"/"+selected_version):
                     os.makedirs(UPD_DIR+"/"+selected_version)
 
-                if not os.path.isfile("".join([UPD_DIR, "/", selected_version, "/", fw_filename])):
+                if not os.path.isfile(UPD_DIR+"/"+selected_version+"/"+fw_filename):
-                    RNS.log("".join(["Firmware ", UPD_DIR, "/", selected_version, "/", fw_filename, " not found."]))
+                    RNS.log("Firmware "+UPD_DIR+"/"+selected_version+"/"+fw_filename+" not found.")
-                    RNS.log("".join(["Downloading missing firmware file: ", fw_filename, " for version ", selected_version]))
+                    RNS.log("Downloading missing firmware file: "+fw_filename+" for version "+selected_version)
-                    urlretrieve(update_target_url, "".join([UPD_DIR, "/", selected_version, "/", fw_filename]))
+                    urlretrieve(update_target_url, UPD_DIR+"/"+selected_version+"/"+fw_filename)
                     RNS.log("Firmware file downloaded")
                 else:
-                    RNS.log("".join(["Using existing firmware file: ", fw_filename, " for version ", selected_version]))
+                    RNS.log("Using existing firmware file: "+fw_filename+" for version "+selected_version)
 
                 try:
                     if selected_hash == None:
                         try:
-                            file = open("".join([UPD_DIR, "/", selected_version, "/", fw_filename, ".version"]), "rb")
+                            file = open(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version", "rb")
                             release_info = file.read().decode("utf-8").strip()
                             selected_hash = release_info.split()[1]
                         except Exception as e:
                             RNS.log("Could not read locally cached release information.")
-                            RNS.log("".join(["Ensure ", UPD_DIR, "/", selected_version, "/", fw_filename, ".version exists and has the correct format and hash."]))
+                            RNS.log("Ensure "+UPD_DIR+"/"+selected_version+"/"+fw_filename+".version exists and has the correct format and hash.")
                             RNS.log("You can clear the cache with the --clear-cache option and try again.")
 
                         if selected_hash == None:
@@ -1122,8 +1117,7 @@ def ensure_firmware_file(fw_filename):
                             exit(97)
 
                     RNS.log("Verifying firmware integrity...")
-                    fw_file = open("".join([UPD_DIR, "/", selected_version, "/", fw_filename]), "rb")
+                    fw_file = open(UPD_DIR+"/"+selected_version+"/"+fw_filename, "rb")
-                    # TODO: Remove unused variable
                     expected_hash = bytes.fromhex(selected_hash)
                     file_hash = hashlib.sha256(fw_file.read()).hexdigest()
                     if file_hash == selected_hash:
@@ -1302,7 +1296,7 @@ def main():
                     public_key = load_der_public_key(public_bytes, backend=default_backend())
                     key_hash = hashlib.sha256(public_bytes).hexdigest()
                     RNS.log("Trusting key: "+str(key_hash))
-                    f = open("".join([TK_DIR, "/", str(key_hash), ".pubkey"]), "wb")
+                    f = open(TK_DIR+"/"+str(key_hash)+".pubkey", "wb")
                     f.write(public_bytes)
                     f.close()
 
@@ -1339,7 +1333,7 @@ def main():
                 pi = 1
                 print("Detected serial ports:")
                 for port in portlist:
-                    print("".join(["  [", str(pi), "] ", str(port.device), " (", str(port.product), ", ", str(port.serial_number), ")"]))
+                    print("  ["+str(pi)+"] "+str(port.device)+" ("+str(port.product)+", "+str(port.serial_number)+")")
                     pi += 1
 
                 print("\nEnter the number of the serial port your device is connected to:\n? ", end="")
@@ -1361,7 +1355,7 @@ def main():
                 port_product = selected_port.product
                 port_serialno = selected_port.serial_number
 
-                print("".join(["\nOk, using device on ", str(port_path), " (", str(port_product), ", ", str(port_serialno), ")"]))
+                print("\nOk, using device on "+str(port_path)+" ("+str(port_product)+", "+str(port_serialno)+")")
 
             else:
                 ports = list_ports.comports()
@@ -1429,11 +1423,11 @@ def main():
                     hash_f.close()
 
                     extraction_parts = [
-                        ("bootloader",        "".join(["python \"", CNF_DIR, "/recovery_esptool.py\" --chip esp32 --port ", port_path, " --baud ", args.baud_flash, " --before default_reset --after hard_reset read_flash 0x1000 0x4650 \"", EXT_DIR, "/extracted_rnode_firmware.bootloader\""])),
+                        ("bootloader", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x1000 0x4650 \""+EXT_DIR+"/extracted_rnode_firmware.bootloader\""),
-                        ("partition table",   "".join(["python \"", CNF_DIR, "/recovery_esptool.py\" --chip esp32 --port ", port_path, " --baud ", args.baud_flash, " --before default_reset --after hard_reset read_flash 0x8000 0xC00 \"", EXT_DIR, "/extracted_rnode_firmware.partitions\""])),
+                        ("partition table", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x8000 0xC00 \""+EXT_DIR+"/extracted_rnode_firmware.partitions\""),
-                        ("app boot",          "".join(["python \"", CNF_DIR, "/recovery_esptool.py\" --chip esp32 --port ", port_path, " --baud ", args.baud_flash, " --before default_reset --after hard_reset read_flash 0xe000 0x2000 \"", EXT_DIR, "/extracted_rnode_firmware.boot_app0\""])),
+                        ("app boot", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0xe000 0x2000 \""+EXT_DIR+"/extracted_rnode_firmware.boot_app0\""),
-                        ("application image", "".join(["python \"", CNF_DIR, "/recovery_esptool.py\" --chip esp32 --port ", port_path, " --baud ", args.baud_flash, " --before default_reset --after hard_reset read_flash 0x10000 0x200000 \"", EXT_DIR, "/extracted_rnode_firmware.bin\""])),
+                        ("application image", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x10000 0x200000 \""+EXT_DIR+"/extracted_rnode_firmware.bin\""),
-                        ("console image",     "".join(["python \"", CNF_DIR, "/recovery_esptool.py\" --chip esp32 --port ", port_path, " --baud ", args.baud_flash, " --before default_reset --after hard_reset read_flash 0x210000 0x1F0000 \"", EXT_DIR, "/extracted_console_image.bin\""])),
+                        ("console image", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x210000 0x1F0000 \""+EXT_DIR+"/extracted_console_image.bin\""),
                     ]
                     import subprocess, shlex
                     for part, command in extraction_parts:
@@ -1471,7 +1465,7 @@ def main():
                 pi = 1
                 print("Detected serial ports:")
                 for port in portlist:
-                    print("".join(["  [", str(pi), "] ", str(port.device), " (", str(port.product), ", ", str(port.serial_number), ")"]))
+                    print("  ["+str(pi)+"] "+str(port.device)+" ("+str(port.product)+", "+str(port.serial_number)+")")
                     pi += 1
 
                 print("\nEnter the number of the serial port your device is connected to:\n? ", end="")
@@ -1494,7 +1488,7 @@ def main():
                 port_serialno = selected_port.serial_number
 
                 clear()
-                print("".join(["\nOk, using device on ", str(port_path), " (", str(port_product), ", ", str(port_serialno), ")"]))
+                print("\nOk, using device on "+str(port_path)+" ("+str(port_product)+", "+str(port_serialno)+")")
 
             else:
                 ports = list_ports.comports()
@@ -2183,7 +2177,7 @@ def main():
             if platform == "unzip":
                 flasher = "unzip"
                 if which(flasher) is not None:
-                    return [flasher, "-o", "".join([UPD_DIR, "/", selected_version, "/", fw_filename]), "-d", UPD_DIR+"/"+selected_version]
+                    return [flasher, "-o", UPD_DIR+"/"+selected_version+"/"+fw_filename, "-d", UPD_DIR+"/"+selected_version]
                 else:
                     RNS.log("")
                     RNS.log("You do not currently have the \""+flasher+"\" program installed on your system.")
@@ -2200,9 +2194,9 @@ def main():
                     # avrdude -C/home/markqvist/.arduino15/packages/arduino/tools/avrdude/6.3.0-arduino17/etc/avrdude.conf -q -q -V -patmega2560 -cwiring -P/dev/ttyACM0 -b115200 -D -Uflash:w:/tmp/arduino-sketch-0E260F46C421A84A7CBAD48E859C8E64/RNode_Firmware.ino.hex:i
                     # avrdude -q -q -V -patmega2560 -cwiring -P/dev/ttyACM0 -b115200 -D -Uflash:w:/tmp/arduino-sketch-0E260F46C421A84A7CBAD48E859C8E64/RNode_Firmware.ino.hex:i
                     if fw_filename == "rnode_firmware.hex":
-                        return [flasher, "-P", args.port, "-p", "m1284p", "-c", "arduino", "-b", "115200", "-U", "".join(["flash:w:", UPD_DIR, "/", selected_version, "/", fw_filename, ":i"])]
+                        return [flasher, "-P", args.port, "-p", "m1284p", "-c", "arduino", "-b", "115200", "-U", "flash:w:"+UPD_DIR+"/"+selected_version+"/"+fw_filename+":i"]
                     elif fw_filename == "rnode_firmware_m2560.hex":
-                        return [flasher, "-P", args.port, "-p", "atmega2560", "-c", "wiring", "-D", "-b", "115200", "-U", "".join(["flash:w:", UPD_DIR, "/", selected_version, "/", fw_filename])]
+                        return [flasher, "-P", args.port, "-p", "atmega2560", "-c", "wiring", "-D", "-b", "115200", "-U", "flash:w:"+UPD_DIR+"/"+selected_version+"/"+fw_filename]
                 else:
                     RNS.log("")
                     RNS.log("You do not currently have the \""+flasher+"\" program installed on your system.")
@@ -2230,7 +2224,6 @@ def main():
                     os.chmod(flasher, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP)
 
                 if which(flasher) is not None:
-                    # TODO: Simplify this returns with a list and add or remove arguments
                     if fw_filename == "rnode_firmware_tbeam.zip":
                         if numeric_version >= 1.55:
                             return [
@@ -2244,11 +2237,11 @@ def main():
                                 "--flash_mode", "dio",
                                 "--flash_freq", "80m",
                                 "--flash_size", "4MB",
-                                "0xe000",  "".join([UPD_DIR, "/", selected_version, "/rnode_firmware_tbeam.boot_app0"]),
+                                "0xe000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.boot_app0",
-                                "0x1000",  "".join([UPD_DIR, "/", selected_version, "/rnode_firmware_tbeam.bootloader"]),
+                                "0x1000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.bootloader",
-                                "0x10000", "".join([UPD_DIR, "/", selected_version, "/rnode_firmware_tbeam.bin"]),
+                                "0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.bin",
-                                "0x210000","".join([UPD_DIR, "/", selected_version, "/console_image.bin"]),
+                                "0x210000",UPD_DIR+"/"+selected_version+"/console_image.bin",
-                                "0x8000",  "".join([UPD_DIR, "/", selected_version, "/rnode_firmware_tbeam.partitions"]),
+                                "0x8000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.partitions",
                             ]
                         else:
                             return [
@@ -2712,7 +2705,7 @@ def main():
                         exit(1)
                 
                 else:
-                    fw_src = "".join([UPD_DIR, "/", selected_version, "/"])
+                    fw_src = UPD_DIR+"/"+selected_version+"/"
                     if os.path.isfile(fw_src+fw_filename):
                         try:
                             if fw_filename.endswith(".zip"):
@@ -3024,13 +3017,13 @@ def main():
 
                     RNS.log("")
                     RNS.log("Device info:")
-                    RNS.log("".join(["\tProduct            : ", products[rnode.product], " ", models[rnode.model][3], " (", bytes([rnode.product]).hex(), ":", bytes([rnode.model]).hex(), board_string, ")"]))
+                    RNS.log("\tProduct            : "+products[rnode.product]+" "+models[rnode.model][3]+" ("+bytes([rnode.product]).hex()+":"+bytes([rnode.model]).hex()+board_string+")")
                     RNS.log("\tDevice signature   : "+sigstring)
                     RNS.log("\tFirmware version   : "+rnode.version)
                     RNS.log("\tHardware revision  : "+str(int(rnode.hw_rev)))
                     RNS.log("\tSerial number      : "+RNS.hexrep(rnode.serialno))
                     RNS.log("\tModem chip         : "+str(models[rnode.model][5]))
-                    RNS.log("".join(["\tFrequency range    : ", str(rnode.min_freq/1e6), " MHz - ", str(rnode.max_freq/1e6), " MHz"]))
+                    RNS.log("\tFrequency range    : "+str(rnode.min_freq/1e6)+" MHz - "+str(rnode.max_freq/1e6)+" MHz")
                     RNS.log("\tMax TX power       : "+str(rnode.max_output)+" dBm")
                     RNS.log("\tManufactured       : "+timestring)
 
@@ -3047,7 +3040,7 @@ def main():
                         RNS.log("\tDevice mode        : TNC")
                         RNS.log("\t  Frequency        : "+str((rnode.conf_frequency/1000000.0))+" MHz")
                         RNS.log("\t  Bandwidth        : "+str(rnode.conf_bandwidth/1000.0)+" KHz")
-                        RNS.log("".join(["\t  TX power         : ", str(rnode.conf_txpower), " dBm (", str(txp_mw), " mW)"]))
+                        RNS.log("\t  TX power         : "+str(rnode.conf_txpower)+" dBm ("+str(txp_mw)+" mW)")
                         RNS.log("\t  Spreading factor : "+str(rnode.conf_sf))
                         RNS.log("\t  Coding rate      : "+str(rnode.conf_cr))
                         RNS.log("\t  On-air bitrate   : "+str(rnode.bitrate_kbps)+" kbps")
@@ -3248,7 +3241,7 @@ def main():
                                     vf.close()
                                 else:
                                     partition_filename = fw_filename.replace(".zip", ".bin")
-                                    partition_hash = get_partition_hash("".join([UPD_DIR, "/", selected_version, "/", partition_filename]))
+                                    partition_hash = get_partition_hash(UPD_DIR+"/"+selected_version+"/"+partition_filename)
 
                                 if partition_hash != None:
                                     time.sleep(0.75)

RNS/_version.py

@@ -1 +1 @@
-__version__ = "0.7.4"
+__version__ = "0.7.3"

tests/link.py

@@ -99,9 +99,6 @@ class TestLink(unittest.TestCase):
         id1 = RNS.Identity.from_bytes(bytes.fromhex(fixed_keys[0][0]))
         self.assertEqual(id1.hash, bytes.fromhex(fixed_keys[0][1]))
 
-        RNS.Transport.request_path(bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
-        time.sleep(0.2)
-
         dest = RNS.Destination(id1, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "link", "establish")
 
         self.assertEqual(dest.hash, bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
@@ -123,9 +120,6 @@ class TestLink(unittest.TestCase):
         id1 = RNS.Identity.from_bytes(bytes.fromhex(fixed_keys[0][0]))
         self.assertEqual(id1.hash, bytes.fromhex(fixed_keys[0][1]))
 
-        RNS.Transport.request_path(bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
-        time.sleep(0.2)
-
         dest = RNS.Destination(id1, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "link", "establish")
 
         self.assertEqual(dest.hash, bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
@@ -406,9 +400,6 @@ class TestLink(unittest.TestCase):
         id1 = RNS.Identity.from_bytes(bytes.fromhex(fixed_keys[0][0]))
         self.assertEqual(id1.hash, bytes.fromhex(fixed_keys[0][1]))
 
-        RNS.Transport.request_path(bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
-        time.sleep(0.2)
-
         dest = RNS.Destination(id1, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "link", "establish")
 
         self.assertEqual(dest.hash, bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
@@ -458,9 +449,6 @@ class TestLink(unittest.TestCase):
         id1 = RNS.Identity.from_bytes(bytes.fromhex(fixed_keys[0][0]))
         self.assertEqual(id1.hash, bytes.fromhex(fixed_keys[0][1]))
 
-        RNS.Transport.request_path(bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
-        time.sleep(0.2)
-
         dest = RNS.Destination(id1, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "link", "establish")
 
         self.assertEqual(dest.hash, bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
@@ -514,9 +502,6 @@ class TestLink(unittest.TestCase):
             id1 = RNS.Identity.from_bytes(bytes.fromhex(fixed_keys[0][0]))
             self.assertEqual(id1.hash, bytes.fromhex(fixed_keys[0][1]))
 
-            RNS.Transport.request_path(bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))
-            time.sleep(0.2)
-
             dest = RNS.Destination(id1, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "link", "establish")
 
             self.assertEqual(dest.hash, bytes.fromhex("fb48da0e82e6e01ba0c014513f74540d"))