From: Steven Baigal (sbaigal) Date: Fri, 15 Jul 2022 17:39:14 +0000 (+0000) Subject: Pull request #3504: print LogMessage in reputation only when in verbose mode X-Git-Tag: 3.1.37.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bb4fe28963eee80dd075074192624ba94e2e4ab;p=thirdparty%2Fsnort3.git Pull request #3504: print LogMessage in reputation only when in verbose mode Merge in SNORT/snort3 from ~ALLEWI/snort3:print_reputation_verbose to master Squashed commit of the following: commit 75b02e22b601500d660eb342215159b5e1bc5551 Author: allewi@cisco.com Date: Wed Jul 6 17:43:49 2022 -0400 reputation: print LogMessage in reputation only when in verbose mode --- diff --git a/src/network_inspectors/reputation/reputation_parse.cc b/src/network_inspectors/reputation/reputation_parse.cc index d1df88681..6cee1c2bb 100644 --- a/src/network_inspectors/reputation/reputation_parse.cc +++ b/src/network_inspectors/reputation/reputation_parse.cc @@ -30,6 +30,7 @@ #include #include +#include "main/snort_config.h" #include "log/messages.h" #include "parser/config_file.h" #include "sfip/sf_cidr.h" @@ -544,7 +545,10 @@ static void load_list_file(ListFile* list_info, const ReputationConfig& config, ip_info = ((IPrepInfo*)&base[ip_info_ptr]); ip_info->list_indexes[0] = list_info->list_index; - LogMessage(" Processing %s file %s\n", list_type_name, full_path_filename); + if ( SnortConfig::log_verbose() ) + { + LogMessage(" Processing %s file %s\n", list_type_name, full_path_filename); + } if ((fp = fopen(full_path_filename, "r")) == nullptr) { @@ -607,9 +611,12 @@ static void load_list_file(ListFile* list_info, const ReputationConfig& config, if (duplicate_count > MAX_MSGS_TO_PRINT) ErrorMessage(" Additional duplicate addresses were not listed.\n"); - LogMessage(" Reputation entries loaded: %u, invalid: %u, re-defined: %u (from file %s)\n", - sfrt_flat_num_entries(data.ip_list) - num_loaded_before, - invalid_count, duplicate_count, full_path_filename); + if ( SnortConfig::log_verbose() ) + { + LogMessage(" Reputation entries loaded: %u, invalid: %u, re-defined: %u (from file %s)\n", + sfrt_flat_num_entries(data.ip_list) - num_loaded_before, + invalid_count, duplicate_count, full_path_filename); + } fclose(fp); }