Merge pull request #2970 in SNORT/snort3 from ~BSACHDEV/snort3:full_run to master

Squashed commit of the following:

commit e38eec5ab109c35ad82cc04c1210a9eb853a4536
Author: bsachdev <bsachdev@cisco.com>
Date:   Thu Jul 8 07:17:02 2021 -0400

    dce_smb: Fixed macro definition for SMB_DEBUG

    Signed-off-by: bsachdev <bsachdev@cisco.com>

diff --git a/src/service_inspectors/dce_rpc/dce_smb2_tree.cc b/src/service_inspectors/dce_rpc/dce_smb2_tree.cc
index d143e0d9f376729c15ae0c6acbedc4bbfd8cd10b..4f4b2b90ce2ab30e08abba109de9b0f9590549f6 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb2_tree.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb2_tree.cc
@@ -446,7 +446,7 @@ void Dce2Smb2TreeTracker::process(uint16_t command, uint8_t command_type,
         pending_requests >= current_flow->get_max_outstanding_requests())
     {
            SMB_DEBUG(dce_smb_trace, DEFAULT_TRACE_OPTION_ID, TRACE_ERROR_LEVEL,
-               GET_CURRENT_PACKET, "%s_REQ: max req exceeded\n", smb2_command_string[command])
+               GET_CURRENT_PACKET, "%s_REQ: max req exceeded\n", smb2_command_string[command]);
         dce_alert(GID_DCE2, DCE2_SMB_MAX_REQS_EXCEEDED, (dce2CommonStats*)&dce2_smb_stats,
             *current_flow->get_dce2_session_data());
         return;

diff --git a/src/service_inspectors/dce_rpc/dce_smb_common.h b/src/service_inspectors/dce_rpc/dce_smb_common.h
index de8273fea1163e4ef8ead70c4e03054697f322c2..5ef7ce18c0887b81151a58129307fcd48c48e472 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_common.h
+++ b/src/service_inspectors/dce_rpc/dce_smb_common.h
@@ -37,7 +37,7 @@
 #define DCE2_SMB_HELP "dce over smb inspection"
 
 #define SMB_DEBUG(module_name, module_id, log_level, p, ...) \
-    trace_logf(log_level, module_name , module_id, p, __VA_ARGS__);
+    trace_logf(log_level, module_name , module_id, p, __VA_ARGS__)
 
 #define DCE2_SMB_ID   0xff534d42  /* \xffSMB */
 #define DCE2_SMB2_ID  0xfe534d42  /* \xfeSMB */