Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index bb55dfd..1725241 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -65,7 +65,7 @@
    Please note that sorting on weight is already done by add_edge().
 */
 
-void mst_kruskal(void) {
+static void mst_kruskal(void) {
        splay_node_t *node, *next;
        edge_t *e;
        node_t *n;
@@ -216,7 +216,7 @@ static void sssp_dijkstra(void) {
    Running time: O(E)
 */
 
-void sssp_bfs(void) {
+static void sssp_bfs(void) {
        splay_node_t *node, *to;
        edge_t *e;
        node_t *n;
@@ -239,6 +239,7 @@ void sssp_bfs(void) {
        myself->status.visited = true;
        myself->status.indirect = false;
        myself->nexthop = myself;
+       myself->prevedge = NULL;
        myself->via = myself;
        list_insert_head(todo_list, myself);
 
@@ -279,6 +280,7 @@ void sssp_bfs(void) {
                        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;
 
@@ -367,7 +369,7 @@ static void check_reachability(void) {
 
 void graph(void) {
        subnet_cache_flush();
-       sssp_dijkstra();
+       sssp_bfs();
        check_reachability();
        mst_kruskal();
 }