Remove "release-" from displayed git version.

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index e1d2051..4760162 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -21,7 +21,6 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
@@ -38,14 +37,19 @@
 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", ADD_EDGE, rand(),
+       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);
+                                        e->options, e->weight, local_address, local_port);
+
        free(address);
        free(port);
+       free(local_address);
+       free(local_port);
 
        return x;
 }
@@ -57,12 +61,15 @@ bool add_edge_h(connection_t *c, const char *request) {
        char to_name[MAX_STRING_SIZE];
        char to_address[MAX_STRING_SIZE];
        char to_port[MAX_STRING_SIZE];
-       sockaddr_t address;
+       char address_local[MAX_STRING_SIZE] = "unknown";
+       char port_local[MAX_STRING_SIZE] = "unknown";
+       sockaddr_t address, local_address;
        uint32_t options;
        int weight;
 
-       if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
-                         from_name, to_name, to_address, to_port, &options, &weight) != 6) {
+       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;
@@ -110,13 +117,14 @@ bool add_edge_h(connection_t *c, const char *request) {
        /* Convert addresses */
 
        address = str2sockaddr(to_address, to_port);
+       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(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address) || sockaddrcmp(&e->local_address, &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);
@@ -146,6 +154,7 @@ bool add_edge_h(connection_t *c, const char *request) {
        e->from = from;
        e->to = to;
        e->address = address;
+       e->local_address = local_address;
        e->options = options;
        e->weight = weight;
        edge_add(e);
@@ -231,7 +240,7 @@ bool del_edge_h(connection_t *c, const char *request) {
                logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
                                   "DEL_EDGE", c->name, c->hostname);
                contradicting_del_edge++;
-               send_add_edge(c, e);    /* Send back a correction */
+               send_add_edge(c, e);    /* Send back a correction */
                return true;
        }