sockaddr2str(&e->local_address, &local_address, &local_port);
x = send_request(c, "%d %x %s %s %s %s %x %d %s %s", ADD_EDGE, rand(),
- e->from->name, e->to->name, address, port,
- e->options, e->weight, local_address, local_port);
+ e->from->name, e->to->name, address, port,
+ e->options, e->weight, local_address, local_port);
free(local_address);
free(local_port);
} else {
x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
- e->from->name, e->to->name, address, port,
- e->options, e->weight);
+ e->from->name, e->to->name, address, port,
+ e->options, e->weight);
}
free(address);
int weight;
int parameter_count = sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d "MAX_STRING" "MAX_STRING,
- from_name, to_name, to_address, to_port, &options, &weight, address_local, port_local);
- if (parameter_count != 6 && parameter_count != 8) {
+ from_name, to_name, to_address, to_port, &options, &weight, address_local, port_local);
+
+ if(parameter_count != 6 && parameter_count != 8) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
- c->hostname);
+ c->hostname);
return false;
}
/* Check if names are valid */
- if(!check_id(from_name) || !check_id(to_name)) {
+ if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
- c->hostname, "invalid name");
+ c->hostname, "invalid name");
return false;
}
- if(seen_request(request))
+ if(seen_request(request)) {
return true;
+ }
/* Lookup nodes */
to = lookup_node(to_name);
if(tunnelserver &&
- from != myself && from != c->node &&
- to != myself && to != c->node) {
+ from != myself && from != c->node &&
+ to != myself && to != c->node) {
/* ignore indirect edge registrations for tunnelserver */
logger(DEBUG_PROTOCOL, LOG_WARNING,
- "Ignoring indirect %s from %s (%s)",
- "ADD_EDGE", c->name, c->hostname);
+ "Ignoring indirect %s from %s (%s)",
+ "ADD_EDGE", c->name, c->hostname);
return true;
}
/* Convert addresses */
address = str2sockaddr(to_address, to_port);
- if(parameter_count >= 8)
+
+ if(parameter_count >= 8) {
local_address = str2sockaddr(address_local, port_local);
+ }
/* Check if edge already exists */
e = lookup_edge(from, to);
if(e) {
- if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &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(e->weight != weight) {
- avl_node_t *node = avl_unlink(edge_weight_tree, e);
- e->weight = weight;
- avl_insert_node(edge_weight_tree, node);
- }
-
- goto done;
- }
- } else if(sockaddrcmp(&e->local_address, &local_address)) {
- if(from == myself) {
- if(e->local_address.sa.sa_family && local_address.sa.sa_family) {
- // Someone has the wrong local address for ourself. Correct then.
- 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;
- }
- // Otherwise, just ignore it.
- sockaddrfree(&local_address);
- return true;
- } 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;
-
- // Tell others about it.
- if(!tunnelserver)
- forward_request(c, request);
-
- return true;
- } else {
- sockaddrfree(&local_address);
- return true;
- }
- } else {
+ bool new_address = sockaddrcmp(&e->address, &address);
+ // 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
+ bool new_local_address = local_address.sa.sa_family && local_address.sa.sa_family != AF_UNKNOWN &&
+ sockaddrcmp(&e->local_address, &local_address);
+
+ 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);
+ sockaddrfree(&local_address);
+ return true;
+ }
+
+ 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(new_address) {
+ sockaddrfree(&e->address);
+ e->address = address;
+ } else {
+ sockaddrfree(&address);
+ }
+
+ if(new_local_address) {
+ sockaddrfree(&e->local_address);
+ e->local_address = local_address;
+ } else {
+ sockaddrfree(&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);
+ }
} else if(from == myself) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
- "ADD_EDGE", c->name, c->hostname);
+ "ADD_EDGE", c->name, c->hostname);
contradicting_add_edge++;
e = new_edge();
e->from = from;
e->to = to;
send_del_edge(c, e);
free_edge(e);
+ sockaddrfree(&address);
sockaddrfree(&local_address);
return true;
+ } else {
+ e = new_edge();
+ e->from = from;
+ e->to = to;
+ e->address = address;
+ e->local_address = local_address;
+ e->options = options;
+ e->weight = weight;
+ edge_add(e);
}
- e = new_edge();
- e->from = from;
- e->to = to;
- e->address = address;
- e->local_address = local_address;
- e->options = options;
- e->weight = weight;
- edge_add(e);
-
-done:
/* Tell the rest about the new edge */
- if(!tunnelserver)
+ if(!tunnelserver) {
forward_request(c, request);
+ }
/* Run MST before or after we tell the rest? */
bool send_del_edge(connection_t *c, const edge_t *e) {
return send_request(c, "%d %x %s %s", DEL_EDGE, rand(),
- e->from->name, e->to->name);
+ e->from->name, e->to->name);
}
bool del_edge_h(connection_t *c, const char *request) {
if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
- c->hostname);
+ c->hostname);
return false;
}
/* Check if names are valid */
- if(!check_id(from_name) || !check_id(to_name)) {
+ if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
- c->hostname, "invalid name");
+ c->hostname, "invalid name");
return false;
}
- if(seen_request(request))
+ if(seen_request(request)) {
return true;
+ }
/* Lookup nodes */
to = lookup_node(to_name);
if(tunnelserver &&
- from != myself && from != c->node &&
- to != myself && to != c->node) {
+ from != myself && from != c->node &&
+ to != myself && to != c->node) {
/* ignore indirect edge registrations for tunnelserver */
logger(DEBUG_PROTOCOL, LOG_WARNING,
- "Ignoring indirect %s from %s (%s)",
- "DEL_EDGE", c->name, c->hostname);
+ "Ignoring indirect %s from %s (%s)",
+ "DEL_EDGE", c->name, c->hostname);
return true;
}
if(!from) {
logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
- "DEL_EDGE", c->name, c->hostname);
+ "DEL_EDGE", c->name, c->hostname);
return true;
}
if(!to) {
logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
- "DEL_EDGE", c->name, c->hostname);
+ "DEL_EDGE", c->name, c->hostname);
return true;
}
if(!e) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not appear in the edge tree",
- "DEL_EDGE", c->name, c->hostname);
+ "DEL_EDGE", c->name, c->hostname);
return true;
}
if(e->from == myself) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
- "DEL_EDGE", c->name, c->hostname);
+ "DEL_EDGE", c->name, c->hostname);
contradicting_del_edge++;
send_add_edge(c, e); /* Send back a correction */
return true;
/* Tell the rest about the deleted edge */
- if(!tunnelserver)
+ if(!tunnelserver) {
forward_request(c, request);
+ }
/* Delete the edge */
if(!to->status.reachable) {
e = lookup_edge(to, myself);
+
if(e) {
- if(!tunnelserver)
+ if(!tunnelserver) {
send_del_edge(everyone, e);
+ }
+
edge_del(e);
}
}
projects / tinc / blobdiff