Nodes should only be in the node_udp_tree if they are reachable.
[tinc] / src / graph.c
index 6ec3724..f6ce90d 100644 (file)
@@ -1,7 +1,7 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2004 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.28 2003/08/22 11:18:42 guus Exp $
+    $Id$
 */
 
 /* We need to generate two trees from the graph:
@@ -54,6 +54,7 @@
 #include "netutl.h"
 #include "node.h"
 #include "process.h"
+#include "subnet.h"
 #include "utils.h"
 
 /* Implementation of Kruskal's algorithm.
@@ -76,7 +77,7 @@ void mst_kruskal(void)
        /* Clear MST status on connections */
 
        for(node = connection_tree->head; node; node = node->next) {
-               c = (connection_t *) node->data;
+               c = node->data;
                c->status.mst = false;
        }
 
@@ -90,7 +91,7 @@ void mst_kruskal(void)
        /* Clear visited status on nodes */
 
        for(node = node_tree->head; node; node = node->next) {
-               n = (node_t *) node->data;
+               n = node->data;
                n->status.visited = false;
                nodes++;
        }
@@ -103,7 +104,7 @@ void mst_kruskal(void)
 
        for(skipped = false, node = edge_weight_tree->head; node; node = next) {
                next = node->next;
-               e = (edge_t *) node->data;
+               e = node->data;
 
                if(!e->reverse || e->from->status.visited == e->to->status.visited) {
                        skipped = true;
@@ -141,10 +142,11 @@ void mst_kruskal(void)
 
 void sssp_bfs(void)
 {
-       avl_node_t *node, *from, *next, *to;
+       avl_node_t *node, *next, *to;
        edge_t *e;
        node_t *n;
-       avl_tree_t *todo_tree;
+       list_t *todo_list;
+       list_node_t *from, *todonext;
        bool indirect;
        char *name;
        char *address, *port;
@@ -153,12 +155,12 @@ void sssp_bfs(void)
 
        cp();
 
-       todo_tree = avl_alloc_tree(NULL, NULL);
+       todo_list = list_alloc(NULL);
 
        /* Clear visited status on nodes */
 
        for(node = node_tree->head; node; node = node->next) {
-               n = (node_t *) node->data;
+               n = node->data;
                n->status.visited = false;
                n->status.indirect = true;
        }
@@ -169,83 +171,86 @@ void sssp_bfs(void)
        myself->status.indirect = false;
        myself->nexthop = myself;
        myself->via = myself;
-       node = avl_alloc_node();
-       node->data = myself;
-       avl_insert_top(todo_tree, node);
+       list_insert_head(todo_list, myself);
 
-       /* Loop while todo_tree is filled */
+       /* Loop while todo_list is filled */
 
-       while(todo_tree->head) {
-               for(from = todo_tree->head; from; from = next) {        /* "from" is the node from which we start */
-                       next = from->next;
-                       n = (node_t *) from->data;
+       for(from = todo_list->head; from; from = todonext) {    /* "from" is the node from which we start */
+               n = from->data;
 
-                       for(to = n->edge_tree->head; to; to = to->next) {       /* "to" is the edge connected to "from" */
-                               e = (edge_t *) to->data;
+               for(to = n->edge_tree->head; to; to = to->next) {       /* "to" is the edge connected to "from" */
+                       e = to->data;
 
-                               if(!e->reverse)
-                                       continue;
+                       if(!e->reverse)
+                               continue;
 
-                               /* Situation:
+                       /* Situation:
 
-                                   /
                                   /
-                                  ------(n)-----(e->to)
+                                 /
+                          ----->(n)---e-->(e->to)
+                                 \
                                   \
-                                   \
-
-                                  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_tree 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));
-
-                               if(e->to->status.visited
-                                  && (!e->to->status.indirect || indirect))
-                                       continue;
-
-                               e->to->status.visited = true;
-                               e->to->status.indirect = indirect;
-                               e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
-                               e->to->via = indirect ? n->via : e->to;
-                               e->to->options = e->options;
-
-                               if(sockaddrcmp(&e->to->address, &e->address)) {
-                                       node = avl_unlink(node_udp_tree, e->to);
-                                       sockaddrfree(&e->to->address);
-                                       sockaddrcpy(&e->to->address, &e->address);
-
-                                       if(e->to->hostname)
-                                               free(e->to->hostname);
-
-                                       e->to->hostname = sockaddr2hostname(&e->to->address);
-                                       avl_insert_node(node_udp_tree, node);
-                               }
 
-                               node = avl_alloc_node();
-                               node->data = e->to;
-                               avl_insert_before(todo_tree, from, node);
+                          Where e is an edge, (n) and (e->to) are nodes.
+                          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));
+
+                       if(e->to->status.visited
+                          && (!e->to->status.indirect || indirect))
+                               continue;
+
+                       e->to->status.visited = true;
+                       e->to->status.indirect = indirect;
+                       e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+                       e->to->via = indirect ? n->via : e->to;
+                       e->to->options = e->options;
+
+                       if(sockaddrcmp(&e->to->address, &e->address)) {
+                               node = avl_unlink(node_udp_tree, e->to);
+                               sockaddrfree(&e->to->address);
+                               sockaddrcpy(&e->to->address, &e->address);
+
+                               if(e->to->hostname)
+                                       free(e->to->hostname);
+
+                               e->to->hostname = sockaddr2hostname(&e->to->address);
+                               avl_insert_node(node_udp_tree, node);
+
+                               if(e->to->options & OPTION_PMTU_DISCOVERY) {
+                                       e->to->mtuprobes = 0;
+                                       e->to->minmtu = 0;
+                                       e->to->maxmtu = MTU;
+                                       if(e->to->status.validkey)
+                                               send_mtu_probe(e->to);
+                               }
                        }
 
-                       avl_delete_node(todo_tree, from);
+                       list_insert_tail(todo_list, e->to);
                }
+
+               todonext = from->next;
+               list_delete_node(todo_list, from);
        }
 
-       avl_free_tree(todo_tree);
+       list_free(todo_list);
 
        /* Check reachability status. */
 
        for(node = node_tree->head; node; node = next) {
                next = node->next;
-               n = (node_t *) node->data;
+               n = node->data;
 
                if(n->status.visited != n->status.reachable) {
                        n->status.reachable = !n->status.reachable;
@@ -253,14 +258,20 @@ void sssp_bfs(void)
                        if(n->status.reachable) {
                                ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
                                           n->name, n->hostname);
+                               avl_insert(node_udp_tree, n);
                        } else {
                                ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
                                           n->name, n->hostname);
+                               avl_delete(node_udp_tree, n);
                        }
 
                        n->status.validkey = false;
                        n->status.waitingforkey = false;
 
+                       n->maxmtu = MTU;
+                       n->minmtu = 0;
+                       n->mtuprobes = 0;
+
                        asprintf(&envp[0], "NETNAME=%s", netname ? : "");
                        asprintf(&envp[1], "DEVICE=%s", device ? : "");
                        asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
@@ -279,8 +290,10 @@ void sssp_bfs(void)
                        free(address);
                        free(port);
 
-                       for(i = 0; i < 7; i++)
+                       for(i = 0; i < 6; i++)
                                free(envp[i]);
+
+                       subnet_update(n, NULL, n->status.reachable);
                }
        }
 }