From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Fri, 18 Oct 2019 13:43:52 +0000 (-0400)
Subject: Merge pull request #1801 in SNORT/snort3 from ~SMINUT/snort3:retry_packet_daq_instanc... 
X-Git-Tag: 3.0.0-263~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eabf8d67b1e041069fcd0f6fa082e49ecdd424b;p=thirdparty%2Fsnort3.git

Merge pull request #1801 in SNORT/snort3 from ~SMINUT/snort3:retry_packet_daq_instance to master

Squashed commit of the following:

commit 7ffb11965cb72af79bb9b3360a3baa07c1bb873e
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Oct 15 13:37:57 2019 -0400

    packet_io: do not retry packets that do not have a daq instance.
---

diff --git a/src/packet_io/active.cc b/src/packet_io/active.cc
index 1e7841b29..de602c279 100644
--- a/src/packet_io/active.cc
+++ b/src/packet_io/active.cc
@@ -428,7 +428,7 @@ bool Active::retry_packet(const Packet* p)
         return false;
 
     // FIXIT-L semi-arbitrary heuristic for preventing retry queue saturation - reevaluate later
-    if (p->daq_instance->get_pool_available() < p->daq_instance->get_batch_size())
+    if (!p->daq_instance || p->daq_instance->get_pool_available() < p->daq_instance->get_batch_size())
     {
         // Fall back on dropping the packet and relying on the host to retransmit
         active_action = ACT_DROP;