From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Mon, 29 Oct 2018 14:48:36 +0000 (-0400)
Subject: Merge pull request #1406 in SNORT/snort3 from reload_timestamp to master
X-Git-Tag: 3.0.0-249~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f081c6dbd6d23cf5dc28fe175bea4b14ce7d8fd1;p=thirdparty%2Fsnort3.git

Merge pull request #1406 in SNORT/snort3 from reload_timestamp to master

Squashed commit of the following:

commit 331a95b730158cc56ffeb6fb8ea24826a78ebe7c
Author: mdagon <mdagon@cisco.com>
Date:   Wed Oct 17 14:53:38 2018 -0400

    thread_idle: call timeout flows with packet time for pcap replay
---

diff --git a/src/main/analyzer.cc b/src/main/analyzer.cc
index 253248a21..61f80a8e0 100644
--- a/src/main/analyzer.cc
+++ b/src/main/analyzer.cc
@@ -152,6 +152,7 @@ void Analyzer::analyze()
         {
             pause();
             Snort::clear_pause();
+            snort::LogMessage("== paused\n");
         }
         if (handle_command())
             continue;
diff --git a/src/main/snort.cc b/src/main/snort.cc
index e8ca57692..a7dd0c01e 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -740,7 +740,10 @@ void Snort::thread_idle()
 {
     // FIXIT-L this whole thing could be pub-sub
     DataBus::publish(THREAD_IDLE_EVENT, nullptr);
-    Stream::timeout_flows(time(nullptr));
+    if (SnortConfig::read_mode())
+        Stream::timeout_flows(packet_time());
+    else
+        Stream::timeout_flows(time(nullptr));
     aux_counts.idle++;
     HighAvailabilityManager::process_receive();
 }