projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix sparse warnings and add an extra sprinkling of const.
[tinc]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
c8430d8
..
9aadcd8
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
@@
-49,10
+49,12
@@
#include "connection.h"
#include "device.h"
#include "edge.h"
#include "connection.h"
#include "device.h"
#include "edge.h"
+#include "graph.h"
#include "logger.h"
#include "netutl.h"
#include "node.h"
#include "process.h"
#include "logger.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"
@@
-64,7
+66,7
@@
static bool graph_changed = true;
Please note that sorting on weight is already done by add_edge().
*/
Please note that sorting on weight is already done by add_edge().
*/
-void mst_kruskal(void) {
+
static
void mst_kruskal(void) {
avl_node_t *node, *next;
edge_t *e;
node_t *n;
avl_node_t *node, *next;
edge_t *e;
node_t *n;
@@
-145,7
+147,7
@@
void mst_kruskal(void) {
Running time: O(E)
*/
Running time: O(E)
*/
-void sssp_bfs(void) {
+
static
void sssp_bfs(void) {
avl_node_t *node, *next, *to;
edge_t *e;
node_t *n;
avl_node_t *node, *next, *to;
edge_t *e;
node_t *n;
@@
-198,16
+200,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))
@@
-241,17
+239,17
@@
void sssp_bfs(void) {
n->status.reachable = !n->status.reachable;
if(n->status.reachable) {
n->status.reachable = !n->status.reachable;
if(n->status.reachable) {
- ifdebug(TRAFFIC) logger(LOG_DEBUG,
_("Node %s (%s) became reachable")
,
+ ifdebug(TRAFFIC) logger(LOG_DEBUG,
"Node %s (%s) became reachable"
,
n->name, n->hostname);
} else {
n->name, n->hostname);
} else {
- ifdebug(TRAFFIC) logger(LOG_DEBUG,
_("Node %s (%s) became unreachable")
,
+ ifdebug(TRAFFIC) logger(LOG_DEBUG,
"Node %s (%s) became unreachable"
,
n->name, n->hostname);
}
/* TODO: only clear status.validkey if node is unreachable? */
n->status.validkey = false;
n->name, n->hostname);
}
/* 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;
@@
-286,6
+284,11
@@
void sssp_bfs(void) {
free(envp[i]);
subnet_update(n, NULL, n->status.reachable);
free(envp[i]);
subnet_update(n, NULL, n->status.reachable);
+
+ if(!n->status.reachable)
+ update_node_udp(n, NULL);
+ else if(n->connection)
+ send_ans_key(n);
}
}
}
}
}
}