summary refs log tree commit diff stats
path: root/src/common/util.c
diff options
context:
space:
mode:
authorDiogo Sousa <diogogsousa@gmail.com>2014-01-27 20:24:56 +0000
committerDiogo Sousa <diogogsousa@gmail.com>2014-01-30 19:23:35 +0000
commit9969282c72f838004fe3d75f06db48072b0fbfeb (patch)
tree70ef95eff34cb08db09cc0b53416198dbe5f58ea /src/common/util.c
parent1d6d737927d4e99333a8e6ae26b44ca959fc1cd9 (diff)
Now make_ping_time() in common/util.c returns the time in milliseconds instead
of microseconds.
In fe_set_lag(serv, lag) the lag argument is now in milliseconds as well.

Fixes #758.
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 6e912169..f999e61f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1459,7 +1459,7 @@ make_ping_time (void)
 	GTimeVal timev;
 	g_get_current_time (&timev);
 #endif
-	return (timev.tv_sec - 50000) * 1000000 + timev.tv_usec;
+	return (timev.tv_sec - 50000) * 1000 + timev.tv_usec/1000;
 }