X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=2eaae5d10c8780c59937d1dd028545c47d5fdd12;hp=fd033273296a41217e59551ea18145d7dc7b57b7;hb=91355b9ac5a80d6d7da6951a72ea0c22651bdfa8;hpb=70a1a5594af5d4e6a364186b42ba4e34c676009b diff --git a/src/edge.c b/src/edge.c index fd033273..2eaae5d1 100644 --- a/src/edge.c +++ b/src/edge.c @@ -1,6 +1,6 @@ /* edge.c -- edge tree management - Copyright (C) 2000-2012 Guus Sliepen , + Copyright (C) 2000-2013 Guus Sliepen , 2000-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -70,7 +70,7 @@ void exit_edges(void) { /* Creation and deletion of connection elements */ edge_t *new_edge(void) { - return xmalloc_and_zero(sizeof(edge_t)); + return xzalloc(sizeof(edge_t)); } void free_edge(edge_t *e) { @@ -110,11 +110,13 @@ bool dump_edges(connection_t *c) { for splay_each(node_t, n, node_tree) { for splay_each(edge_t, e, n->edge_tree) { char *address = sockaddr2hostname(&e->address); - send_request(c, "%d %d %s %s %s %x %d", + char* local_address = sockaddr2hostname(&e->local_address); + send_request(c, "%d %d %s %s %s %s %x %d", CONTROL, REQ_DUMP_EDGES, e->from->name, e->to->name, address, - e->options, e->weight); + local_address, e->options, e->weight); free(address); + free(local_address); } }