From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Sat, 12 Dec 2009 15:44:38 +0000 (+0100)
Subject: Use nanoseconds in timevals in cmdmon protocol
X-Git-Tag: 1.24-pre1~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84f8463f2ac2297e96131144f259b26bc4e7447f;p=thirdparty%2Fchrony.git

Use nanoseconds in timevals in cmdmon protocol
---

diff --git a/candm.h b/candm.h
index 7eb60427..9f448080 100644
--- a/candm.h
+++ b/candm.h
@@ -96,7 +96,7 @@
 typedef struct {
   uint32_t tv_sec_high;
   uint32_t tv_sec_low;
-  uint32_t tv_usec;
+  uint32_t tv_nsec;
 } Timeval;
 
 /* This is used in tv_sec_high for 32-bit timestamps */
diff --git a/util.c b/util.c
index 199733be..7ee93b8c 100644
--- a/util.c
+++ b/util.c
@@ -493,7 +493,7 @@ UTI_TimevalNetworkToHost(Timeval *src, struct timeval *dest)
 {
   uint32_t sec_low, sec_high;
 
-  dest->tv_usec = ntohl(src->tv_usec);
+  dest->tv_usec = ntohl(src->tv_nsec) / 1000;
   sec_high = ntohl(src->tv_sec_high);
   sec_low = ntohl(src->tv_sec_low);
 
@@ -514,7 +514,7 @@ UTI_TimevalNetworkToHost(Timeval *src, struct timeval *dest)
 void
 UTI_TimevalHostToNetwork(struct timeval *src, Timeval *dest)
 {
-  dest->tv_usec = htonl(src->tv_usec);
+  dest->tv_nsec = htonl(src->tv_usec * 1000);
   if (sizeof (time_t) > 4)
     dest->tv_sec_high = htonl(src->tv_sec >> 16 >> 16);
   else