Fix for botched cherry-pick commit 60fb230.

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 5553f43..dc0cf05 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -148,13 +148,12 @@ bool add_edge_h(connection_t *c, const char *request) {
                                        e->address = address;
                                }
                                if(e->weight != weight) {
-                                       avl_node_t *node = avl_unlink(edge_weight_tree, e);
+                                       splay_node_t *node = splay_unlink(edge_weight_tree, e);
                                        e->weight = weight;
-                                       avl_insert_node(edge_weight_tree, node);
+                                       splay_insert_node(edge_weight_tree, node);
                                }
 
-                               graph();
-                               return true;
+                               goto done;
                        }
                } else if(sockaddrcmp(&e->local_address, &local_address)) {
                        if(from == myself) {
@@ -212,6 +211,7 @@ bool add_edge_h(connection_t *c, const char *request) {
        e->weight = weight;
        edge_add(e);
 
+done:
        /* Tell the rest about the new edge */
 
        if(!tunnelserver)