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

pong handler: fix incorrect calculation for rtt

Browse source 
Before this fix seconds were treated as milliseconds.

Example:

A ping of 1.001s resulted in current_rtt = 2 (ms)
where a ping of 0.999s resulted in current_rtt = 999 (ms).
This commit is contained in:
lemoer 2016-05-18 21:32:24 +02:00
parent 762dc69a59
commit 532b9ca451
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/protocol_misc.c
View file

@ -150,12 +150,11 @@ bool pong_h(connection_t *c, const char *request) {
logger(DEBUG_ALWAYS, LOG_ERR, "bogus pong received from %s (%s)", c->name, c->hostname);
return false;
}
/* 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;
/* current_rtt should be in ms */
current_rtt += (_now.tv_sec - tv_sec) * 1000;
/* Compute diff between usec */
current_rtt += (_now.tv_usec - tv_usec) / 1000;
if (c->edge->avg_rtt == 0)
c->edge->avg_rtt = current_rtt;