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 253248a2192aa052b193a88a70e54d442171450f..61f80a8e0385e4d08182c527e56584f7d6b2a7fb 100644 (file)
--- 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 e8ca576923b1c6c766fe6d9be5ef5485d06d6a15..a7dd0c01e42c010558b13e87d6fdaa08a7b0fc0c 100644 (file)
--- 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();
 }