Don't assume sa.sa_family is a short int.
[tinc] / src / graph.c
index 216f9de..e570feb 100644 (file)
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2010 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
 
 #include "system.h"
 
-#include "splay_tree.h"
-#include "config.h"
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
+#include "graph.h"
+#include "list.h"
 #include "logger.h"
+#include "names.h"
 #include "netutl.h"
 #include "node.h"
-#include "process.h"
 #include "protocol.h"
+#include "script.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "graph.h"
 
 /* Implementation of Kruskal's algorithm.
-   Running time: O(E)
+   Running time: O(EN)
    Please note that sorting on weight is already done by add_edge().
 */
 
-void mst_kruskal(void) {
-       splay_node_t *node, *next;
-       edge_t *e;
-       node_t *n;
-       connection_t *c;
-
+static void mst_kruskal(void) {
        /* Clear MST status on connections */
 
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
+       for list_each(connection_t, c, connection_list)
                c->status.mst = false;
-       }
 
-       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Running Kruskal's algorithm:");
+       logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Running Kruskal's algorithm:");
 
        /* Clear visited status on nodes */
 
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
+       for splay_each(node_t, n, node_tree)
                n->status.visited = false;
+
+       /* Starting point */
+
+       for splay_each(edge_t, e, edge_weight_tree) {
+               if(e->from->status.reachable) {
+                       e->from->status.visited = true;
+                       break;
+               }
        }
 
        /* Add safe edges */
 
-       for(node = edge_weight_tree->head; node; node = next) {
-               next = node->next;
-               e = node->data;
+       bool skipped = false;
 
-               if(!e->reverse || (e->from->status.visited && e->to->status.visited))
+       for splay_each(edge_t, e, edge_weight_tree) {
+               if(!e->reverse || (e->from->status.visited == e->to->status.visited)) {
+                       skipped = true;
                        continue;
+               }
 
                e->from->status.visited = true;
                e->to->status.visited = true;
@@ -103,155 +106,28 @@ void mst_kruskal(void) {
                if(e->reverse->connection)
                        e->reverse->connection->status.mst = true;
 
-               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name,
-                                  e->to->name, e->weight);
-       }
-}
-
-/* Implementation of Dijkstra's algorithm.
-   Running time: O(N^2)
-*/
-
-void sssp_dijkstra(void) {
-       splay_node_t *node, *to;
-       edge_t *e;
-       node_t *n, *m;
-       list_t *todo_list;
-       list_node_t *lnode, *nnode;
-       bool indirect;
-
-       todo_list = list_alloc(NULL);
-
-       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Running Dijkstra's algorithm:");
-
-       /* Clear visited status on nodes */
-
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
-               n->status.visited = false;
-               n->status.indirect = true;
-               n->distance = -1;
-       }
-
-       /* Begin with myself */
-
-       myself->status.indirect = false;
-       myself->nexthop = myself;
-       myself->via = myself;
-       myself->distance = 0;
-       list_insert_head(todo_list, myself);
-
-       /* Loop while todo_list is filled */
-
-       while(todo_list->head) {
-               n = NULL;
-               nnode = NULL;
-
-               /* Select node from todo_list with smallest distance */
-
-               for(lnode = todo_list->head; lnode; lnode = lnode->next) {
-                       m = lnode->data;
-                       if(!n || m->status.indirect < n->status.indirect || m->distance < n->distance) {
-                               n = m;
-                               nnode = lnode;
-                       }
-               }
-
-               /* Mark this node as visited and remove it from the todo_list */
-
-               n->status.visited = true;
-               list_unlink_node(todo_list, nnode);
-
-               /* Update distance of neighbours and add them to the todo_list */
-
-               for(to = n->edge_tree->head; to; to = to->next) {       /* "to" is the edge connected to "from" */
-                       e = to->data;
-
-                       if(e->to->status.visited || !e->reverse)
-                               continue;
-
-                       /* Situation:
-
-                                  /
-                                 /
-                          ----->(n)---e-->(e->to)
-                                 \
-                                  \
-
-                          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.
-                        */
-
-                       if(e->to->distance < 0)
-                               list_insert_tail(todo_list, e->to);
-
-                       indirect = n->status.indirect || e->options & OPTION_INDIRECT || ((n != myself) && sockaddrcmp(&n->address, &e->reverse->address));
-
-                       if(e->to->distance >= 0 && (!e->to->status.indirect || indirect) && e->to->distance <= n->distance + e->weight)
-                               continue;
-
-                       e->to->distance = n->distance + e->weight;
-                       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 = splay_unlink(node_udp_tree, e->to);
-                               sockaddrfree(&e->to->address);
-                               sockaddrcpy(&e->to->address, &e->address);
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name, e->to->name, e->weight);
 
-                               if(e->to->hostname)
-                                       free(e->to->hostname);
-
-                               e->to->hostname = sockaddr2hostname(&e->to->address);
-
-                               if(node)
-                                       splay_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);
-                               }
-                       }
-
-                       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, " Updating edge %s - %s weight %d distance %d", e->from->name,
-                                          e->to->name, e->weight, e->to->distance);
+               if(skipped) {
+                       skipped = false;
+                       next = edge_weight_tree->head;
                }
        }
-
-       list_free(todo_list);
 }
 
 /* Implementation of a simple breadth-first search algorithm.
    Running time: O(E)
 */
 
-void sssp_bfs(void) {
-       splay_node_t *node, *to;
-       edge_t *e;
-       node_t *n;
-       list_t *todo_list;
-       list_node_t *from, *todonext;
-       bool indirect;
-
-       todo_list = list_alloc(NULL);
+static void sssp_bfs(void) {
+       list_t *todo_list = list_alloc(NULL);
 
        /* Clear visited status on nodes */
 
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
+       for splay_each(node_t, n, node_tree) {
                n->status.visited = false;
                n->status.indirect = true;
+               n->distance = -1;
        }
 
        /* Begin with myself */
@@ -259,18 +135,21 @@ void sssp_bfs(void) {
        myself->status.visited = true;
        myself->status.indirect = false;
        myself->nexthop = myself;
+       myself->prevedge = NULL;
        myself->via = myself;
+       myself->distance = 0;
        list_insert_head(todo_list, myself);
 
        /* Loop while todo_list is filled */
 
-       for(from = todo_list->head; from; from = todonext) {    /* "from" is the node from which we start */
-               n = from->data;
+       for list_each(node_t, n, todo_list) {                   /* "n" is the node from which we start */
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Examining edges from %s", n->name);
 
-               for(to = n->edge_tree->head; to; to = to->next) {       /* "to" is the edge connected to "from" */
-                       e = to->data;
+               if(n->distance < 0)
+                       abort();
 
-                       if(!e->reverse)
+               for splay_each(edge_t, e, n->edge_tree) {       /* "e" is the edge connected to "from" */
+                       if(!e->reverse || e->to == myself)
                                continue;
 
                        /* Situation:
@@ -285,75 +164,90 @@ 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));
+                       bool indirect = n->status.indirect || e->options & OPTION_INDIRECT;
 
                        if(e->to->status.visited
-                          && (!e->to->status.indirect || indirect))
+                          && (!e->to->status.indirect || indirect)
+                          && (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight))
                                continue;
 
+                       // Only update nexthop if it doesn't increase the path length
+
+                       if(!e->to->status.visited || (e->to->distance == n->distance + 1 && e->weight >= e->to->prevedge->weight))
+                               e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+
                        e->to->status.visited = true;
                        e->to->status.indirect = indirect;
-                       e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+                       e->to->prevedge = e;
                        e->to->via = indirect ? n->via : e->to;
                        e->to->options = e->options;
+                       e->to->distance = n->distance + 1;
 
-                       if(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
+                       if(!e->to->status.reachable || (e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN))
                                update_node_udp(e->to, &e->address);
 
                        list_insert_tail(todo_list, e->to);
                }
 
-               todonext = from->next;
-               list_delete_node(todo_list, from);
+               next = node->next; /* Because the list_insert_tail() above could have added something extra for us! */
+               list_delete_node(todo_list, node);
        }
 
        list_free(todo_list);
 }
 
-void check_reachability() {
-       splay_node_t *node, *next;
-       node_t *n;
-       char *name;
-       char *address, *port;
-       char *envp[7];
-       int i;
-
+static void check_reachability(void) {
        /* Check reachability status. */
 
-       for(node = node_tree->head; node; node = next) {
-               next = node->next;
-               n = node->data;
-
+       int reachable_count = 0;
+       int became_reachable_count = 0;
+       int became_unreachable_count = 0;
+       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;
 
                        if(n->status.reachable) {
-                               ifdebug(TRAFFIC) logger(LOG_DEBUG, "Node %s (%s) became reachable",
+                               logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
                                           n->name, n->hostname);
+                               if (n != myself)
+                                       became_reachable_count++;
                        } else {
-                               ifdebug(TRAFFIC) logger(LOG_DEBUG, "Node %s (%s) became unreachable",
+                               logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became unreachable",
                                           n->name, n->hostname);
+                               if (n != myself)
+                                       became_unreachable_count++;
                        }
 
+                       if(experimental && OPTION_VERSION(n->options) >= 2)
+                               n->status.sptps = true;
+
                        /* TODO: only clear status.validkey if node is unreachable? */
 
                        n->status.validkey = false;
+                       if(n->status.sptps) {
+                               sptps_stop(&n->sptps);
+                               n->status.waitingforkey = false;
+                       }
                        n->last_req_key = 0;
 
+                       n->status.udp_confirmed = false;
                        n->maxmtu = MTU;
+                       n->maxrecentlen = 0;
                        n->minmtu = 0;
                        n->mtuprobes = 0;
 
-                       event_del(&n->mtuevent);
+                       timeout_del(&n->udp_ping_timeout);
+
+                       char *name;
+                       char *address;
+                       char *port;
+                       char *envp[8] = {NULL};
 
                        xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
                        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@@ -362,35 +256,48 @@ void check_reachability() {
                        sockaddr2str(&n->address, &address, &port);
                        xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
                        xasprintf(&envp[5], "REMOTEPORT=%s", port);
-                       envp[6] = NULL;
+                       xasprintf(&envp[6], "NAME=%s", myself->name);
 
                        execute_script(n->status.reachable ? "host-up" : "host-down", envp);
 
-                       xasprintf(&name,
-                                        n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
-                                        n->name);
+                       xasprintf(&name, n->status.reachable ? "hosts/%s-up" : "hosts/%s-down", n->name);
                        execute_script(name, envp);
 
                        free(name);
                        free(address);
                        free(port);
 
-                       for(i = 0; i < 6; i++)
+                       for(int i = 0; i < 7; i++)
                                free(envp[i]);
 
                        subnet_update(n, NULL, n->status.reachable);
 
-                       if(!n->status.reachable)
+                       if(!n->status.reachable) {
                                update_node_udp(n, NULL);
-                       else if(n->connection)
-                               send_ans_key(n);
+                               memset(&n->status, 0, sizeof n->status);
+                               n->options = 0;
+                       } else if(n->connection) {
+                               // Speed up UDP probing by sending our key.
+                               if(!n->status.sptps)
+                                       send_ans_key(n);
+                       }
                }
+
+               if(n->status.reachable && n != myself)
+                       reachable_count++;
+       }
+
+       if (device_standby) {
+               if (reachable_count == 0 && became_unreachable_count > 0)
+                       device_disable();
+               else if (reachable_count > 0 && reachable_count == became_reachable_count)
+                       device_enable();
        }
 }
 
 void graph(void) {
        subnet_cache_flush();
-       sssp_dijkstra();
+       sssp_bfs();
        check_reachability();
        mst_kruskal();
 }