From 658bbbc078a688faa0820d13790215dc09564576 Mon Sep 17 00:00:00 2001 From: Ralph Eastwood Date: Thu, 3 Aug 2023 12:30:42 +0000 Subject: [PATCH] napatech: fix compilation with SCTIME usage This replaces the broken compilation due to the change of SCTime_t into a structure: 9fbe68364259ea71fcd0d22521afcaddefdc744d. --- src/source-napatech.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/source-napatech.c b/src/source-napatech.c index d2fab8add5..6bbfc979bf 100644 --- a/src/source-napatech.c +++ b/src/source-napatech.c @@ -949,23 +949,19 @@ 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 = SCTIME_FROM_SECS(pkt_ts / 100000000); - p->ts += SCTIME_FROM_USECS( + p->ts = SCTIME_ADD_USECS(SCTIME_FROM_USECS(pkt_ts / 100000000), ((pkt_ts % 100000000) / 100) + ((pkt_ts % 100) > 50 ? 1 : 0)); break; case NT_TIMESTAMP_TYPE_PCAP: - p->ts = SCTIME_FROM_SECS(pkt_ts >> 32); - p->ts += SCTIME_FROM_USECS(pkt_ts & 0xFFFFFFFF); + p->ts = SCTIME_ADD_USECS(SCTIME_FROM_USECS(pkt_ts >> 32), pkt_ts & 0xFFFFFFFF); break; case NT_TIMESTAMP_TYPE_PCAP_NANOTIME: - p->ts = SCTIME_FROM_SECS(pkt_ts >> 32); - p->ts += SCTIME_FROM_USECS( + p->ts = SCTIME_ADD_USECS(SCTIME_FROM_USECS(pkt_ts >> 32), ((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 = SCTIME_FROM_SECS((pkt_ts / 100000000) - 11644473600); - p->ts += SCTIME_FROM_USECS( + p->ts = SCTIME_ADD_USECS(SCTIME_FROM_USECS((pkt_ts / 100000000) - 11644473600), ((pkt_ts % 100000000) / 100) + ((pkt_ts % 100) > 50 ? 1 : 0)); break; default: