Compare commits

..

No commits in common. "2439761529166b9142cffa85de28fc6e2bca26d1" and "bf40f74a4ac8757b3c54f88e8a8b946df8e4660e" have entirely different histories.

3 changed files with 40 additions and 50 deletions

View File

@ -476,8 +476,7 @@ class Resource:
if sleep_time < 0: if sleep_time < 0:
if self.retries_left > 0: if self.retries_left > 0:
ms = "" if self.outstanding_parts == 1 else "s" RNS.log("Timed out waiting for parts, requesting retry", RNS.LOG_DEBUG)
RNS.log("Timed out waiting for "+str(self.outstanding_parts)+" part"+ms+", requesting retry", RNS.LOG_DEBUG)
if self.window > self.window_min: if self.window > self.window_min:
self.window -= 1 self.window -= 1
if self.window_max > self.window_min: if self.window_max > self.window_min:

View File

@ -2047,10 +2047,6 @@ class Transport:
next_hop = Transport.destination_table[destination_hash][1] next_hop = Transport.destination_table[destination_hash][1]
received_from = Transport.destination_table[destination_hash][5] received_from = Transport.destination_table[destination_hash][5]
if attached_interface.mode == RNS.Interfaces.Interface.Interface.MODE_ROAMING and attached_interface == received_from:
RNS.log("Not answering path request on roaming-mode interface, since next hop is on same roaming-mode interface", RNS.LOG_DEBUG)
else:
if requestor_transport_id != None and next_hop == requestor_transport_id: if requestor_transport_id != None and next_hop == requestor_transport_id:
# TODO: Find a bandwidth efficient way to invalidate our # TODO: Find a bandwidth efficient way to invalidate our
# known path on this signal. The obvious way of signing # known path on this signal. The obvious way of signing

View File

@ -187,12 +187,7 @@ def program_setup(configdir, table, rates, drop, destination_hexhash, verbosity,
if RNS.Transport.has_path(destination_hash): if RNS.Transport.has_path(destination_hash):
hops = RNS.Transport.hops_to(destination_hash) hops = RNS.Transport.hops_to(destination_hash)
next_hop_bytes = reticulum.get_next_hop(destination_hash) next_hop = RNS.prettyhexrep(reticulum.get_next_hop(destination_hash))
if next_hop_bytes == None:
print("\r \rError: Invalid path data returned")
sys.exit(1)
else:
next_hop = RNS.prettyhexrep(next_hop_bytes)
next_hop_interface = reticulum.get_next_hop_if_name(destination_hash) next_hop_interface = reticulum.get_next_hop_if_name(destination_hash)
if hops != 1: if hops != 1: