Merge pull request #2798 in SNORT/snort3 from ~DIPANDIT/snort3:classify to master

Squashed commit of the following:

commit 5927f7dae46a8a82919942171f594320044baf8a
Author: Dipto Pandit (dipandit) <dipandit@cisco.com>
Date:   Wed Mar 17 09:06:47 2021 -0400

    dce_rpc: fix warning of empty body

diff --git a/src/service_inspectors/dce_rpc/dce_smb2_session.cc b/src/service_inspectors/dce_rpc/dce_smb2_session.cc
index deb12aa516f5700a7d06846eb89f9c031e6a2a31..180f60e56894b51294cbaf72fb9f06e2f89838c5 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb2_session.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb2_session.cc
@@ -105,9 +105,11 @@ void Dce2Smb2SessionTracker::process(uint16_t command, uint8_t command_type,
                 smb2_command_string[command]);
             tree = connect_tree(tree_id);
             if (!tree)
+            {
                 debug_logf(dce_smb_trace, GET_CURRENT_PACKET,
                     "%s_REQ: insert tree tracker failed\n",
                     smb2_command_string[command]);
+            }
         }
     // fallthrough
     default:

diff --git a/src/service_inspectors/dce_rpc/dce_smb_inspector.cc b/src/service_inspectors/dce_rpc/dce_smb_inspector.cc
index fdcabbf757863a8da2b98d44331851bdc9fa8d1c..de9ea879f96f12d7d70b6530956c09f70732d2ac 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_inspector.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_inspector.cc
@@ -82,7 +82,9 @@ void Dce2Smb::eval(Packet* p)
         p->endianness = nullptr;
     }
     else
+    {
         debug_logf(dce_smb_trace, p, "non-smb packet detected\n");
+    }
 }
 
 void Dce2Smb::clear(Packet* p)