From 2b938987717b2128c2dcb984563bf876add6f0f7 Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Fri, 24 Apr 2020 10:28:54 -0400 Subject: [PATCH] napatech: Correct timestamp rounding issue This commit fixes the conversion of timestamps. Without the extra parens, the resulting timestamp value for usecs will be 1 or 0 due to the operator precedence order (+ takes precedence over ?:) --- src/source-napatech.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/source-napatech.c b/src/source-napatech.c index f84482d5f2..84fd2788ed 100644 --- a/src/source-napatech.c +++ b/src/source-napatech.c @@ -918,7 +918,7 @@ TmEcode NapatechPacketLoop(ThreadVars *tv, void *data, void *slot) switch (NT_NET_GET_PKT_TIMESTAMP_TYPE(packet_buffer)) { case NT_TIMESTAMP_TYPE_NATIVE_UNIX: p->ts.tv_sec = pkt_ts / 100000000; - p->ts.tv_usec = ((pkt_ts % 100000000) / 100) + (pkt_ts % 100) > 50 ? 1 : 0; + p->ts.tv_usec = ((pkt_ts % 100000000) / 100) + ((pkt_ts % 100) > 50 ? 1 : 0); break; case NT_TIMESTAMP_TYPE_PCAP: p->ts.tv_sec = pkt_ts >> 32; @@ -926,12 +926,12 @@ TmEcode NapatechPacketLoop(ThreadVars *tv, void *data, void *slot) break; case NT_TIMESTAMP_TYPE_PCAP_NANOTIME: p->ts.tv_sec = pkt_ts >> 32; - p->ts.tv_usec = ((pkt_ts & 0xFFFFFFFF) / 1000) + (pkt_ts % 1000) > 500 ? 1 : 0; + p->ts.tv_usec = ((pkt_ts & 0xFFFFFFFF) / 1000) + ((pkt_ts % 1000) > 500 ? 1 : 0); break; case NT_TIMESTAMP_TYPE_NATIVE_NDIS: /* number of seconds between 1/1/1601 and 1/1/1970 */ p->ts.tv_sec = (pkt_ts / 100000000) - 11644473600; - p->ts.tv_usec = ((pkt_ts % 100000000) / 100) + (pkt_ts % 100) > 50 ? 1 : 0; + p->ts.tv_usec = ((pkt_ts % 100000000) / 100) + ((pkt_ts % 100) > 50 ? 1 : 0); break; default: SCLogError(SC_ERR_NAPATECH_TIMESTAMP_TYPE_NOT_SUPPORTED, -- 2.47.2