X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=9d9bc1f301645690ea3968245c96e1e133bf3c00;hp=dd080c050ebb76cb42b3263810e703a2569cfde0;hb=116ba3b3da73fb857cf75b5c92c6aacd70d94dd9;hpb=4b3aef9e6992ca78f1b17b179a3051d3fec0473d

diff --git a/src/graph.c b/src/graph.c
index dd080c05..9d9bc1f3 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: graph.c,v 1.1.2.9 2002/03/12 16:30:15 guus Exp $
+    $Id: graph.c,v 1.1.2.12 2002/06/08 12:57:09 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
@@ -44,10 +44,13 @@
    destination address and port of a node if possible.
 */
 
+#include "config.h"
+
+#include <stdio.h>
 #include <syslog.h>
 #include "config.h"
 #include <string.h>
-#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD)
+#ifdef HAVE_SYS_PARAM_H
  #include <sys/param.h>
 #endif
 #include <netinet/in.h>
@@ -59,6 +62,7 @@
 #include "node.h"
 #include "edge.h"
 #include "connection.h"
+#include "process.h"
 
 #include "system.h"
 
@@ -151,6 +155,8 @@ void sssp_bfs(void)
   node_t *n;
   halfconnection_t to_hc, from_hc;
   avl_tree_t *todo_tree;
+  int indirect;
+  char *name;
 
   todo_tree = avl_alloc_tree(NULL, NULL);
 
@@ -160,11 +166,13 @@ void sssp_bfs(void)
     {
       n = (node_t *)node->data;
       n->status.visited = 0;
+      n->status.indirect = 1;
     }
 
   /* Begin with myself */
 
   myself->status.visited = 1;
+  myself->status.indirect = 0;
   myself->nexthop = myself;
   myself->via = myself;
   node = avl_alloc_node();
@@ -189,25 +197,47 @@ void sssp_bfs(void)
               else
                 to_hc = e->from, from_hc = e->to;
 
-              if(!to_hc.node->status.visited)
-                {
-                  to_hc.node->status.visited = 1;
-                  to_hc.node->nexthop = (n->nexthop == myself) ? to_hc.node : n->nexthop;
-                  to_hc.node->via = (e->options & OPTION_INDIRECT || n->via != n) ? n->via : to_hc.node;
-		  to_hc.node->options = e->options;
-                  if(sockaddrcmp(&to_hc.node->address, &to_hc.udpaddress))
-		  {
-                    node = avl_unlink(node_udp_tree, to_hc.node);
-                    to_hc.node->address = to_hc.udpaddress;
-		    if(to_hc.node->hostname)
-		      free(to_hc.node->hostname);
-		    to_hc.node->hostname = sockaddr2hostname(&to_hc.udpaddress);
-                    avl_insert_node(node_udp_tree, node);
-		  }
-                  node = avl_alloc_node();
-                  node->data = to_hc.node;
-                  avl_insert_before(todo_tree, from, node);
-                }
+              /* Situation:
+
+	        	  /
+	        	 /
+		 ------(n)from_hc-----to_hc
+                	 \
+                	  \
+
+                 n->address is set to the to_hc.udpaddress of the edge left of n.
+		 We are currently examining the edge right of n:
+
+                 - If from_hc.udpaddress != n->address, then to_hc.node 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 to_hc.node, update
+		   to_hc.node and (re)add it to the todo_tree to (re)examine the reachability
+		   of nodes behind it.
+	      */
+
+              indirect = n->status.indirect || e->options & OPTION_INDIRECT || ((n != myself) && sockaddrcmp(&n->address, &from_hc.udpaddress));
+
+              if(to_hc.node->status.visited && (!to_hc.node->status.indirect || indirect))
+	        continue;
+
+              to_hc.node->status.visited = 1;
+              to_hc.node->status.indirect = indirect;
+              to_hc.node->nexthop = (n->nexthop == myself) ? to_hc.node : n->nexthop;
+              to_hc.node->via = indirect ? n->via : to_hc.node;
+	      to_hc.node->options = e->options;
+              if(sockaddrcmp(&to_hc.node->address, &to_hc.udpaddress))
+	      {
+                node = avl_unlink(node_udp_tree, to_hc.node);
+                to_hc.node->address = to_hc.udpaddress;
+		if(to_hc.node->hostname)
+		  free(to_hc.node->hostname);
+		to_hc.node->hostname = sockaddr2hostname(&to_hc.udpaddress);
+                avl_insert_node(node_udp_tree, node);
+	      }
+              node = avl_alloc_node();
+              node->data = to_hc.node;
+              avl_insert_before(todo_tree, from, node);
             }
 
           avl_delete_node(todo_tree, from);
@@ -230,6 +260,9 @@ void sssp_bfs(void)
           if(debug_lvl >= DEBUG_TRAFFIC)
             syslog(LOG_DEBUG, _("Node %s (%s) became reachable"), n->name, n->hostname);
           n->status.reachable = 1;
+	  asprintf(&name, "hosts/%s-up", n->name);
+	  execute_script(name);
+	  free(name);
 	}
       }
       else
@@ -242,6 +275,9 @@ void sssp_bfs(void)
 	  n->status.validkey = 0;
 	  n->status.waitingforkey = 0;
 	  n->sent_seqno = 0;
+	  asprintf(&name, "hosts/%s-down", n->name);
+	  execute_script(name);
+	  free(name);
 	}
       }
     }