From d06ab882c2e42bd0e1a4fa543f7fec31274e819b Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Fri, 24 Apr 2020 10:28:32 -0400 Subject: [PATCH] napatech: Check for out-of-band control operations This commit causes the packet source to check for out of band control operations when there are no packets immediately available. (cherry picked from commit f12adcc58cf5b79aec13609c672918f5279d4a7d) --- src/source-napatech.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/source-napatech.c b/src/source-napatech.c index 2b9ba58ec2..906bc8520b 100644 --- a/src/source-napatech.c +++ b/src/source-napatech.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2017 Open Information Security Foundation +/* Copyright (C) 2012-2020 Open Information Security Foundation * * You can copy, redistribute or modify this Program under the terms of * the GNU General Public License version 2 as published by the Free @@ -369,7 +369,11 @@ TmEcode NapatechPacketLoopZC(ThreadVars *tv, void *data, void *slot) /* Napatech returns packets 1 at a time */ status = NT_NetRxGet(ntv->rx_stream, &packet_buffer, 1000); - if (unlikely(status == NT_STATUS_TIMEOUT || status == NT_STATUS_TRYAGAIN)) { + if (unlikely( + status == NT_STATUS_TIMEOUT || status == NT_STATUS_TRYAGAIN)) { + if (status == NT_STATUS_TIMEOUT) { + TmThreadsCaptureHandleTimeout(tv, ntv->slot, NULL); + } continue; } else if (unlikely(status != NT_SUCCESS)) { NAPATECH_ERROR(SC_ERR_NAPATECH_OPEN_FAILED, status); -- 2.47.2