Pull request #4028: CSCwh22691 - Continuous snort3 cores in DCE/SMB - DC into 7.6...

Merge in SNORT/snort3 from ~ASHIKTHO/snort3:CSCwh22691_master to master

Squashed commit of the following:

commit 21e36571ca53ccb7883eee3cfb9aaf9e4cf2a7ec
Author: Sumit Kumar <sumikum7@cisco.com>
Date:   Mon Aug 21 14:31:03 2023 +0530

    dce_rpc: using  reset_using_rpkt() inline to what is there in eval() of SMB inspector code as well

diff --git a/src/service_inspectors/dce_rpc/dce_http_proxy.cc b/src/service_inspectors/dce_rpc/dce_http_proxy.cc
index 3d904358677c912a8ac55aa571bf05ebeec3d9f0..cf4c9d9383bba114375ae7659752daf7ac2b1482 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_http_proxy.cc
+++ b/src/service_inspectors/dce_rpc/dce_http_proxy.cc
@@ -41,7 +41,9 @@ THREAD_LOCAL DceHttpProxyStats dce_http_proxy_stats;
 class DceHttpProxy : public Inspector
 {
 public:
-    void eval(Packet*) override { }
+    void eval(Packet*) override {
+        reset_using_rpkt();
+    }
     void clear(Packet*) override;
     StreamSplitter* get_splitter(bool c2s) override
     {

diff --git a/src/service_inspectors/dce_rpc/dce_http_server.cc b/src/service_inspectors/dce_rpc/dce_http_server.cc
index 1771c5024447fc732e6538b1fedb865e985a3acd..3d749f5878b7cba640735d16a15204565edde1b8 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_http_server.cc
+++ b/src/service_inspectors/dce_rpc/dce_http_server.cc
@@ -41,7 +41,9 @@ THREAD_LOCAL DceHttpServerStats dce_http_server_stats;
 class DceHttpServer : public Inspector
 {
 public:
-    void eval(Packet*) override { }
+    void eval(Packet*) override {
+        reset_using_rpkt();
+    }
     void clear(Packet*) override;
     StreamSplitter* get_splitter(bool c2s) override
     {

diff --git a/src/service_inspectors/dce_rpc/dce_tcp.cc b/src/service_inspectors/dce_rpc/dce_tcp.cc
index 88d4e052f7f40386d420b844aa08099bca6ad3d6..3b6f58a7bc4a34eec96345f32fd69eeb76005bc5 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp.cc
+++ b/src/service_inspectors/dce_rpc/dce_tcp.cc
@@ -135,6 +135,8 @@ void Dce2Tcp::eval(Packet* p)
     assert(p->has_tcp_data());
     assert(p->flow);
 
+    reset_using_rpkt();
+
     if ( p->test_session_flags(SSNFLAG_MIDSTREAM) )
     {
         return;

diff --git a/src/service_inspectors/dce_rpc/dce_udp.cc b/src/service_inspectors/dce_rpc/dce_udp.cc
index 4efe6a5cd6e7c88e60cc2dd4d95a4dd3970316f7..e6315389f7032cfcdef18b34ed727905ae090d27 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_udp.cc
+++ b/src/service_inspectors/dce_rpc/dce_udp.cc
@@ -134,6 +134,8 @@ void Dce2Udp::eval(Packet* p)
 
     assert(p->flow);
 
+    reset_using_rpkt();
+
     dce2_udp_sess = dce2_handle_udp_session(p, &config);
 
     if (dce2_udp_sess)