projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use setpriority() instead of nice() on UNIX-like systems.
[tinc]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
12ef8b0
..
1e6043d
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
10
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"
@@
-64,8
+65,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)
-{
+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;
@@
-74,8
+74,6
@@
void mst_kruskal(void)
int safe_edges = 0;
bool skipped;
int safe_edges = 0;
bool skipped;
- cp();
-
/* Clear MST status on connections */
for(node = connection_tree->head; node; node = node->next) {
/* Clear MST status on connections */
for(node = connection_tree->head; node; node = node->next) {
@@
-148,8
+146,7
@@
void mst_kruskal(void)
Running time: O(E)
*/
Running time: O(E)
*/
-void sssp_bfs(void)
-{
+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;
@@
-161,8
+158,6
@@
void sssp_bfs(void)
char *envp[7];
int i;
char *envp[7];
int i;
- cp();
-
todo_list = list_alloc(NULL);
/* Clear visited status on nodes */
todo_list = list_alloc(NULL);
/* Clear visited status on nodes */
@@
-247,17
+242,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;
@@
-292,12
+287,16
@@
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);
}
}
}
}
}
}
-void graph(void)
-{
+void graph(void) {
subnet_cache_flush();
sssp_bfs();
mst_kruskal();
subnet_cache_flush();
sssp_bfs();
mst_kruskal();
@@
-312,8
+311,7
@@
void graph(void)
dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
*/
dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
*/
-void dump_graph(void)
-{
+void dump_graph(void) {
avl_node_t *node;
node_t *n;
edge_t *e;
avl_node_t *node;
node_t *n;
edge_t *e;