From: Steve Chew (stechew) <stechew@cisco.com>
Date: Mon, 14 Oct 2019 17:36:03 +0000 (-0400)
Subject: Merge pull request #1794 in SNORT/snort3 from ~STECHEW/snort3:binder_use_snort_config... 
X-Git-Tag: 3.0.0-263~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbb5465066c4d1afeb5178def6083ac5c483cbf3;p=thirdparty%2Fsnort3.git

Merge pull request #1794 in SNORT/snort3 from ~STECHEW/snort3:binder_use_snort_config to master

Squashed commit of the following:

commit b50a46e6042a01c0b9bfeaa451f072bf4f5bd1c3
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Oct 11 14:43:41 2019 -0400

    binder: Use reloaded snort config when getting inspector.
---

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index a5bbc198b..c5bfe94b6 100644
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -827,7 +827,7 @@ void Binder::handle_new_standby_flow( Flow* flow )
 // implementation stuff
 //-------------------------------------------------------------------------
 
-void Binder::set_binding(SnortConfig*, Binding* pb)
+void Binder::set_binding(SnortConfig* sc, Binding* pb)
 {
     if ( pb->use.action != BindUse::BA_INSPECT )
         return;
@@ -840,7 +840,7 @@ void Binder::set_binding(SnortConfig*, Binding* pb)
 
     Module* m = ModuleManager::get_module(key);
     bool is_global = m ? m->get_usage() == Module::GLOBAL : false;
-    if ( (pb->use.object = InspectorManager::get_inspector(key, is_global)) )
+    if ( (pb->use.object = InspectorManager::get_inspector(key, is_global, sc)) )
     {
         switch ( ((Inspector*)pb->use.object)->get_api()->type )
         {