Pull request #3390: mms: Moved creation of TpktFlowData inspector ID to process init.

Merge in SNORT/snort3 from ~STECHEW/snort3:mms_splitter_fix to master

Squashed commit of the following:

commit 6bbabe07e02408a0f007d6a4cd9c470aa8a6b68b
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Apr 22 15:48:50 2022 -0400

    mms: Moved creation of TpktFlowData inspector ID to process init.

diff --git a/src/service_inspectors/mms/mms.cc b/src/service_inspectors/mms/mms.cc
index 98620dcc0f9d2f736db49b86e68618f56e4f784a..ddedaedae1d6707e992545d62bf40b1b31297ca0 100644 (file)
--- a/src/service_inspectors/mms/mms.cc
+++ b/src/service_inspectors/mms/mms.cc
@@ -34,6 +34,7 @@
 #include "mms_decode.h"
 #include "mms_module.h"
 #include "mms_splitter.h"
+#include "util_tpkt.h"
 
 using namespace snort;
 
@@ -135,6 +136,7 @@ static void mod_dtor(Module* m)
 static void mms_init()
 {
     MmsFlowData::init();
+    TpktFlowData::init();
 }
 
 static Inspector* mms_ctor(Module*)

diff --git a/src/service_inspectors/mms/mms_splitter.cc b/src/service_inspectors/mms/mms_splitter.cc
index 5d6137a57f94c5e7d3bb951c688c669437e3909c..2ebccfca527e3d3aa08028d095f2f3cc7a518b99 100644 (file)
--- a/src/service_inspectors/mms/mms_splitter.cc
+++ b/src/service_inspectors/mms/mms_splitter.cc
@@ -155,7 +155,6 @@ StreamSplitter::Status MmsSplitter::scan(Packet* p, const uint8_t* data, uint32_
 
     if (!tpktfd)
     {
-        TpktFlowData::init();
         tpktfd = new TpktFlowData;
         p->flow->set_flow_data(tpktfd);
         tpktfd->reset_packet_data(TPKT_PACKET_DATA_DIRECTION__SERVER);

diff --git a/src/service_inspectors/mms/util_tpkt.cc b/src/service_inspectors/mms/util_tpkt.cc
index 9b558e3ea2b918e51fbc77db52866d7f21b53fc7..c82a3d17828361fd3b4b01d2fe0c62db9c0e494f 100644 (file)
--- a/src/service_inspectors/mms/util_tpkt.cc
+++ b/src/service_inspectors/mms/util_tpkt.cc
@@ -316,7 +316,6 @@ TpktEncapLayerType get_next_tpkt_encap_layer(Packet* p, Cursor* c)
 
     if (!tpktfd)
     {
-        TpktFlowData::init();
         tpktfd = new TpktFlowData;
         p->flow->set_flow_data(tpktfd);
     }