From: Cynthia Leonard (cyleonar) <cyleonar@cisco.com>
Date: Mon, 15 Jun 2020 06:08:49 +0000 (+0000)
Subject: Merge pull request #2266 in SNORT/snort3 from ~PUNEETKU/snort3:perf_fix to master
X-Git-Tag: 3.0.1-5~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37f25d78ad0990f2edf4bb02f7d1850001421986;p=thirdparty%2Fsnort3.git

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 9329970d4..3993f3375 100644
--- 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;
 }