From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Fri, 24 Apr 2020 14:27:20 +0000 (-0400)
Subject: dag: Check for out-of-band control operations
X-Git-Tag: suricata-5.0.3~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7f1c5c21e073884ffe81e7cf0886d41deec7d7f;p=thirdparty%2Fsuricata.git

dag: 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 5b13468bfcbbd5d5a2a9743b317d2e5a9c3a5afe)
---

diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c
index 1bd9a506f1..4265641949 100644
--- a/src/source-erf-dag.c
+++ b/src/source-erf-dag.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2014 Open Information Security Foundation
+/* Copyright (C) 2010-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
@@ -350,6 +350,7 @@ ReceiveErfDagLoop(ThreadVars *tv, void *data, void *slot)
         if (top == NULL) {
             if (errno == EAGAIN) {
                 if (dtv->dagstream & 0x1) {
+                    TmThreadsCaptureHandleTimeout(tv, dtv->slot, NULL);
                     usleep(10 * 1000);
                     dtv->btm = dtv->top;
                 }