Merge 221493d816 into 0049c98684

RNS/Interfaces/Android/RNodeInterface.py

@@ -428,7 +428,7 @@ class RNodeInterface(Interface):
             RNS.log("Invalid frequency configured for "+str(self), RNS.LOG_ERROR)
             self.validcfg = False
 
-        if (self.txpower < 0 or self.txpower > 17):
+        if (self.txpower < 0 or self.txpower > 22):
             RNS.log("Invalid TX power configured for "+str(self), RNS.LOG_ERROR)
             self.validcfg = False
 

RNS/Transport.py

@@ -482,12 +482,26 @@ class Transport:
                                 # If the link destination was previously only 1 hop
                                 # away, this likely means that it was local to one
                                 # of our interfaces, and that it roamed somewhere else.
-                                # In that case, try to discover a new path.
+                                # In that case, try to discover a new path, and mark
+                                # the old one as unresponsive.
                                 elif not path_request_throttle and Transport.hops_to(link_entry[6]) == 1:
                                     RNS.log("Trying to rediscover path for "+RNS.prettyhexrep(link_entry[6])+" since an attempted link was never established, and destination was previously local to an interface on this instance", RNS.LOG_DEBUG)
                                     path_request_conditions = True
                                     blocked_if = link_entry[4]
 
+                                    # TODO: This might result in the path re-resolution
+                                    # only being able to happen once, since new path found
+                                    # after allowing update from higher hop-count path, after
+                                    # marking old path unresponsive, might be more than 1 hop away,
+                                    # thus dealocking us into waiting for a new announce all-together.
+                                    # Is this problematic, or does it actually not matter?
+                                    # Best would be to have full support for alternative paths,
+                                    # and score them according to number of unsuccessful tries or
+                                    # similar.
+                                    if RNS.Reticulum.transport_enabled():
+                                        if hasattr(link_entry[4], "mode") and link_entry[4].mode != RNS.Interfaces.Interface.Interface.MODE_BOUNDARY:
+                                            Transport.mark_path_unresponsive(link_entry[6])
+
                                 # If the link initiator is only 1 hop away,
                                 # this likely means that network topology has
                                 # changed. In that case, we try to discover a new path,