From: Bhargava Jandhyala (bjandhya) Date: Thu, 8 Jul 2021 13:26:41 +0000 (+0000) Subject: Merge pull request #2970 in SNORT/snort3 from ~BSACHDEV/snort3:full_run to master X-Git-Tag: 3.1.8.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff175d35f7837685d31b0fc0e53e923cd890442e;p=thirdparty%2Fsnort3.git Merge pull request #2970 in SNORT/snort3 from ~BSACHDEV/snort3:full_run to master Squashed commit of the following: commit e38eec5ab109c35ad82cc04c1210a9eb853a4536 Author: bsachdev Date: Thu Jul 8 07:17:02 2021 -0400 dce_smb: Fixed macro definition for SMB_DEBUG Signed-off-by: bsachdev --- diff --git a/src/service_inspectors/dce_rpc/dce_smb2_tree.cc b/src/service_inspectors/dce_rpc/dce_smb2_tree.cc index d143e0d9f..4f4b2b90c 100644 --- 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 de8273fea..5ef7ce18c 100644 --- 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 */