From: Russ Combs <rucombs@cisco.com>
Date: Mon, 24 Nov 2014 17:36:05 +0000 (-0500)
Subject: moved internal *lists back to aux
X-Git-Tag: 3.0.0-233~1162^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24f1b0aadcbd0a7791973a2e8d8410fd69da2f49;p=thirdparty%2Fsnort3.git

moved internal *lists back to aux
---

diff --git a/.gitignore b/.gitignore
index 7457c993f..2fb473662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ doc/builtin.txt
 doc/codec.txt
 doc/commands.txt
 doc/config.txt
+doc/counts.txt
 doc/config_changes.txt
 doc/data.txt
 doc/docbook-xsl.css
diff --git a/src/main/snort.cc b/src/main/snort.cc
index fd8292e1b..225faa00b 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -717,7 +717,7 @@ DAQ_Verdict ProcessPacket(
 
         if ( Active_GetTunnelBypass() )
         {
-            pc.internal_blacklist++;
+            aux_counts.internal_blacklist++;
             return verdict;
         }
 
@@ -809,7 +809,7 @@ DAQ_Verdict packet_callback(
                 else
                 {
                     verdict = DAQ_VERDICT_PASS;
-                    pc.internal_whitelist++;
+                    aux_counts.internal_whitelist++;
                 }
             }
             else if ( s_packet->ptrs.decode_flags & DECODE_PKT_TRUST )
diff --git a/src/utils/stats.cc b/src/utils/stats.cc
index 09b2f0b8b..e4350357c 100644
--- a/src/utils/stats.cc
+++ b/src/utils/stats.cc
@@ -188,6 +188,10 @@ const PegInfo daq_names[] =
     { "whitelist", "total whitelist verdicts" },
     { "blacklist", "total blacklist verdicts" },
     { "ignore", "total ignore verdicts" },
+
+    // FIXIT-L thise are not exactly DAQ counts - but they are related
+    { "internal blacklist", "packets blacklisted internally due to lack of DAQ support" },
+    { "internal whitelist", "packets whitelisted internally due to lack of DAQ support" },
 #ifdef REG_TEST
     { "skipped", "packets skipped at startup" },
 #endif
@@ -208,8 +212,6 @@ const PegInfo pc_names[] =
     { "log limit", "events queued but not logged" },
     { "event limit", "events filtered" },
     { "alert limit", "events previously triggered on same PDU" },
-    { "internal blacklist", "packets blacklisted internally due to lack of DAQ support" },
-    { "internal whitelist", "packets whitelisted internally due to lack of DAQ support" },
     { nullptr, nullptr }
 };
 
diff --git a/src/utils/stats.h b/src/utils/stats.h
index 09726cbd6..fdd05f366 100644
--- a/src/utils/stats.h
+++ b/src/utils/stats.h
@@ -49,8 +49,6 @@ struct PacketCount
     PegCount log_limit;
     PegCount event_limit;
     PegCount alert_limit;
-    PegCount internal_blacklist;
-    PegCount internal_whitelist;
 };
 
 struct ProcessCount
@@ -65,6 +63,8 @@ struct ProcessCount
 
 struct AuxCount
 {
+    PegCount internal_blacklist;
+    PegCount internal_whitelist;
     PegCount total_fail_open;
     PegCount idle;
 };