bool send_add_edge(connection_t *c, const edge_t *e) {
bool x;
char *address, *port;
- char *local_address, *local_port;
sockaddr2str(&e->address, &address, &port);
- 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);
+ if(e->local_address.sa.sa_family) {
+ char *local_address, *local_port;
+ 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);
+ 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);
+ }
free(address);
free(port);
- free(local_address);
- free(local_port);
return x;
}
char to_name[MAX_STRING_SIZE];
char to_address[MAX_STRING_SIZE];
char to_port[MAX_STRING_SIZE];
- char address_local[MAX_STRING_SIZE] = "unknown";
- char port_local[MAX_STRING_SIZE] = "unknown";
- sockaddr_t address, local_address;
+ char address_local[MAX_STRING_SIZE];
+ char port_local[MAX_STRING_SIZE];
+ sockaddr_t address, local_address = {{0}};
uint32_t options;
int weight;
/* Convert addresses */
address = str2sockaddr(to_address, to_port);
- local_address = str2sockaddr(address_local, port_local);
+ 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) || sockaddrcmp(&e->local_address, &local_address)) {
+ 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);
- edge_del(e);
- graph();
+ e->options = options;
+ if(sockaddrcmp(&e->address, &address)) {
+ sockaddrfree(&e->address);
+ e->address = 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
+ } 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 {
+ sockaddrfree(&local_address);
return true;
+ }
} 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);
e->to = to;
send_del_edge(c, e);
free_edge(e);
+ sockaddrfree(&local_address);
return true;
}
e->weight = weight;
edge_add(e);
+done:
/* Tell the rest about the new edge */
if(!tunnelserver)