projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fgets() returns NULL on error, not < 0
[tinc]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
216f9de
..
28be9d5
100644
(file)
--- a/
src/graph.c
+++ b/
src/graph.c
@@
-1,6
+1,6
@@
/*
graph.c -- graph algorithms
/*
graph.c -- graph algorithms
- Copyright (C) 2001-201
0
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2001-201
1
Guus Sliepen <guus@tinc-vpn.org>,
2001-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
2001-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
@@
-57,6
+57,7
@@
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
+#include "graph.h"
/* Implementation of Kruskal's algorithm.
Running time: O(E)
/* Implementation of Kruskal's algorithm.
Running time: O(E)
@@
-112,7
+113,7
@@
void mst_kruskal(void) {
Running time: O(N^2)
*/
Running time: O(N^2)
*/
-void sssp_dijkstra(void) {
+
static
void sssp_dijkstra(void) {
splay_node_t *node, *to;
edge_t *e;
node_t *n, *m;
splay_node_t *node, *to;
edge_t *e;
node_t *n, *m;
@@
-285,16
+286,12
@@
void sssp_bfs(void) {
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:
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.
*/
- 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));
+ indirect = n->status.indirect || e->options & OPTION_INDIRECT;
if(e->to->status.visited
&& (!e->to->status.indirect || indirect))
if(e->to->status.visited
&& (!e->to->status.indirect || indirect))
@@
-319,7
+316,7
@@
void sssp_bfs(void) {
list_free(todo_list);
}
list_free(todo_list);
}
-
void check_reachability(
) {
+
static void check_reachability(void
) {
splay_node_t *node, *next;
node_t *n;
char *name;
splay_node_t *node, *next;
node_t *n;
char *name;
@@
-353,7
+350,8
@@
void check_reachability() {
n->minmtu = 0;
n->mtuprobes = 0;
n->minmtu = 0;
n->mtuprobes = 0;
- event_del(&n->mtuevent);
+ if(timeout_initialized(&n->mtuevent))
+ event_del(&n->mtuevent);
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");