Revert Martin Kihlgren's patch, it doesn't work the way it should.
[tinc] / src / graph.c
index f0a93ae..3ed1d72 100644 (file)
@@ -1,7 +1,7 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
 
     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.22 2003/01/17 00:37:17 guus Exp $
+    $Id: graph.c,v 1.1.2.34 2003/12/22 11:04:16 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
    destination address and port of a node if possible.
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <netinet/in.h>
-
-#include <avl_tree.h>
-#include <utils.h>
+#include "system.h"
 
+#include "avl_tree.h"
+#include "connection.h"
+#include "device.h"
+#include "edge.h"
+#include "logger.h"
 #include "netutl.h"
 #include "node.h"
-#include "edge.h"
-#include "connection.h"
 #include "process.h"
-#include "device.h"
-
-#include "system.h"
+#include "utils.h"
 
 /* Implementation of Kruskal's algorithm.
    Running time: O(EN)
@@ -79,15 +69,15 @@ void mst_kruskal(void)
        connection_t *c;
        int nodes = 0;
        int safe_edges = 0;
-       int skipped;
+       bool skipped;
 
        cp();
        
        /* Clear MST status on connections */
 
        for(node = connection_tree->head; node; node = node->next) {
-               c = (connection_t *) node->data;
-               c->status.mst = 0;
+               c = node->data;
+               c->status.mst = false;
        }
 
        /* Do we have something to do at all? */
@@ -95,56 +85,53 @@ void mst_kruskal(void)
        if(!edge_weight_tree->head)
                return;
 
-       if(debug_lvl >= DEBUG_SCARY_THINGS)
-               syslog(LOG_DEBUG, "Running Kruskal's algorithm:");
+       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Running Kruskal's algorithm:");
 
        /* Clear visited status on nodes */
 
        for(node = node_tree->head; node; node = node->next) {
-               n = (node_t *) node->data;
-               n->status.visited = 0;
+               n = node->data;
+               n->status.visited = false;
                nodes++;
        }
 
        /* Starting point */
 
-       ((edge_t *) edge_weight_tree->head->data)->from->status.visited = 1;
+       ((edge_t *) edge_weight_tree->head->data)->from->status.visited = true;
 
        /* Add safe edges */
 
-       for(skipped = 0, node = edge_weight_tree->head; node; node = next) {
+       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 = 1;
+                       skipped = true;
                        continue;
                }
 
-               e->from->status.visited = 1;
-               e->to->status.visited = 1;
+               e->from->status.visited = true;
+               e->to->status.visited = true;
 
                if(e->connection)
-                       e->connection->status.mst = 1;
+                       e->connection->status.mst = true;
 
                if(e->reverse->connection)
-                       e->reverse->connection->status.mst = 1;
+                       e->reverse->connection->status.mst = true;
 
                safe_edges++;
 
-               if(debug_lvl >= DEBUG_SCARY_THINGS)
-                       syslog(LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name,
+               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name,
                                   e->to->name, e->weight);
 
                if(skipped) {
-                       skipped = 0;
+                       skipped = false;
                        next = edge_weight_tree->head;
                        continue;
                }
        }
 
-       if(debug_lvl >= DEBUG_SCARY_THINGS)
-               syslog(LOG_DEBUG, "Done, counted %d nodes and %d safe edges.", nodes,
+       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Done, counted %d nodes and %d safe edges.", nodes,
                           safe_edges);
 }
 
@@ -158,7 +145,7 @@ void sssp_bfs(void)
        edge_t *e;
        node_t *n;
        avl_tree_t *todo_tree;
-       int indirect;
+       bool indirect;
        char *name;
        char *address, *port;
        char *envp[7];
@@ -171,15 +158,15 @@ void sssp_bfs(void)
        /* Clear visited status on nodes */
 
        for(node = node_tree->head; node; node = node->next) {
-               n = (node_t *) node->data;
-               n->status.visited = 0;
-               n->status.indirect = 1;
+               n = node->data;
+               n->status.visited = false;
+               n->status.indirect = true;
        }
 
        /* Begin with myself */
 
-       myself->status.visited = 1;
-       myself->status.indirect = 0;
+       myself->status.visited = true;
+       myself->status.indirect = false;
        myself->nexthop = myself;
        myself->via = myself;
        node = avl_alloc_node();
@@ -191,22 +178,23 @@ void sssp_bfs(void)
        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;
+                       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;
+                               e = to->data;
 
                                if(!e->reverse)
                                        continue;
 
                                /* Situation:
 
-                                   /
-                                  /
-                                  ------(n)-----(e->to)
-                                  \
-                                   \
+                                          /
+                                         /
+                                  ----->(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:
 
@@ -225,7 +213,7 @@ void sssp_bfs(void)
                                   && (!e->to->status.indirect || indirect))
                                        continue;
 
-                               e->to->status.visited = 1;
+                               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;
@@ -233,13 +221,22 @@ void sssp_bfs(void)
 
                                if(sockaddrcmp(&e->to->address, &e->address)) {
                                        node = avl_unlink(node_udp_tree, e->to);
-                                       e->to->address = e->address;
+                                       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);
+                                       }
                                }
 
                                node = avl_alloc_node();
@@ -257,26 +254,29 @@ void sssp_bfs(void)
 
        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;
 
-                       if(debug_lvl >= DEBUG_TRAFFIC) {
-                               if(n->status.reachable)
-                                       syslog(LOG_DEBUG, _("Node %s (%s) became reachable"),
-                                                  n->name, n->hostname);
-                               else
-                                       syslog(LOG_DEBUG, _("Node %s (%s) became unreachable"),
-                                                  n->name, n->hostname);
+                       if(n->status.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"),
+                                          n->name, n->hostname);
                        }
 
-                       n->status.validkey = 0;
-                       n->status.waitingforkey = 0;
+                       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", interface ? : "");
+                       asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
                        asprintf(&envp[3], "NODE=%s", n->name);
                        sockaddr2str(&n->address, &address, &port);
                        asprintf(&envp[4], "REMOTEADDRESS=%s", address);