Cleanup local_address in protocol_edge.c

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 76e6eb4..0879613 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -37,19 +37,26 @@
 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;
 }
@@ -130,6 +137,7 @@ bool add_edge_h(connection_t *c, const char *request) {
                                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",
@@ -144,9 +152,11 @@ bool add_edge_h(connection_t *c, const char *request) {
                                        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) {
                                // We learned a new local address for this edge.
@@ -159,8 +169,10 @@ bool add_edge_h(connection_t *c, const char *request) {
 
                                return true;
                        }
-               } else
+               } 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);
@@ -170,6 +182,7 @@ bool add_edge_h(connection_t *c, const char *request) {
                e->to = to;
                send_del_edge(c, e);
                free_edge(e);
+               sockaddrfree(&local_address);
                return true;
        }