- if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address) || new_local_address) {
- if(from == myself) {
- logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
- "ADD_EDGE", c->name, c->hostname);
- send_add_edge(c, e);
- sockaddrfree(&local_address);
- return true;
- } else {
- logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
- "ADD_EDGE", c->name, c->hostname);
- e->options = options;
- if(sockaddrcmp(&e->address, &address)) {
- sockaddrfree(&e->address);
- e->address = address;
- }
- if(new_local_address) {
- sockaddrfree(&e->local_address);
- e->local_address = local_address;
- }
- if(e->weight != weight) {
- splay_node_t *node = splay_unlink(edge_weight_tree, e);
- e->weight = weight;
- splay_insert_node(edge_weight_tree, node);
- }
-
- goto done;
- }
- } else {
+ if(e->weight == weight && e->options == options && !new_address && !new_local_address) {
+ sockaddrfree(&address);
+ sockaddrfree(&local_address);
+ return true;
+ }
+
+ if(from == myself) {
+ logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
+ "ADD_EDGE", c->name, c->hostname);
+ send_add_edge(c, e);
+ sockaddrfree(&address);