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 711d3f86492754637c121bbcee7270497d4d09fa..73567cb109116304e804a651a592fda6f52d6b31 100644 (file)
--- 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 4bff0bda4f4ad26af8feb14c194d947d67613fd4..8d1238ddb1020a34e7b40ca3992317d79efe208b 100644 (file)
--- 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
 {