projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[tinc]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
d54e5cd
..
bdb32a0
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-20
09
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2001-20
11
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
@@
-53,6
+53,7
@@
#include "netutl.h"
#include "node.h"
#include "process.h"
#include "netutl.h"
#include "node.h"
#include "process.h"
+#include "protocol.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
@@
-284,16
+285,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))
@@
-346,7
+343,7
@@
void check_reachability() {
/* TODO: only clear status.validkey if node is unreachable? */
n->status.validkey = false;
/* TODO: only clear status.validkey if node is unreachable? */
n->status.validkey = false;
- n->
status.waitingforkey = false
;
+ n->
last_req_key = 0
;
n->maxmtu = MTU;
n->minmtu = 0;
n->maxmtu = MTU;
n->minmtu = 0;
@@
-381,6
+378,8
@@
void check_reachability() {
if(!n->status.reachable)
update_node_udp(n, NULL);
if(!n->status.reachable)
update_node_udp(n, NULL);
+ else if(n->connection)
+ send_ans_key(n);
}
}
}
}
}
}