Improve performance of edge updates.

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 0879613..5553f43 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -142,8 +142,19 @@ bool add_edge_h(connection_t *c, const char *request) {
                        } else {
                                logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
                                                   "ADD_EDGE", c->name, c->hostname);
-                               edge_del(e);
+                               e->options = options;
+                               if(sockaddrcmp(&e->address, &address)) {
+                                       sockaddrfree(&e->address);
+                                       e->address = address;
+                               }
+                               if(e->weight != weight) {
+                                       avl_node_t *node = avl_unlink(edge_weight_tree, e);
+                                       e->weight = weight;
+                                       avl_insert_node(edge_weight_tree, node);
+                               }
+
                                graph();
+                               return true;
                        }
                } else if(sockaddrcmp(&e->local_address, &local_address)) {
                        if(from == myself) {
@@ -158,8 +169,11 @@ bool add_edge_h(connection_t *c, const char *request) {
                                // Otherwise, just ignore it.
                                sockaddrfree(&local_address);
                                return true;
-                       } else if(local_address.sa.sa_family) {
+                       } else if(local_address.sa.sa_family && local_address.sa.sa_family != AF_UNKNOWN) {
                                // We learned a new local address for this edge.
+                               // local_address.sa.sa_family will be 0 if we got it from older tinc versions
+                               // local_address.sa.sa_family will be 255 (AF_UNKNOWN) if we got it from newer versions
+                               // but for edge which does not have local_address
                                sockaddrfree(&e->local_address);
                                e->local_address = local_address;
 
@@ -168,6 +182,9 @@ bool add_edge_h(connection_t *c, const char *request) {
                                        forward_request(c, request);
 
                                return true;
+                       } else {
+                               sockaddrfree(&local_address);
+                               return true;
                        }
                } else {
                        sockaddrfree(&local_address);