/*
graph.c -- graph algorithms
- Copyright (C) 2001-2011 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
2001-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
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 */
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,
+ logger(DEBUG_SCARY_THINGS, 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)
-*/
-
-static 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 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(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
- update_node_udp(e->to, &e->address);
-
- 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);
- }
- }
-
- list_free(todo_list);
-}
-
/* Implementation of a simple breadth-first search algorithm.
Running time: O(E)
*/
n = node->data;
n->status.visited = false;
n->status.indirect = true;
+ n->distance = -1;
}
/* Begin with myself */
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;
+ if(n->distance < 0)
+ abort();
for(to = n->edge_tree->head; to; to = to->next) { /* "to" is the edge connected to "from" */
e = to->data;
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;
e->to->status.visited = true;
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)
update_node_udp(e->to, &e->address);
n->status.reachable = !n->status.reachable;
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);
} 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);
}
projects / tinc / blobdiff