X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=f6ce90dea8605f5af9995e5e73574cc67ab82987;hp=2c6ad22e445adb47e5750cd9aa2266c87807f8c7;hb=39fe3b445c2f20b325ee492dd1845877777b25c8;hpb=e449d94caef963809d417f16497f6f978e10d731 diff --git a/src/graph.c b/src/graph.c index 2c6ad22e..f6ce90de 100644 --- a/src/graph.c +++ b/src/graph.c @@ -1,7 +1,7 @@ /* graph.c -- graph algorithms - Copyright (C) 2001-2003 Guus Sliepen , - 2001-2003 Ivo Timmermans + Copyright (C) 2001-2004 Guus Sliepen , + 2001-2004 Ivo Timmermans 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.25 2003/07/17 15:06:26 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. @@ -69,15 +70,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 +91,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 +126,7 @@ void mst_kruskal(void) e->to->name, e->weight); if(skipped) { - skipped = 0; + skipped = false; next = edge_weight_tree->head; continue; } @@ -141,11 +142,12 @@ 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; - int indirect; + list_t *todo_list; + list_node_t *from, *todonext; + bool indirect; char *name; char *address, *port; char *envp[7]; @@ -153,98 +155,102 @@ 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->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(); - 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 = 1; - 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); - 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); + 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); } - - node = avl_alloc_node(); - node->data = e->to; - avl_insert_before(todo_tree, from, node); } - 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; @@ -252,17 +258,23 @@ 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 = 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); @@ -278,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); } } }