projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
bea23c7
..
4ec5d35
100644
(file)
--- a/
src/node.c
+++ b/
src/node.c
@@
-80,6
+80,7
@@
node_t *new_node(void) {
n->edge_tree = new_edge_tree();
n->mtu = MTU;
n->maxmtu = MTU;
n->edge_tree = new_edge_tree();
n->mtu = MTU;
n->maxmtu = MTU;
+ n->udp_ping_rtt = -1;
return n;
}
return n;
}
@@
-211,7
+212,7
@@
bool dump_nodes(connection_t *c) {
}
id[sizeof(id) - 1] = 0;
}
id[sizeof(id) - 1] = 0;
- send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld
"
, CONTROL, REQ_DUMP_NODES,
+ send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld
%d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64
, CONTROL, REQ_DUMP_NODES,
n->name, id, n->hostname ? : "unknown port unknown",
#ifdef DISABLE_LEGACY
0, 0, 0,
n->name, id, n->hostname ? : "unknown port unknown",
#ifdef DISABLE_LEGACY
0, 0, 0,
@@
-220,7
+221,8
@@
bool dump_nodes(connection_t *c) {
#endif
n->outcompression, n->options, bitfield_to_int(&n->status, sizeof(n->status)),
n->nexthop ? n->nexthop->name : "-", n->via ? n->via->name ? : "-" : "-", n->distance,
#endif
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, (long)n->last_state_change);
+ n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change, n->udp_ping_rtt,
+ n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
}
return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
}
return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);