]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
dag: Check for out-of-band control operations
authorJeff Lucovsky <jeff@lucovsky.org>
Fri, 24 Apr 2020 14:27:20 +0000 (10:27 -0400)
committerVictor Julien <victor@inliniac.net>
Sat, 25 Apr 2020 06:01:46 +0000 (08:01 +0200)
This commit causes the packet source to check for out of band control
operations when there are no packets immediately available.

src/source-erf-dag.c

index a2481037023783b85495ce8f6fdcf12513228884..71be63fc34bb64f6c6ab355b5a646003c8033f51 100644 (file)
@@ -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
@@ -349,6 +349,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;
                 }