aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

napatech: fix compilation with SCTIME usage

Browse Source 
This replaces the broken compilation due to the change of SCTime_t
into a structure: 9fbe683642.
pull/9441/head
Ralph Eastwood 2 years ago committed by Victor Julien
parent c6da59d57b
commit 658bbbc078
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File

12
src/source-napatech.c
Unescape Escape View File

@ -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:

Write Preview
Loading…
Cancel
Save