aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <david.syzdek@acsalaska.com>2020-02-06 17:31:31 -0900
committerDavid M. Syzdek <david.syzdek@acsalaska.com>2020-02-06 17:31:31 -0900
commita6d9ec4078158cefbcd6f40beb78d8736c8d64c5 (patch)
treee5347d2f66f68c304ec75548fcba0c8b91e23950
parentee9680b00cd2da33af430f27607ee4c6ea01001c (diff)
downloadakcom-udpecho-a6d9ec4078158cefbcd6f40beb78d8736c8d64c5.tar.gz
akcom-udpecho-a6d9ec4078158cefbcd6f40beb78d8736c8d64c5.tar.bz2
akcom-udpecho-a6d9ec4078158cefbcd6f40beb78d8736c8d64c5.tar.xz
akcom-udpecho-a6d9ec4078158cefbcd6f40beb78d8736c8d64c5.zip
Fixing conversion from nanoseconds to microseconds
-rw-r--r--src/akcom-udpechod.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/akcom-udpechod.c b/src/akcom-udpechod.c
index 6c652d3..13078db 100644
--- a/src/akcom-udpechod.c
+++ b/src/akcom-udpechod.c
@@ -799,7 +799,7 @@ int my_loop(int s, size_t * connp)
799 ssize_t ssize; 799 ssize_t ssize;
800 useconds_t delay; 800 useconds_t delay;
801 struct timespec ts; 801 struct timespec ts;
802 uint64_t ms; 802 uint64_t us;
803 struct pollfd fds[2]; 803 struct pollfd fds[2];
804 union my_sa sa; 804 union my_sa sa;
805 union 805 union
@@ -829,8 +829,8 @@ int my_loop(int s, size_t * connp)
829 // grab timestamp 829 // grab timestamp
830 syslog(LOG_DEBUG, "conn %zu: calculating recv timestamp", *connp); 830 syslog(LOG_DEBUG, "conn %zu: calculating recv timestamp", *connp);
831 clock_gettime(CLOCK_REALTIME, &ts); 831 clock_gettime(CLOCK_REALTIME, &ts);
832 ms = (uint64_t)(ts.tv_sec * 1000000000); 832 us = (uint64_t)(ts.tv_sec * 1000000);
833 ms += (uint64_t)ts.tv_nsec; 833 us += (uint64_t)ts.tv_nsec / 1000;
834 834
835 // log connection 835 // log connection
836 my_log_conn(MY_RECV, connp, &sa, &udpbuff.msg, ssize, &ts, 0); 836 my_log_conn(MY_RECV, connp, &sa, &udpbuff.msg, ssize, &ts, 0);
@@ -840,7 +840,7 @@ int my_loop(int s, size_t * connp)
840 { 840 {
841 syslog(LOG_DEBUG, "conn %zu: intializing echo plus header", *connp); 841 syslog(LOG_DEBUG, "conn %zu: intializing echo plus header", *connp);
842 udpbuff.msg.res_sn = udpbuff.msg.req_sn; 842 udpbuff.msg.res_sn = udpbuff.msg.req_sn;
843 udpbuff.msg.recv_time = htonl(ms & 0xFFFFFFFFLL); 843 udpbuff.msg.recv_time = htonl(us & 0xFFFFFFFFLL);
844 udpbuff.msg.failures = 0; 844 udpbuff.msg.failures = 0;
845 }; 845 };
846 846
@@ -867,14 +867,14 @@ int my_loop(int s, size_t * connp)
867 syslog(LOG_DEBUG, "conn %zu: calculating sent timestamp", *connp); 867 syslog(LOG_DEBUG, "conn %zu: calculating sent timestamp", *connp);
868 clock_gettime(CLOCK_REALTIME, &ts); 868 clock_gettime(CLOCK_REALTIME, &ts);
869 ts.tv_nsec++; 869 ts.tv_nsec++;
870 ms = (uint64_t)(ts.tv_sec * 1000000000); 870 us = (uint64_t)(ts.tv_sec * 1000000);
871 ms += (uint64_t)ts.tv_nsec; 871 us += (uint64_t)ts.tv_nsec / 1000;
872 872
873 // send response 873 // send response
874 if ((cnf.echoplus)) 874 if ((cnf.echoplus))
875 { 875 {
876 syslog(LOG_DEBUG, "conn %zu: updating echo plus header", *connp); 876 syslog(LOG_DEBUG, "conn %zu: updating echo plus header", *connp);
877 udpbuff.msg.reply_time = htonl(ms & 0xFFFFFFFFLL); 877 udpbuff.msg.reply_time = htonl(us & 0xFFFFFFFFLL);
878 }; 878 };
879 sendto(s, udpbuff.bytes, (size_t)ssize, 0, &sa.sa, sinlen); 879 sendto(s, udpbuff.bytes, (size_t)ssize, 0, &sa.sa, sinlen);
880 880