j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

This commit implements average RTT estimation based on PING-PONG between active TCP connections.

Browse source 
Average RTT can be used to update edge weight and propagate it to the network.
tinc dump edges has been also extended to give the current RTT.
New edge weight will change only if the config has EdgeUpdateInterval set to other value than 0.

- Ignore local configuration for editors
- Extended manpage with informations about EdgeUpdateInterval
- Added clone_edge and fixed potential segfault when b->from not defined
- Compute avg_rtt based on the time values we got back in PONG
- Add avg_rtt on dump edge
- Send current time on PING and return it on PONG
- Changed last_ping_time to struct timeval
- Extended edge_t with avg_rtt
This commit is contained in:
thorkill 2015-04-11 15:27:28 +02:00
parent 9910f8f2d1
commit 0cd387fd90
14 changed files with 149 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/protocol_misc.c
View file

@ -89,13 +89,26 @@ bool termreq_h(connection_t *c, const char *request) {
bool send_ping(connection_t *c) {
c->status.pinged = true;
c->last_ping_time = now.tv_sec;
c->last_ping_time = now;
return send_request(c, "%d", PING);
return send_request(c, "%d %d %d", PING, c->last_ping_time.tv_sec, c->last_ping_time.tv_usec);
}
bool ping_h(connection_t *c, const char *request) {
return send_pong(c);
int tv_sec, tv_usec, ret;
ret = sscanf(request, "%*d %d %d", &tv_sec, &tv_usec);
if (ret == 2) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Got PING from %s (%s) %d", c->name, request, ret);
return send_pong_v2(c, tv_sec, tv_usec);
} else {
return send_pong(c);
}
}
bool send_pong_v2(connection_t *c, int tv_sec, int tv_usec) {
return send_request(c, "%d %d %d", PONG, tv_sec, tv_usec);
}
bool send_pong(connection_t *c) {
@ -103,8 +116,37 @@ bool send_pong(connection_t *c) {
}
bool pong_h(connection_t *c, const char *request) {
int current_rtt = 0;
int tv_sec, tv_usec, ret;
struct timeval _now;
c->status.pinged = false;
ret = sscanf(request, "%*d %d %d", &tv_sec, &tv_usec);
gettimeofday(&_now, NULL);
if (ret != 2) {
/* We got PONG from older node */
tv_sec = c->last_ping_time.tv_sec;
tv_usec = c->last_ping_time.tv_usec;
}
/* RTT should be in ms */
current_rtt = (_now.tv_sec - tv_sec)*1000;
/* Compute diff between usec */
current_rtt += _now.tv_usec >= tv_usec ? _now.tv_usec - tv_usec : tv_usec - _now.tv_usec;
current_rtt = current_rtt/1000;
if (c->edge->avg_rtt == 0)
c->edge->avg_rtt = current_rtt;
else
c->edge->avg_rtt = (current_rtt + c->edge->avg_rtt)/2;
if (c->edge->reverse) {
c->edge->reverse->avg_rtt = c->edge->avg_rtt;
}
/* Succesful connection, reset timeout if this is an outgoing connection. */
if(c->outgoing) {