From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 19 Nov 2020 16:40:24 +0000 (+0000)
Subject: Merge pull request #2626 in SNORT/snort3 from ~KATHARVE/snort3:binder to master
X-Git-Tag: 3.0.3-6~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34203f949922bca54d9510182393bec6991028da;p=thirdparty%2Fsnort3.git

Merge pull request #2626 in SNORT/snort3 from ~KATHARVE/snort3:binder to master

Squashed commit of the following:

commit 08ec70c0f5695bc204a00b5a11c580daeac6b1d8
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Nov 17 11:41:09 2020 -0500

    binder: pass service to get_bindings on flow service change
---

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index 255797275..c1cc5dd1a 100644
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -803,7 +803,7 @@ void Binder::get_bindings(Flow& flow, Stuff& stuff, const char* service)
 Inspector* Binder::find_gadget(Flow& flow)
 {
     Stuff stuff;
-    get_bindings(flow, stuff);
+    get_bindings(flow, stuff, flow.service);
     return stuff.gadget;
 }