Use the correct next pointer.

[tinc] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index b5af224..be6080e 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -101,7 +101,13 @@ void mst_kruskal(void)
 
        /* Starting point */
 
 
        /* Starting point */
 

-       ((edge_t *) edge_weight_tree->head->data)->from->status.visited = true;
+       for(node = edge_weight_tree->head; node; node = node->next) {
+               e = node->data;
+               if(e->from->status.reachable) {
+                       e->from->status.visited = true;
+                       break;
+               }
+       }

 
        /* Add safe edges */
 
 
        /* Add safe edges */
 


@@ -307,8 +313,8 @@ void sssp_bfs(void)
 
 void graph(void)
 {
 
 void graph(void)
 {

-       mst_kruskal();

        sssp_bfs();
        sssp_bfs();

+       mst_kruskal();

        graph_changed = true;
 }
 
        graph_changed = true;
 }
 


@@ -364,9 +370,10 @@ void dump_graph(void)
 
        fprintf(file, "}\n");   
        
 
        fprintf(file, "}\n");   
        

-       fclose(file);
-
-       if(filename[0] != '|') {
+       if(filename[0] == '|') {
+               pclose(file);
+       } else {
+               fclose(file);

                rename(tmpname, filename);
                free(tmpname);
        }
                rename(tmpname, filename);
                free(tmpname);
        }