Merge pull request #871 from viric/traceroute-0hop

ianmcorvidae · web-flow · commit 1d3bdf143aab · 2026-03-02T10:05:33.000-07:00
Fix traceroute timeout for case of 0-hops
diff --git a/meshtastic/mesh_interface.py b/meshtastic/mesh_interface.py
@@ -673,7 +673,8 @@ def sendTraceRoute(
             hopLimit=hopLimit,
         )
         # extend timeout based on number of nodes, limit by configured hopLimit
-        waitFactor = min(len(self.nodes) - 1 if self.nodes else 0, hopLimit)
+        nodes_based_factor = (len(self.nodes) - 1) if self.nodes else (hopLimit + 1)
+        waitFactor = max(1, min(nodes_based_factor, hopLimit + 1))
         self.waitForTraceRoute(waitFactor)
 
     def onResponseTraceRoute(self, p: dict):

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,8 @@ def sendTraceRoute(`
`673`	`673`	`hopLimit=hopLimit,`
`674`	`674`	`)`
`675`	`675`	`# extend timeout based on number of nodes, limit by configured hopLimit`
`676`		`- waitFactor = min(len(self.nodes) - 1 if self.nodes else 0, hopLimit)`
	`676`	`+ nodes_based_factor = (len(self.nodes) - 1) if self.nodes else (hopLimit + 1)`
	`677`	`+ waitFactor = max(1, min(nodes_based_factor, hopLimit + 1))`
`677`	`678`	`self.waitForTraceRoute(waitFactor)`
`678`	`679`
`679`	`680`	`def onResponseTraceRoute(self, p: dict):`