From: Michael Altizer (mialtize) Date: Fri, 23 Oct 2020 18:30:33 +0000 (+0000) Subject: Merge pull request #2572 in SNORT/snort3 from ~MIALTIZE/snort3:osx to master X-Git-Tag: 3.0.3-4~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e7a2c7a86bce8c80db5383eab1a1f736432274;p=thirdparty%2Fsnort3.git Merge pull request #2572 in SNORT/snort3 from ~MIALTIZE/snort3:osx to master Squashed commit of the following: commit 0e9e61caa01b08858aa35b4210d4f28bbe054c45 Author: Michael Altizer Date: Fri Oct 23 13:49:02 2020 -0400 build: Various build fixes for OS X --- diff --git a/src/network_inspectors/appid/appid_config.cc b/src/network_inspectors/appid/appid_config.cc index 0ebf394ae..cf4fa027b 100644 --- a/src/network_inspectors/appid/appid_config.cc +++ b/src/network_inspectors/appid/appid_config.cc @@ -87,7 +87,7 @@ void AppIdConfig::show() const ConfigLogger::log_flag("log_all_sessions", log_all_sessions); ConfigLogger::log_flag("log_stats", log_stats); - ConfigLogger::log_value("memcap", memcap); + ConfigLogger::log_value("memcap", static_cast(memcap)); } void AppIdContext::pterm() diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc index 3993f3375..69b0381db 100644 --- a/src/network_inspectors/perf_monitor/perf_monitor.cc +++ b/src/network_inspectors/perf_monitor/perf_monitor.cc @@ -167,7 +167,7 @@ void PerfMonitor::show(const SnortConfig*) const ConfigLogger::log_value("flow_ports", config->flow_max_port_to_track); if ( ConfigLogger::log_flag("flow_ip", config->perf_flags & PERF_FLOWIP) ) - ConfigLogger::log_value("flow_ip_memcap", config->flowip_memcap); + ConfigLogger::log_value("flow_ip_memcap", static_cast(config->flowip_memcap)); ConfigLogger::log_value("packets", config->pkt_cnt); ConfigLogger::log_value("seconds", config->sample_interval); diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc index 53764eab8..dd7760fbb 100644 --- a/src/network_inspectors/port_scan/port_scan.cc +++ b/src/network_inspectors/port_scan/port_scan.cc @@ -384,7 +384,7 @@ static std::string to_string(const IPSET* list) static void portscan_config_show(const PortscanConfig* config) { - ConfigLogger::log_value("memcap", config->memcap); + ConfigLogger::log_value("memcap", static_cast(config->memcap)); ConfigLogger::log_value("protos", get_protos(config->detect_scans).c_str()); ConfigLogger::log_value("scan_types", get_types(config->detect_scan_type).c_str()); diff --git a/src/service_inspectors/cip/cip_definitions.h b/src/service_inspectors/cip/cip_definitions.h index 394e2d3f2..a699736d6 100644 --- a/src/service_inspectors/cip/cip_definitions.h +++ b/src/service_inspectors/cip/cip_definitions.h @@ -40,10 +40,10 @@ struct CipProtoConf uint32_t unconnected_timeout; // Maximum number of unconnected requests per TCP connection. - size_t max_unconnected_messages; + uint32_t max_unconnected_messages; // Maximum number of CIP connections per TCP connection. - size_t max_cip_connections; + uint32_t max_cip_connections; // Custom embedded packet parameters. bool embedded_cip_enabled; @@ -447,12 +447,11 @@ struct CipUnconnectedMessage struct CipUnconnectedMessageList { CipUnconnectedMessage* list; - size_t list_size; + uint32_t list_size; + uint32_t count; // True if an active request was forced to be pruned. bool request_pruned; - - size_t count; }; // This represents a CIP connection. @@ -486,12 +485,11 @@ struct CipConnection struct CipConnectionList { CipConnection* list; - size_t list_size; + uint32_t list_size; + uint32_t count; // True if an active connection was forced to be pruned. bool connection_pruned; - - size_t count; }; struct CipGlobalSessionData diff --git a/src/service_inspectors/cip/cip_session.cc b/src/service_inspectors/cip/cip_session.cc index 662255200..7903c8d93 100644 --- a/src/service_inspectors/cip/cip_session.cc +++ b/src/service_inspectors/cip/cip_session.cc @@ -81,11 +81,10 @@ static void prune_cip_unconnected_list(CipUnconnectedMessageList* unconnected_li struct timeval timestamp_diff; bool pruned = false; - size_t oldest_slot = 0; + uint32_t oldest_slot = 0; // Prune any message that has exceeded the CIP timeout. - size_t i; - for (i = 0; i < unconnected_list->list_size; ++i) + for (uint32_t i = 0; i < unconnected_list->list_size; ++i) { if (unconnected_list->list[i].slot_active) { @@ -130,13 +129,12 @@ static void prune_cip_connection_list(CipConnectionList* connection_list, bool pruned = false; - size_t stale_slot = 0; + uint32_t stale_slot = 0; struct timeval stale_timestamp_diff; memset(&stale_timestamp_diff, 0, sizeof(stale_timestamp_diff)); // Prune any connection that has exceeded the CIP timeout. - size_t i; - for (i = 0; i < connection_list->list_size; ++i) + for (uint32_t i = 0; i < connection_list->list_size; ++i) { if (connection_list->list[i].slot_active) { @@ -213,8 +211,7 @@ static CipConnection* cip_find_connection_slot(CipConnectionList* connection_lis prune_cip_connection_list(connection_list, timestamp); } - size_t i; - for (i = 0; i < connection_list->list_size; ++i) + for (uint32_t i = 0; i < connection_list->list_size; ++i) { if (!connection_list->list[i].slot_active) { @@ -234,8 +231,7 @@ CipConnection* cip_find_connection_by_id( { CipConnection* connection = NULL; - size_t i; - for (i = 0; i < connection_list->list_size; ++i) + for (uint32_t i = 0; i < connection_list->list_size; ++i) { if (connection_list->list[i].slot_active && (connection_list->list[i].established == established)) @@ -266,8 +262,7 @@ static const CipConnection* cip_find_connection_by_id_any( { const CipConnection* connection = NULL; - size_t i; - for (i = 0; i < connection_list->list_size; ++i) + for (uint32_t i = 0; i < connection_list->list_size; ++i) { if (connection_list->list[i].slot_active && connection_list->list[i].established) { @@ -293,8 +288,7 @@ static const CipConnection* cip_find_connection_any(const CipConnectionList* con { const CipConnection* connection = NULL; - size_t i; - for (i = 0; i < connection_list->list_size; ++i) + for (uint32_t i = 0; i < connection_list->list_size; ++i) { if (connection_list->list[i].slot_active && cip_connection_signature_match(&connection_list->list[i].signature, signature)) @@ -313,8 +307,7 @@ static CipConnection* cip_find_connection(CipConnectionList* connection_list, { CipConnection* connection = NULL; - size_t i; - for (i = 0; i < connection_list->list_size; ++i) + for (uint32_t i = 0; i < connection_list->list_size; ++i) { if (connection_list->list[i].slot_active && (connection_list->list[i].established == established) @@ -426,8 +419,7 @@ static CipUnconnectedMessage* find_unconnected_request_slot( prune_cip_unconnected_list(unconnected_list, timestamp); } - size_t i; - for (i = 0; i < unconnected_list->list_size; ++i) + for (uint32_t i = 0; i < unconnected_list->list_size; ++i) { if (!unconnected_list->list[i].slot_active) { @@ -445,8 +437,7 @@ static CipUnconnectedMessage* find_unconnected_request( { CipUnconnectedMessage* unconnected_message = NULL; - size_t i; - for (i = 0; i < unconnected_list->list_size; ++i) + for (uint32_t i = 0; i < unconnected_list->list_size; ++i) { if (unconnected_list->list[i].slot_active && unconnected_list->list[i].sender_context == sender_context)