X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=da6490911e36b3853f24f84cc345c4278c7c3bb0;hb=90cde91141ec61be4354d8deab21edb8fdf01022;hp=4de9181cce5f6df78c69670d7d9f784312798630;hpb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;p=tinc

diff --git a/src/graph.c b/src/graph.c
index 4de9181c..da649091 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -64,7 +64,7 @@
 static void mst_kruskal(void) {
 	/* Clear MST status on connections */
 
-	for list_each(connection_t, c, connection_list) {
+	for list_each(connection_t, c, &connection_list) {
 		c->status.mst = false;
 	}
 
@@ -72,13 +72,13 @@ static void mst_kruskal(void) {
 
 	/* Clear visited status on nodes */
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, &node_tree) {
 		n->status.visited = false;
 	}
 
 	/* Starting point */
 
-	for splay_each(edge_t, e, edge_weight_tree) {
+	for splay_each(edge_t, e, &edge_weight_tree) {
 		if(e->from->status.reachable) {
 			e->from->status.visited = true;
 			break;
@@ -89,7 +89,7 @@ static void mst_kruskal(void) {
 
 	bool skipped = false;
 
-	for splay_each(edge_t, e, edge_weight_tree) {
+	for splay_each(edge_t, e, &edge_weight_tree) {
 		if(!e->reverse || (e->from->status.visited == e->to->status.visited)) {
 			skipped = true;
 			continue;
@@ -110,7 +110,7 @@ static void mst_kruskal(void) {
 
 		if(skipped) {
 			skipped = false;
-			next = edge_weight_tree->head;
+			next = edge_weight_tree.head;
 		}
 	}
 }
@@ -124,7 +124,7 @@ static void sssp_bfs(void) {
 
 	/* Clear visited status on nodes */
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, &node_tree) {
 		n->status.visited = false;
 		n->status.indirect = true;
 		n->distance = -1;
@@ -149,7 +149,7 @@ static void sssp_bfs(void) {
 			abort();
 		}
 
-		for splay_each(edge_t, e, n->edge_tree) {       /* "e" is the edge connected to "from" */
+		for splay_each(edge_t, e, &n->edge_tree) {       /* "e" is the edge connected to "from" */
 			if(!e->reverse || e->to == myself) {
 				continue;
 			}
@@ -213,7 +213,7 @@ static void check_reachability(void) {
 	int became_reachable_count = 0;
 	int became_unreachable_count = 0;
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, &node_tree) {
 		if(n->status.visited != n->status.reachable) {
 			n->status.reachable = !n->status.reachable;
 			n->last_state_change = now.tv_sec;
@@ -307,7 +307,7 @@ static void check_reachability(void) {
 }
 
 void graph(void) {
-	subnet_cache_flush();
+	subnet_cache_flush_tables();
 	sssp_bfs();
 	check_reachability();
 	mst_kruskal();