From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Fri, 15 Oct 2021 21:04:39 +0000 (+0000)
Subject: Merge pull request #3111 in SNORT/snort3 from ~SMINUT/snort3:smbfp_crash to master
X-Git-Tag: 3.1.15.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53b43c72b1158907100014c4df565555d9bbc440;p=thirdparty%2Fsnort3.git

Merge pull request #3111 in SNORT/snort3 from ~SMINUT/snort3:smbfp_crash to master

Squashed commit of the following:

commit 01950a49d010b9a06472758de90e0390d7ec0ce2
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Oct 15 11:55:31 2021 -0400

    rna: call set_smb_fp_processor function in reload tuner
---

diff --git a/src/network_inspectors/rna/rna_module.cc b/src/network_inspectors/rna/rna_module.cc
index 711d3f864..73567cb10 100644
--- a/src/network_inspectors/rna/rna_module.cc
+++ b/src/network_inspectors/rna/rna_module.cc
@@ -109,6 +109,7 @@ bool FpProcReloadTuner::tinit()
     set_tcp_fp_processor(mod_conf.tcp_processor);
     set_ua_fp_processor(mod_conf.ua_processor);
     set_udp_fp_processor(mod_conf.udp_processor);
+    set_smb_fp_processor(mod_conf.smb_processor);
     return false;  // no work to do after this
 }
 
diff --git a/src/network_inspectors/rna/test/rna_module_test.cc b/src/network_inspectors/rna/test/rna_module_test.cc
index 4bff0bda4..8d1238ddb 100644
--- a/src/network_inspectors/rna/test/rna_module_test.cc
+++ b/src/network_inspectors/rna/test/rna_module_test.cc
@@ -39,6 +39,7 @@
 void set_tcp_fp_processor(TcpFpProcessor*) { }
 void set_ua_fp_processor(UaFpProcessor*) { }
 void set_udp_fp_processor(UdpFpProcessor*) { }
+void set_smb_fp_processor(SmbFpProcessor*) { }
 
 namespace snort
 {