Nexthop calculation should always use the shortest path.

[tinc] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index a15e5c7..9592f98 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -45,7 +45,7 @@
 #include "system.h"
 
 #include "avl_tree.h"
-#include "config.h"
+#include "conf.h"
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
@@ -212,9 +212,13 @@ static void sssp_bfs(void) {
                           && (!e->to->status.indirect || indirect))
                                continue;
 
+                       // Only update nexthop the first time we visit this node.
+
+                       if(!e->to->status.visited)
+                               e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+
                        e->to->status.visited = true;
                        e->to->status.indirect = indirect;
-                       e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
                        e->to->prevedge = e;
                        e->to->via = indirect ? n->via : e->to;
                        e->to->options = e->options;