-int add_edge_h(connection_t *c)
-{
- connection_t *other;
- edge_t *e;
- node_t *from, *to;
- char from_name[MAX_STRING_SIZE];
- char to_name[MAX_STRING_SIZE];
- char from_addrstr[MAX_STRING_SIZE];
- char to_addrstr[MAX_STRING_SIZE];
- ipv4_t from_address, to_address;
- port_t from_port, to_port;
- long int options;
- int weight;
- avl_node_t *node;
-cp
- if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %hd "MAX_STRING" "MAX_STRING" %hd %lx %d",
- from_name, from_addrstr, &from_port,
- to_name, to_addrstr, &to_port,
- &options, &weight) != 8)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
- return -1;
- }
-
- /* Check if names are valid */
-
- if(check_id(from_name))
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
- return -1;
- }
-
- if(check_id(to_name))
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
- return -1;
- }
-
- /* Lookup nodes */
-
- from = lookup_node(from_name);
-
- if(!from)
- {
- from = new_node();
- from->name = xstrdup(from_name);
- node_add(from);
- }
-
- to = lookup_node(to_name);
-
- if(!to)
- {
- to = new_node();
- to->name = xstrdup(to_name);
- node_add(to);
- }
-
- /* Convert addresses */
-
- from_address = str2address(from_addrstr);
- to_address = str2address(to_addrstr);
-
- /* Check if edge already exists */
-
- e = lookup_edge(from, to);
-
- if(e)
- {
- if(e->weight != weight || e->options != options
- || ((e->from.node == from) && (e->from.address != from_address || e->from.port != from_port || e->to.address != to_address || e->to.port != to_port))
- || ((e->from.node == to) && (e->from.address != to_address || e->from.port != to_port || e->to.address != from_address || e->to.port != from_port))
- )
- {
- if(from == myself || to == myself)
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(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);
- return 0;
- }
- else
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
- edge_del(e);
- }
- }
- else
- return 0;
- }
- else if(from == myself || to == myself)
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"), "ADD_EDGE", c->name, c->hostname);
- e = new_edge();
- e->from.node = from;
- e->to.node = to;
- send_del_edge(c, e);
- free_edge(e);
- return 0;
- }
-
-
-
- e = new_edge();
- e->from.node = from;
- e->from.address = from_address;
- e->from.port = from_port;
- e->to.node = to;
- e->to.address = to_address;
- e->to.port = to_port;
- e->options = options;
- e->weight = weight;
- edge_add(e);
-
- /* Tell the rest about the new edge */
-
- for(node = connection_tree->head; node; node = node->next)
- {
- other = (connection_t *)node->data;
- if(other->status.active && other != c)
- send_add_edge(other, e);
- }
-
- /* Run MST before or after we tell the rest? */
-
- graph();
-cp
- return 0;
+bool add_edge_h(connection_t *c, const char *request) {
+ edge_t *e;
+ node_t *from, *to;
+ char from_name[MAX_STRING_SIZE];
+ char to_name[MAX_STRING_SIZE];
+ char to_address[MAX_STRING_SIZE];
+ char to_port[MAX_STRING_SIZE];
+ char address_local[MAX_STRING_SIZE];
+ char port_local[MAX_STRING_SIZE];
+ sockaddr_t address, local_address = {0};
+ uint32_t options;
+ 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) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
+ c->hostname);
+ return false;
+ }
+
+ /* Check if names are valid */
+
+ 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");
+ return false;
+ }
+
+ if(seen_request(request)) {
+ return true;
+ }
+
+ /* Lookup nodes */
+
+ from = lookup_node(from_name);
+ to = lookup_node(to_name);
+
+ if(tunnelserver &&
+ 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);
+ return true;
+ }
+
+ if(!from) {
+ from = new_node();
+ from->name = xstrdup(from_name);
+ node_add(from);
+ }
+
+ if(!to) {
+ to = new_node();
+ to->name = xstrdup(to_name);
+ node_add(to);
+ }
+
+
+ /* Convert addresses */
+
+ address = str2sockaddr(to_address, to_port);
+
+ if(parameter_count >= 8) {
+ local_address = str2sockaddr(address_local, port_local);
+ }
+
+ /* Check if edge already exists */
+
+ e = lookup_edge(from, to);
+
+ if(e) {
+ 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);
+ 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);
+ }
+
+ /* Tell the rest about the new edge */
+
+ if(!tunnelserver) {
+ forward_request(c, request);
+ }
+
+ /* Run MST before or after we tell the rest? */
+
+ graph();
+
+ return true;