More sensible name, and try to set PMTU discovery on IPv6 sockets as well.

[oweals/tinc.git] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 2c6ad22e445adb47e5750cd9aa2266c87807f8c7..c177347060786fdcc1f8ef574d7d3edc409c6c1b 100644 (file)
--- 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.25 2003/07/17 15:06:26 guus Exp $
+    $Id: graph.c,v 1.1.2.32 2003/12/20 21:09:33 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
@@ -69,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? */
@@ -90,34 +90,34 @@ void mst_kruskal(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 = 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++;
 
@@ -125,7 +125,7 @@ void mst_kruskal(void)
                                   e->to->name, e->weight);
 
                if(skipped) {
-                       skipped = 0;
+                       skipped = false;
                        next = edge_weight_tree->head;
                        continue;
                }
@@ -145,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];
@@ -158,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();
@@ -178,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:
 
@@ -212,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;
@@ -220,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_DONTFRAGMENT) {
+                                               e->to->mtu = MTU;
+                                               e->to->mtuprobes = 0;
+                                               e->to->probedmtu = 0;
+                                               if(e->to->status.validkey)
+                                                       send_mtu_probe(e->to);
+                                       }
                                }
 
                                node = avl_alloc_node();
@@ -244,7 +254,7 @@ 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;
@@ -257,12 +267,12 @@ void sssp_bfs(void)
                                           n->name, n->hostname);
                        }
 
-                       n->status.validkey = 0;
-                       n->status.waitingforkey = 0;
+                       n->status.validkey = false;
+                       n->status.waitingforkey = false;
 
                        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);