X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=8f58af4ca45ccd5aec644e9de2b90936329d0b21;hp=12ef8b0ffd730fe8646467209172edc312fe48c7;hb=0aa86d4b8b3010522e6de8842f5bd29004ba3df6;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee

diff --git a/src/graph.c b/src/graph.c
index 12ef8b0f..8f58af4c 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2010 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -53,6 +53,7 @@
 #include "netutl.h"
 #include "node.h"
 #include "process.h"
+#include "protocol.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -64,8 +65,7 @@ static bool graph_changed = true;
    Please note that sorting on weight is already done by add_edge().
 */
 
-void mst_kruskal(void)
-{
+void mst_kruskal(void) {
 	avl_node_t *node, *next;
 	edge_t *e;
 	node_t *n;
@@ -74,8 +74,6 @@ void mst_kruskal(void)
 	int safe_edges = 0;
 	bool skipped;
 
-	cp();
-	
 	/* Clear MST status on connections */
 
 	for(node = connection_tree->head; node; node = node->next) {
@@ -148,8 +146,7 @@ void mst_kruskal(void)
    Running time: O(E)
 */
 
-void sssp_bfs(void)
-{
+void sssp_bfs(void) {
 	avl_node_t *node, *next, *to;
 	edge_t *e;
 	node_t *n;
@@ -161,8 +158,6 @@ void sssp_bfs(void)
 	char *envp[7];
 	int i;
 
-	cp();
-
 	todo_list = list_alloc(NULL);
 
 	/* Clear visited status on nodes */
@@ -204,16 +199,12 @@ void sssp_bfs(void)
 			   n->address is set to the e->address of the edge left of n to n.
 			   We are currently examining the edge e right of n from n:
 
-			   - If e->reverse->address != n->address, then e->to is probably
-			     not reachable for the nodes left of n. We do as if the indirectdata
-			     flag is set on edge e.
 			   - If edge e provides for better reachability of e->to, update
 			     e->to and (re)add it to the todo_list to (re)examine the reachability
 			     of nodes behind it.
 			 */
 
-			indirect = n->status.indirect || e->options & OPTION_INDIRECT
-				|| ((n != myself) && sockaddrcmp(&n->address, &e->reverse->address));
+			indirect = n->status.indirect || e->options & OPTION_INDIRECT;
 
 			if(e->to->status.visited
 			   && (!e->to->status.indirect || indirect))
@@ -247,17 +238,17 @@ void sssp_bfs(void)
 			n->status.reachable = !n->status.reachable;
 
 			if(n->status.reachable) {
-				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
+				ifdebug(TRAFFIC) logger(LOG_DEBUG, "Node %s (%s) became reachable",
 					   n->name, n->hostname);
 			} else {
-				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
+				ifdebug(TRAFFIC) logger(LOG_DEBUG, "Node %s (%s) became unreachable",
 					   n->name, n->hostname);
 			}
 
 			/* TODO: only clear status.validkey if node is unreachable? */
 
 			n->status.validkey = false;
-			n->status.waitingforkey = false;
+			n->last_req_key = 0;
 
 			n->maxmtu = MTU;
 			n->minmtu = 0;
@@ -292,12 +283,16 @@ void sssp_bfs(void)
 				free(envp[i]);
 
 			subnet_update(n, NULL, n->status.reachable);
+
+			if(!n->status.reachable)
+				update_node_udp(n, NULL);
+			else if(n->connection)
+				send_ans_key(n);
 		}
 	}
 }
 
-void graph(void)
-{
+void graph(void) {
 	subnet_cache_flush();
 	sssp_bfs();
 	mst_kruskal();
@@ -312,8 +307,7 @@ void graph(void)
    dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
 */
 
-void dump_graph(void)
-{
+void dump_graph(void) {
 	avl_node_t *node;
 	node_t *n;
 	edge_t *e;