From 8eabf8d67b1e041069fcd0f6fa082e49ecdd424b Mon Sep 17 00:00:00 2001 From: "Michael Altizer (mialtize)" Date: Fri, 18 Oct 2019 09:43:52 -0400 Subject: [PATCH] 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 Date: Tue Oct 15 13:37:57 2019 -0400 packet_io: do not retry packets that do not have a daq instance. --- src/packet_io/active.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.47.3