Check if an event is initialized before calling event_del().

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index 9281178..3ec9fab 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -85,7 +85,8 @@ void free_node(node_t *n) {
        cipher_close(&n->outcipher);
        digest_close(&n->outdigest);
 
-       event_del(&n->mtuevent);
+       if(timeout_initialized(&n->mtuevent))
+               event_del(&n->mtuevent);
        
        if(n->hostname)
                free(n->hostname);
@@ -179,3 +180,16 @@ bool dump_nodes(connection_t *c) {
 
        return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
 }
+
+bool dump_traffic(connection_t *c) {
+       splay_node_t *node;
+       node_t *n;
+
+       for(node = node_tree->head; node; node = node->next) {
+               n = node->data;
+               send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC,
+                          n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
+       }
+
+       return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
+}