Merge pull request #1801 in SNORT/snort3 from ~SMINUT/snort3:retry_packet_daq_instanc...

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 1e7841b2920f51a0b184d5a073e377c9b476d791..de602c2791ceb5ce74354ffdc7bb36d7bb369635 100644 (file)
--- 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;