/*
graph.c -- graph algorithms
- Copyright (C) 2001-2012 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 "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 "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().
*/
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 */
+ bool skipped = false;
+
for splay_each(edge_t, e, edge_weight_tree) {
- if(!e->reverse || (e->from->status.visited && e->to->status.visited))
+ if(!e->reverse || (e->from->status.visited == e->to->status.visited)) {
+ skipped = true;
continue;
+ }
e->from->status.visited = true;
e->to->status.visited = true;
if(e->reverse->connection)
e->reverse->connection->status.mst = true;
- logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name,
- e->to->name, e->weight);
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name, e->to->name, e->weight);
+
+ if(skipped) {
+ skipped = false;
+ next = edge_weight_tree->head;
+ }
}
}
/* Loop while todo_list is filled */
- for list_each(node_t, n, todo_list) { /* "n" is the node from which we start */
+ 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);
if(n->distance < 0)
abort();
- for splay_each(edge_t, e, n->edge_tree) { /* "e" is the edge connected to "from" */
+ for splay_each(edge_t, e, n->edge_tree) { /* "e" is the edge connected to "from" */
if(!e->reverse)
continue;
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 = time(NULL);
+ n->last_state_change = now.tv_sec;
if(n->status.reachable) {
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
n->minmtu = 0;
n->mtuprobes = 0;
- if(timeout_initialized(&n->mtuevent))
- event_del(&n->mtuevent);
+ timeout_del(&n->mtutimeout);
char *name;
char *address;
if(!n->status.reachable) {
update_node_udp(n, NULL);
+ memset(&n->status, 0, sizeof n->status);
+ n->options = 0;
} else if(n->connection) {
if(n->status.sptps) {
if(n->connection->outgoing)