From: Russ Combs <rucombs@cisco.com>
Date: Thu, 19 Jun 2014 02:52:43 +0000 (-0400)
Subject: fixed snort -n
X-Git-Tag: 3.0.0-233~1482
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c458b04544dca9e9aae39afaaab294e6a49c6350;p=thirdparty%2Fsnort3.git

fixed snort -n
---

diff --git a/src/main/analyzer.cc b/src/main/analyzer.cc
index 656eed3f2..662af6b51 100644
--- a/src/main/analyzer.cc
+++ b/src/main/analyzer.cc
@@ -100,8 +100,6 @@ bool Analyzer::handle(AnalyzerCommand ac)
 
 void Analyzer::analyze()
 {
-    uint64_t max = snort_conf->pkt_cnt;
-
     while ( true )
     {
         if ( command )
@@ -116,11 +114,6 @@ void Analyzer::analyze()
         }
         if ( DAQ_Acquire(0, main_func, NULL) )
             break;
-
-        ++count;
-
-        if ( max && count >= max )
-            break;
     }
 }
 
diff --git a/src/main/snort.cc b/src/main/snort.cc
index 99480ffc3..e77caff43 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -975,6 +975,9 @@ DAQ_Verdict packet_callback(
 
     s_packet.pkth = NULL;  // no longer avail on segv
 
+    if ( snort_conf->pkt_cnt && pc.total_from_daq >= snort_conf->pkt_cnt )
+        DAQ_BreakLoop(-1);
+
     PREPROC_PROFILE_END(totalPerfStats);
     return verdict;
 }