Merge pull request #2266 in SNORT/snort3 from ~PUNEETKU/snort3:perf_fix to master

Squashed commit of the following:

commit 7cc62215d8d2a46b68e20ccf96350f659089ecf0
Author: Puneeth Kumar C V <puneetku@cisco.com>
Date:   Sun Jun 14 21:01:45 2020 -0400

    perf_monitor: fix count and interval during disable cli execution

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index 9329970d412a5e149f2154c2b1cf47c5207a0230..3993f33756db2f22737351faa5b4f5c1eb670199 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -301,8 +301,8 @@ void PerfMonitor::swap_constraints(PerfConstraints* constraints)
 
 PerfConstraints* PerfMonitor::get_original_constraints()
 {
-    auto* new_constraints = new PerfConstraints(false, config->pkt_cnt,
-        config->sample_interval);
+    auto* new_constraints = new PerfConstraints(false, config->sample_interval,
+        config->pkt_cnt);
 
     return new_constraints;
 }