Merge branch 'master' into 1.1

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index 2ef28b5..862bd69 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -20,6 +20,7 @@
 
 #include "system.h"
 
+#include "control_common.h"
 #include "splay_tree.h"
 #include "logger.h"
 #include "net.h"
@@ -61,6 +62,7 @@ void exit_nodes(void) {
 node_t *new_node(void) {
        node_t *n = xmalloc_and_zero(sizeof *n);
 
+       if(replaywin) n->late = xmalloc_and_zero(replaywin);
        n->subnet_tree = new_subnet_tree();
        n->edge_tree = new_edge_tree();
        n->mtu = MTU;
@@ -91,6 +93,9 @@ void free_node(node_t *n) {
        if(n->name)
                free(n->name);
 
+       if(n->late)
+               free(n->late);
+
        free(n);
 }
 
@@ -154,19 +159,18 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
        }
 }
 
-int dump_nodes(struct evbuffer *out) {
+bool dump_nodes(connection_t *c) {
        splay_node_t *node;
        node_t *n;
 
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
-               if(evbuffer_add_printf(out, " %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n",
+               send_request(c, "%d %d %s at %s cipher %d digest %d maclength %zd compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)", CONTROL, REQ_DUMP_NODES,
                           n->name, n->hostname, cipher_get_nid(&n->outcipher),
                           digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
                           n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-                          n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu) == -1)
-                       return errno;
+                          n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
        }
 
-       return 0;
+       return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
 }