X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=4fc36e40d4aa7b270e8513c9b213f5084cadc6ac;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=f5aa0994412e2b0416467cf03ada7ce423cc3f6b;hpb=483c5dcfb43719e5fd50902641252e28a04fd74e;p=tinc diff --git a/src/edge.c b/src/edge.c index f5aa0994..4fc36e40 100644 --- a/src/edge.c +++ b/src/edge.c @@ -29,7 +29,7 @@ #include "utils.h" #include "xalloc.h" -splay_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */ +splay_tree_t *edge_weight_tree; static int edge_compare(const edge_t *a, const edge_t *b) { return strcmp(a->to->name, b->to->name); @@ -99,7 +99,7 @@ void edge_del(edge_t *e) { edge_t *lookup_edge(node_t *from, node_t *to) { edge_t v; - + v.from = from; v.to = to; @@ -107,17 +107,10 @@ edge_t *lookup_edge(node_t *from, node_t *to) { } bool dump_edges(connection_t *c) { - 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); - send_request(c, "%d %d %s to %s at %s options %x weight %d", + 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);