cipher_close(&n->outcipher);
digest_close(&n->outdigest);
- event_del(&n->mtuevent);
+ ecdh_free(&n->ecdh);
+ ecdsa_free(&n->ecdsa);
+
+ if(timeout_initialized(&n->mtuevent))
+ event_del(&n->mtuevent);
if(n->hostname)
free(n->hostname);
}
node_t *lookup_node(char *name) {
- node_t n = {0};
+ node_t n = {NULL};
n.name = name;
}
node_t *lookup_node_udp(const sockaddr_t *sa) {
- node_t n = {0};
+ node_t n = {NULL};
n.address = *sa;
n.name = NULL;
void update_node_udp(node_t *n, const sockaddr_t *sa) {
if(n == myself) {
- logger(LOG_WARNING, "Trying to update UDP address of myself!\n");
+ logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of myself!");
return;
}
n->address = *sa;
n->hostname = sockaddr2hostname(&n->address);
splay_insert(node_udp_tree, n);
- logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
} else {
memset(&n->address, 0, sizeof n->address);
- n->hostname = 0;
- ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
+ n->hostname = NULL;
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s cleared", n->name);
}
}
for(node = node_tree->head; node; node = node->next) {
n = node->data;
- 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,
+ send_request(c, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", CONTROL, REQ_DUMP_NODES,
n->name, n->hostname, cipher_get_nid(&n->outcipher),
- digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
+ digest_get_nid(&n->outdigest), (int)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);
+ n->via ? n->via->name ?: "-" : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
}
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);
+}