From 9fe08f2374f690a901205f0df073b702f92b6345 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 11 Apr 2023 11:40:35 +0200 Subject: [PATCH] pcap: improve pcap_breakloop support When pcap_breakloop has been issued on a handle, the current pcap_dispatch call may return -2 (PCAP_ERROR_BREAK), but it can also return the number of processed packets if lower than the desired number. So add this condition as a check. --- src/source-pcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/source-pcap.c b/src/source-pcap.c index c21f6d6364..afcc70c448 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -323,7 +323,7 @@ static TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot) int r = pcap_dispatch(ptv->pcap_handle, packet_q_len, (pcap_handler)PcapCallbackLoop, (u_char *)ptv); - if (unlikely(r == 0 || r == PCAP_ERROR_BREAK)) { + if (unlikely(r == 0 || r == PCAP_ERROR_BREAK || r < packet_q_len)) { if (r == PCAP_ERROR_BREAK && ptv->cb_result == TM_ECODE_FAILED) { SCReturnInt(TM_ECODE_FAILED); } -- 2.47.2