j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

list_each shadowed node

Browse source 
move it into the loop
This commit is contained in:
thorkill 2015-07-05 22:32:32 +02:00
parent 841ca358e0
commit 7dc8c736bc
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/net_setup.c
View file

@ -329,7 +329,6 @@ void regenerate_key(void) {
} }
void update_edge_weight(void) { void update_edge_weight(void) {
splay_node_t node;
logger(DEBUG_STATUS, LOG_INFO, "Update edge weight"); logger(DEBUG_STATUS, LOG_INFO, "Update edge weight");
for list_each(connection_t, c, connection_list) { for list_each(connection_t, c, connection_list) {
@ -337,11 +336,15 @@ void update_edge_weight(void) {
continue; continue;
if (c->edge->avg_rtt && (c->edge->weight != c->edge->avg_rtt*10)) { if (c->edge->avg_rtt && (c->edge->weight != c->edge->avg_rtt*10)) {
splay_node_t *node = splay_unlink(edge_weight_tree, c->edge);
if (!node)
continue;
logger(DEBUG_STATUS, LOG_INFO, "update_edge_weight(): %s -> %s (%d -> %d)", c->edge->from->name, logger(DEBUG_STATUS, LOG_INFO, "update_edge_weight(): %s -> %s (%d -> %d)", c->edge->from->name,
c->edge->to->name, c->edge->to->name,
c->edge->weight, c->edge->weight,
c->edge->avg_rtt*10); c->edge->avg_rtt*10);
node = splay_unlink(edge_weight_tree, c->edge);
/* avg_rtt is in ms */ /* avg_rtt is in ms */
c->edge->weight = c->edge->avg_rtt*10; c->edge->weight = c->edge->avg_rtt*10;
node->data = c->edge; node->data = c->edge;