From: Victor Julien <vjulien@oisf.net>
Date: Tue, 11 Apr 2023 09:40:35 +0000 (+0200)
Subject: pcap: improve pcap_breakloop support
X-Git-Tag: suricata-7.0.0-rc2~446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8706%2Fhead;p=thirdparty%2Fsuricata.git

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.
---

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);
             }