akcom-udpechod: cleaning up logging for dropped or invalid packets

1 files changed, 31 insertions, 13 deletions

diff --git a/src/akcom-udpechod.c b/src/akcom-udpechod.c
index b7141fe..715d9b1 100644
--- a/src/akcom-udpechod.c
+++ b/src/akcom-udpechod.c
@@ -757,19 +757,37 @@ int my_log_conn(int mode, size_t * connp, union my_sa * sap,
    // log connection
    if ((cnf_echoplus))
    {
-      syslog(LOG_INFO,
-         "conn %zu: client: [%s]:%hu; %s bytes: %zi; timestamp: %lu.%09lu; seq: %u; delta: %u us; delay: %u us;",
-         *connp,
-         addr_str,
-         port,
-         mode_name,
-         ssize,
-         tsp->tv_sec,
-         tsp->tv_nsec,
-         ntohl(msgp->req_sn),
-         ntohl(msgp->reply_time) - ntohl(msgp->recv_time),
-         delay
-      );
+      if (mode == MY_SENT)
+      {
+         syslog(LOG_INFO,
+            "conn %zu: client: [%s]:%hu; %s bytes: %zi; timestamp: %lu.%09lu; seq: %u; delay: %u.%03u ms; delta: %u.%03u ms;",
+            *connp,
+            addr_str,
+            port,
+            mode_name,
+            ssize,
+            tsp->tv_sec,
+            tsp->tv_nsec,
+            ntohl(msgp->req_sn),
+            (delay/1000),
+            (delay%1000),
+            (ntohl(msgp->reply_time) - ntohl(msgp->recv_time))/1000,
+            (ntohl(msgp->reply_time) - ntohl(msgp->recv_time))%1000
+         );
+      } else
+      {
+         syslog(LOG_INFO,
+            "conn %zu: client: [%s]:%hu; %s bytes: %zi; timestamp: %lu.%09lu; seq: %u;",
+            *connp,
+            addr_str,
+            port,
+            mode_name,
+            ssize,
+            tsp->tv_sec,
+            tsp->tv_nsec,
+            ntohl(msgp->req_sn)
+         );
+      };
    } else
    {
       syslog(LOG_INFO,