From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Tue, 4 Jun 2019 15:12:44 +0000 (-0400)
Subject: Merge pull request #1618 in SNORT/snort3 from ~SBAIGAL/snort3:perf_mon_analyzer_fix... 
X-Git-Tag: 3.0.0-257~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=429d14c26d171f585273777c55e048110786f16c;p=thirdparty%2Fsnort3.git

Merge pull request #1618 in SNORT/snort3 from ~SBAIGAL/snort3:perf_mon_analyzer_fix to master

Squashed commit of the following:

commit ad4244beb09c4a56e10c6751c0ae51bd81fdeaa2
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Tue May 28 09:29:19 2019 -0400

    perf_mon: removed flow_ip_handler from PerfMonitor

    Keep the ip event handler at databus, disable ip tracker from a thread will not lead to delete ip data handler from databus
---

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index e53fbd139..8306e9316 100644
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -77,7 +77,6 @@ public:
 
 private:
     PerfConfig* const config;
-    FlowIPDataHandler* flow_ip_handler = nullptr;
 
     void disable_tracker(size_t);
 };
@@ -206,11 +205,7 @@ void PerfMonitor::disable_tracker(size_t i)
     auto tracker = trackers->at(i);
 
     if ( tracker == flow_ip_tracker )
-    {
-        DataBus::unsubscribe_default(FLOW_STATE_EVENT, flow_ip_handler);
-        delete flow_ip_handler;
         flow_ip_tracker = nullptr;
-    }
 
     (*trackers)[i] = (*trackers)[trackers->size() - 1];
     trackers->pop_back();
@@ -227,7 +222,7 @@ bool PerfMonitor::configure(SnortConfig* sc)
     new PerfRotateHandler(*this, sc);
 
     if ( config->perf_flags & PERF_FLOWIP )
-        flow_ip_handler = new FlowIPDataHandler(*this, sc);
+        new FlowIPDataHandler(*this, sc);
 
     return config->resolve();
 }