X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=be1a6f3c8a57e07815b99fe5da1efe8e980da88a;hb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;hp=80bdddbd1beb055ddd13404e65038459199476b8;hpb=c4afc481541bff4db7f57c81796b7a5f61cdb1b5;p=tinc diff --git a/src/edge.c b/src/edge.c index 80bdddbd..be1a6f3c 100644 --- a/src/edge.c +++ b/src/edge.c @@ -21,6 +21,7 @@ #include "system.h" #include "splay_tree.h" +#include "control_common.h" #include "edge.h" #include "logger.h" #include "netutl.h" @@ -105,27 +106,17 @@ edge_t *lookup_edge(node_t *from, node_t *to) { return splay_search(from->edge_tree, &v); } -int dump_edges(struct evbuffer *out) { - splay_node_t *node, *node2; - node_t *n; - edge_t *e; - char *address; - - for(node = node_tree->head; node; node = node->next) { - n = node->data; - for(node2 = n->edge_tree->head; node2; node2 = node2->next) { - e = node2->data; - address = sockaddr2hostname(&e->address); - if(evbuffer_add_printf(out, - " %s to %s at %s options %x weight %d\n", - e->from->name, e->to->name, address, - e->options, e->weight) == -1) { - free(address); - return errno; - } +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", + CONTROL, REQ_DUMP_EDGES, + e->from->name, e->to->name, address, + e->options, e->weight); free(address); } } - return 0; + return send_request(c, "%d %d", CONTROL, REQ_DUMP_EDGES); }