Merge pull request #2806 in SNORT/snort3 from ~MIALTIZE/snort3:goodbye_retry to master

Squashed commit of the following:

commit 3f880f91cec15ab7c551962f117a02124ae075d4
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Mar 22 10:32:55 2021 -0400

    packet_io: Update for the removal of the RETRY DAQ verdict

diff --git a/src/packet_io/sfdaq_module.cc b/src/packet_io/sfdaq_module.cc
index db27ba1d129f65641e20a9b9d8333febb49caed2..9a1fc44df067800abe60d5b89cb7be01b5599784 100644 (file)
--- a/src/packet_io/sfdaq_module.cc
+++ b/src/packet_io/sfdaq_module.cc
@@ -167,6 +167,7 @@ bool SFDAQModule::end(const char* fqn, int idx, SnortConfig* sc)
     return true;
 }
 
+static_assert(MAX_DAQ_VERDICT == 6, "Verdict peg counts must align with MAX_DAQ_VERDICT");
 const PegInfo daq_names[] =
 {
     { CountType::MAX, "pcaps", "total files and interfaces processed" },
@@ -176,13 +177,14 @@ const PegInfo daq_names[] =
     { CountType::SUM, "filtered", "packets filtered out" },
     { CountType::SUM, "outstanding", "packets unprocessed" },
     { CountType::SUM, "injected", "active responses or replacements" },
+
+    // Must align with MAX_DAQ_VERDICT (one for each, in order)
     { CountType::SUM, "allow", "total allow verdicts" },
     { CountType::SUM, "block", "total block verdicts" },
     { CountType::SUM, "replace", "total replace verdicts" },
     { CountType::SUM, "whitelist", "total whitelist verdicts" },
     { CountType::SUM, "blacklist", "total blacklist verdicts" },
     { CountType::SUM, "ignore", "total ignore verdicts" },
-    { CountType::SUM, "retry", "total retry verdicts" },
 
     // FIXIT-L these are not exactly DAQ counts - but they are related
     { CountType::SUM, "internal_blacklist",