From: Michael Altizer (mialtize) Date: Thu, 11 Mar 2021 04:53:24 +0000 (+0000) Subject: Merge pull request #2789 in SNORT/snort3 from ~MIALTIZE/snort3:tidy to master X-Git-Tag: 3.1.2.0~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a524ad57d78814ce598f9e4c3dbd076db74ccfa5;p=thirdparty%2Fsnort3.git Merge pull request #2789 in SNORT/snort3 from ~MIALTIZE/snort3:tidy to master Squashed commit of the following: commit a5026537718b6da997ff33e4125e90a250b74486 Author: Michael Altizer Date: Wed Mar 10 16:10:52 2021 -0500 build: Do one more pass of modernizing the C++ code Mostly generated automatically from clang-tidy using: - modernize-deprecated-headers - modernize-redundant-void-arg - modernize-use-bool-literals - modernize-use-equals-default - modernize-use-nullptr - modernize-use-override --- diff --git a/src/codecs/ip/cd_gre.cc b/src/codecs/ip/cd_gre.cc index a6e24f22d..e44757049 100644 --- a/src/codecs/ip/cd_gre.cc +++ b/src/codecs/ip/cd_gre.cc @@ -351,7 +351,7 @@ TEST_CASE ("Validate error check for raw_len greater than GRE_HEADER_LEN", "[cd_ uint16_t size = 1; uint8_t t = 0; Buffer buf(&t, size); - Flow *flow = NULL; + Flow *flow = nullptr; CHECK (grecodec.encode(&raw_in,raw_len,enc,buf,flow) == false); } diff --git a/src/detection/service_map.cc b/src/detection/service_map.cc index 26d7a575d..c5ba0d7a3 100644 --- a/src/detection/service_map.cc +++ b/src/detection/service_map.cc @@ -56,7 +56,7 @@ using namespace snort; static GHash* alloc_srvmap() { // nodes are lists,free them in ghash_delete - return new GHash(1000, 0, 0, (void (*)(void*))sflist_free); + return new GHash(1000, 0, false, (void (*)(void*))sflist_free); } static void free_srvmap(GHash* table) @@ -96,7 +96,7 @@ static void delete_pg(void* pv) static GHash* alloc_spgmm() { // 1000 rows, ascii key - return new GHash(1000, 0, 0, delete_pg); + return new GHash(1000, 0, false, delete_pg); } static void free_spgmm(GHash* table) diff --git a/src/detection/signature.cc b/src/detection/signature.cc index eb4086177..6bd857e3a 100644 --- a/src/detection/signature.cc +++ b/src/detection/signature.cc @@ -175,7 +175,7 @@ static void OtnFree(void* data) GHash* OtnLookupNew() { - return new GHash(10000, sizeof(OtnKey), 0, OtnFree); + return new GHash(10000, sizeof(OtnKey), false, OtnFree); } void OtnLookupAdd(GHash* otn_map, OptTreeNode* otn) diff --git a/src/dump_config/config_data.h b/src/dump_config/config_data.h index 3ade029f5..a399aab09 100644 --- a/src/dump_config/config_data.h +++ b/src/dump_config/config_data.h @@ -63,13 +63,13 @@ public: const snort::Parameter::Type node_type); private: - virtual std::string get_name() const override + std::string get_name() const override { return name; } - virtual snort::Parameter::Type get_type() const override + snort::Parameter::Type get_type() const override { return type; } - virtual BaseConfigNode* get_node(const std::string& name) override; + BaseConfigNode* get_node(const std::string& name) override; private: std::string name; @@ -83,17 +83,17 @@ public: const std::string& name = ""); private: - virtual std::string get_name() const override + std::string get_name() const override { return !custom_name.empty() ? custom_name : value.get_name(); } - virtual snort::Parameter::Type get_type() const override + snort::Parameter::Type get_type() const override { return value.get_param_type(); } - virtual const snort::Value* get_value() const override + const snort::Value* get_value() const override { return &value; } - virtual void set_value(const snort::Value& v) override; - virtual BaseConfigNode* get_node(const std::string& name) override; + void set_value(const snort::Value& v) override; + BaseConfigNode* get_node(const std::string& name) override; private: snort::Value value; diff --git a/src/file_api/file_identifier.cc b/src/file_api/file_identifier.cc index 233b8fa2e..df45ef79c 100644 --- a/src/file_api/file_identifier.cc +++ b/src/file_api/file_identifier.cc @@ -69,7 +69,7 @@ void FileMagicRule::clear() void FileIdentifier::init_merge_hash() { - identifier_merge_hash = new GHash(1000, sizeof(MergeNode), 0, nullptr); + identifier_merge_hash = new GHash(1000, sizeof(MergeNode), false, nullptr); } FileIdentifier::~FileIdentifier() diff --git a/src/flow/flow_data.h b/src/flow/flow_data.h index 6a19e2373..1b997b8c0 100644 --- a/src/flow/flow_data.h +++ b/src/flow/flow_data.h @@ -70,7 +70,7 @@ class SO_PUBLIC RuleFlowData : public FlowData protected: RuleFlowData(unsigned u); public: - virtual ~RuleFlowData() { } + ~RuleFlowData() override = default; }; } diff --git a/src/flow/stash_item.h b/src/flow/stash_item.h index a66007bc5..105490138 100644 --- a/src/flow/stash_item.h +++ b/src/flow/stash_item.h @@ -38,10 +38,7 @@ public: { } - virtual ~StashGenericObject() - { - - } + virtual ~StashGenericObject() = default; int get_object_type() const { return object_type; diff --git a/src/flow/test/flow_cache_test.cc b/src/flow/test/flow_cache_test.cc index 12ca11be9..c60d46206 100644 --- a/src/flow/test/flow_cache_test.cc +++ b/src/flow/test/flow_cache_test.cc @@ -55,7 +55,7 @@ THREAD_LOCAL Active::ActiveSuspendReason Active::s_suspend_reason = Active::ASP_ THREAD_LOCAL PacketTracer* snort::s_pkt_trace = nullptr; void Active::drop_packet(snort::Packet const*, bool) { } -PacketTracer::~PacketTracer() { } +PacketTracer::~PacketTracer() = default; void PacketTracer::log(const char*, ...) { } void PacketTracer::open_file() { } void PacketTracer::dump_to_daq(Packet*) { } @@ -64,12 +64,12 @@ void PacketTracer::pause() { } void PacketTracer::unpause() { } void Active::set_drop_reason(char const*) { } Packet::Packet(bool) { } -Packet::~Packet() { } +Packet::~Packet() = default; Flow::Flow() { memset(this, 0, sizeof(*this)); } -Flow::~Flow() { } -DetectionEngine::DetectionEngine() { } -ExpectCache::~ExpectCache() { } -DetectionEngine::~DetectionEngine() { } +Flow::~Flow() = default; +DetectionEngine::DetectionEngine() = default; +ExpectCache::~ExpectCache() = default; +DetectionEngine::~DetectionEngine() = default; void Flow::init(PktType) { } void Flow::term() { } void Flow::flush(bool) { } diff --git a/src/flow/test/flow_test.cc b/src/flow/test/flow_test.cc index 9af29567a..157eb6a7f 100644 --- a/src/flow/test/flow_test.cc +++ b/src/flow/test/flow_test.cc @@ -71,7 +71,7 @@ IpsContext* DetectionEngine::get_context() { return nullptr; } DetectionEngine::DetectionEngine() = default; -DetectionEngine::~DetectionEngine() {} +DetectionEngine::~DetectionEngine() = default; bool layer::set_outer_ip_api(const Packet* const, ip::IpApi&, int8_t&) { return false; } diff --git a/src/flow/test/ha_test.cc b/src/flow/test/ha_test.cc index 6572303b3..2cef977d4 100644 --- a/src/flow/test/ha_test.cc +++ b/src/flow/test/ha_test.cc @@ -220,7 +220,7 @@ int SFDAQInstance::ioctl(DAQ_IoctlCmd, void*, size_t) { return DAQ_SUCCESS; } Flow::Flow() { ha_state = new FlowHAState; key = new FlowKey; } Flow::~Flow() { delete key; delete ha_state; } -FlowStash::~FlowStash() { } +FlowStash::~FlowStash() = default; void Flow::set_client_initiate(Packet*) { } void Flow::set_direction(Packet*) { } diff --git a/src/framework/ips_action.h b/src/framework/ips_action.h index ca9cad0c8..3338589e1 100644 --- a/src/framework/ips_action.h +++ b/src/framework/ips_action.h @@ -44,7 +44,7 @@ struct Packet; class SO_PUBLIC IpsAction : public ActiveAction { public: - virtual void exec(Packet*) override = 0; + void exec(Packet*) override = 0; const char* get_name() const { return name; } protected: diff --git a/src/framework/parameter.cc b/src/framework/parameter.cc index 3deed16a5..c6ff88b64 100644 --- a/src/framework/parameter.cc +++ b/src/framework/parameter.cc @@ -638,7 +638,7 @@ const_string_tests[] = { false, valid_select, "blue", "red | green | yellow" }, { false, valid_select, "green", nullptr }, - { false, nullptr, 0, nullptr } + { false, nullptr, nullptr, nullptr } // __STRDUMP_ENABLE__ }; @@ -688,7 +688,7 @@ string_tests[] = { false, valid_bit_list, "1 2 3 4", "3" }, { false, valid_bit_list, "128", "3" }, - { false, nullptr, 0, nullptr } + { false, nullptr, nullptr, nullptr } // __STRDUMP_ENABLE__ }; diff --git a/src/framework/test/data_bus_test.cc b/src/framework/test/data_bus_test.cc index b68ddfdb1..c5fce3f4f 100644 --- a/src/framework/test/data_bus_test.cc +++ b/src/framework/test/data_bus_test.cc @@ -34,7 +34,7 @@ using namespace snort; // mocks //-------------------------------------------------------------------------- InspectionPolicy::InspectionPolicy(unsigned int) {} -InspectionPolicy::~InspectionPolicy() {} +InspectionPolicy::~InspectionPolicy() = default; namespace snort { SnortConfig::SnortConfig(snort::SnortConfig const*) diff --git a/src/hash/ghash.h b/src/hash/ghash.h index 566a39a2d..d5da479c8 100644 --- a/src/hash/ghash.h +++ b/src/hash/ghash.h @@ -24,7 +24,7 @@ // generic hash table - stores and maps key + data pairs -#include +#include #include "hash_key_operations.h" #include "main/snort_types.h" diff --git a/src/hash/hash_key_operations.h b/src/hash/hash_key_operations.h index 5b4d6ae3d..e0fefd53b 100644 --- a/src/hash/hash_key_operations.h +++ b/src/hash/hash_key_operations.h @@ -80,8 +80,7 @@ class HashKeyOperations { public: HashKeyOperations(int rows); - virtual ~HashKeyOperations() - { } + virtual ~HashKeyOperations() = default; virtual unsigned do_hash(const unsigned char* key, int len); virtual bool key_compare(const void* key1, const void* key2, size_t len); diff --git a/src/helpers/discovery_filter.cc b/src/helpers/discovery_filter.cc index b8230ae0f..d44dd7b10 100644 --- a/src/helpers/discovery_filter.cc +++ b/src/helpers/discovery_filter.cc @@ -132,7 +132,7 @@ DiscoveryFilter::DiscoveryFilter(const string& conf_path) string dir_str, proto_str, port_str, ip; line_stream >> dir_str >> proto_str >> port_str >> ip; - uint16_t port = strtol(port_str.c_str(), NULL, 10); + uint16_t port = strtol(port_str.c_str(), nullptr, 10); if ( port == 0 ) { WarningMessage("Discovery Filter: Invalid port at line %u from %s;", diff --git a/src/helpers/literal_search.h b/src/helpers/literal_search.h index 4d285ebf2..d71c89beb 100644 --- a/src/helpers/literal_search.h +++ b/src/helpers/literal_search.h @@ -38,12 +38,12 @@ public: static LiteralSearch* instantiate( Handle*, const uint8_t* pattern, unsigned pattern_len, bool no_case = false, bool hs = false); - virtual ~LiteralSearch() { } + virtual ~LiteralSearch() = default; virtual int search(Handle*, const uint8_t* buffer, unsigned buffer_len) const = 0; protected: - LiteralSearch() { } + LiteralSearch() = default; }; } diff --git a/src/host_tracker/host_cache.h b/src/host_tracker/host_cache.h index 4bc1508da..34a5255f3 100644 --- a/src/host_tracker/host_cache.h +++ b/src/host_tracker/host_cache.h @@ -266,13 +266,13 @@ class HostCacheIp : public HostCacheIpSpec public: HostCacheIp(const size_t initial_size) : HostCacheIpSpec(initial_size) { } - bool remove(const KeyType& key) + bool remove(const KeyType& key) override { LruBase::Data data; return remove(key, data); } - bool remove(const KeyType& key, LruBase::Data& data) + bool remove(const KeyType& key, LruBase::Data& data) override { bool out = LruBase::remove(key, data); data->remove_flows(); diff --git a/src/host_tracker/host_cache_allocator.h b/src/host_tracker/host_cache_allocator.h index 756fa0da3..8c71a0519 100644 --- a/src/host_tracker/host_cache_allocator.h +++ b/src/host_tracker/host_cache_allocator.h @@ -41,7 +41,7 @@ public: protected: - HostCacheInterface* lru = 0; + HostCacheInterface* lru = nullptr; }; template diff --git a/src/ips_options/test/ips_regex_test.cc b/src/ips_options/test/ips_regex_test.cc index 0fbac8844..024b90900 100644 --- a/src/ips_options/test/ips_regex_test.cc +++ b/src/ips_options/test/ips_regex_test.cc @@ -111,7 +111,7 @@ Cursor::Cursor(Packet* p) void show_stats(PegCount*, const PegInfo*, unsigned, const char*) { } void show_stats(PegCount*, const PegInfo*, const IndexVec&, const char*, FILE*) { } -OptTreeNode::~OptTreeNode() { } +OptTreeNode::~OptTreeNode() = default; //------------------------------------------------------------------------- // helpers diff --git a/src/log/messages.cc b/src/log/messages.cc index 7b5fb366c..63e244f4d 100644 --- a/src/log/messages.cc +++ b/src/log/messages.cc @@ -23,10 +23,11 @@ #include "messages.h" +#include + #include #include -#include -#include +#include #include "main/snort_config.h" #include "parser/parser.h" diff --git a/src/main/snort_debug.cc b/src/main/snort_debug.cc index 362df68a9..1c47ff423 100644 --- a/src/main/snort_debug.cc +++ b/src/main/snort_debug.cc @@ -124,7 +124,7 @@ public: Module(name, "trace_test_help"), test_trace_options(trace_options) { } - virtual const TraceOption* get_trace_options() const + const TraceOption* get_trace_options() const override { return test_trace_options; } private: diff --git a/src/main/test/stubs.h b/src/main/test/stubs.h index 984652f7f..503644bcc 100644 --- a/src/main/test/stubs.h +++ b/src/main/test/stubs.h @@ -68,7 +68,7 @@ void Profiler::start() { } void Profiler::stop(uint64_t) { } void Profiler::consolidate_stats() { } void Swapper::apply(Analyzer&) { } -Swapper::~Swapper() { } +Swapper::~Swapper() = default; void OopsHandler::tinit() { } void OopsHandler::tterm() { } uint16_t get_run_num() { return 0; } @@ -77,7 +77,7 @@ void set_instance_id(unsigned) { } void set_thread_type(SThreadType) { } void ContextSwitcher::push(snort::IpsContext*) { } void ContextSwitcher::stop() { } -ContextSwitcher::~ContextSwitcher() { } +ContextSwitcher::~ContextSwitcher() = default; snort::IpsContext* ContextSwitcher::get_context() const { return nullptr; } void ContextSwitcher::start() { } void InitTag() { } @@ -126,7 +126,7 @@ THREAD_LOCAL PacketCount pc; void packet_gettimeofday(struct timeval* tv) { *tv = s_packet_time; } MemoryContext::MemoryContext(MemoryTracker&) : saved(nullptr) { } -MemoryContext::~MemoryContext() { } +MemoryContext::~MemoryContext() = default; Packet::Packet(bool) { memset(this , 0, sizeof(*this)); @@ -138,7 +138,7 @@ IpsPolicy* get_ips_policy() { return nullptr; } void DataBus::publish(const char*, Packet*, Flow*) { } void DataBus::publish(const char*, DataEvent&, Flow*) { } SFDAQInstance::SFDAQInstance(const char*, unsigned, const SFDAQConfig*) { } -SFDAQInstance::~SFDAQInstance() { } +SFDAQInstance::~SFDAQInstance() = default; void SFDAQInstance::reload() { } bool SFDAQInstance::start() { return false; } bool SFDAQInstance::stop() { return false; } @@ -154,8 +154,8 @@ int SFDAQ::inject(DAQ_Msg_h, int, const uint8_t*, uint32_t) { return -1; } bool SFDAQ::can_inject() { return false; } bool SFDAQ::can_inject_raw() { return false; } int SFDAQInstance::set_packet_verdict_reason(DAQ_Msg_h, uint8_t) { return 0; } -DetectionEngine::DetectionEngine() { } -DetectionEngine::~DetectionEngine() { } +DetectionEngine::DetectionEngine() = default; +DetectionEngine::~DetectionEngine() = default; void DetectionEngine::onload() { } void DetectionEngine::thread_init() { } void DetectionEngine::thread_term() { } @@ -212,7 +212,7 @@ void Stream::block_flow(const Packet*) { } IpsContext::IpsContext(unsigned) { } NetworkPolicy* get_network_policy() { return nullptr; } InspectionPolicy* get_inspection_policy() { return nullptr; } -Flow::Flow() { } -Flow::~Flow() { } +Flow::Flow() = default; +Flow::~Flow() = default; void ThreadConfig::implement_thread_affinity(SThreadType, unsigned) { } } diff --git a/src/network_inspectors/appid/appid_config.h b/src/network_inspectors/appid/appid_config.h index 08c515662..d8d52436b 100644 --- a/src/network_inspectors/appid/appid_config.h +++ b/src/network_inspectors/appid/appid_config.h @@ -246,7 +246,7 @@ public: AppIdContext(AppIdConfig& config) : config(config) { } - ~AppIdContext() { } + ~AppIdContext() = default; OdpContext& get_odp_ctxt() const { diff --git a/src/network_inspectors/appid/appid_debug.h b/src/network_inspectors/appid/appid_debug.h index c435d21a8..db41829ed 100644 --- a/src/network_inspectors/appid/appid_debug.h +++ b/src/network_inspectors/appid/appid_debug.h @@ -22,7 +22,7 @@ #ifndef APPID_DEBUG_H #define APPID_DEBUG_H -#include +#include #include diff --git a/src/network_inspectors/appid/appid_discovery.h b/src/network_inspectors/appid/appid_discovery.h index 7611dffa9..70e668e92 100644 --- a/src/network_inspectors/appid/appid_discovery.h +++ b/src/network_inspectors/appid/appid_discovery.h @@ -94,7 +94,7 @@ typedef AppIdDetectors::iterator AppIdDetectorsIterator; class AppIdDiscovery { public: - AppIdDiscovery() { } + AppIdDiscovery() = default; virtual ~AppIdDiscovery(); AppIdDiscovery(const AppIdDiscovery&) = delete; diff --git a/src/network_inspectors/appid/appid_http_session.cc b/src/network_inspectors/appid/appid_http_session.cc index ca77eb4b0..45d55282c 100644 --- a/src/network_inspectors/appid/appid_http_session.cc +++ b/src/network_inspectors/appid/appid_http_session.cc @@ -129,7 +129,7 @@ void AppIdHttpSession::set_tun_dest() host_end = port_str; if (*(++port_str) != '\0') { - char *end = NULL; + char *end = nullptr; long ret = strtol(port_str, &end, 10); if (end != port_str && *end == '\0' && ret >= 1 && ret <= PORT_MAX) { @@ -392,7 +392,7 @@ void AppIdHttpSession::process_chp_buffers(AppidChangeBits& change_bits, HttpPat } chp_candidate = 0; - chp_hold_flow = 0; + chp_hold_flow = false; asd.scan_flags &= ~SCAN_HTTP_VIA_FLAG; asd.scan_flags &= ~SCAN_HTTP_USER_AGENT_FLAG; asd.scan_flags &= ~SCAN_HTTP_HOST_URL_FLAG; diff --git a/src/network_inspectors/appid/appid_session_api.h b/src/network_inspectors/appid/appid_session_api.h index baa2b6585..726e39cf9 100644 --- a/src/network_inspectors/appid/appid_session_api.h +++ b/src/network_inspectors/appid/appid_session_api.h @@ -132,7 +132,7 @@ public: void get_first_stream_app_ids(AppId& service, AppId& client, AppId& payload, AppId& misc) const; void get_first_stream_app_ids(AppId& service, AppId& client, AppId& payload) const; - ~AppIdSessionApi() + ~AppIdSessionApi() override { delete_session_data(); } diff --git a/src/network_inspectors/appid/detector_plugins/detector_sip.h b/src/network_inspectors/appid/detector_plugins/detector_sip.h index eb9af2c84..22e0bc6c4 100644 --- a/src/network_inspectors/appid/detector_plugins/detector_sip.h +++ b/src/network_inspectors/appid/detector_plugins/detector_sip.h @@ -41,7 +41,7 @@ class SipUdpClientDetector : public ClientDetector { public: SipUdpClientDetector(ClientDiscovery*); - ~SipUdpClientDetector() override { } + ~SipUdpClientDetector() override = default; int validate(AppIdDiscoveryArgs&) override; }; diff --git a/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc b/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc index 2f5678801..2b264d352 100644 --- a/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc +++ b/src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc @@ -64,7 +64,7 @@ void SearchTool::reload() { } } void ApplicationDescriptor::set_id(const Packet&, AppIdSession&, AppidSessionDirection, AppId, AppidChangeBits&) { } -AppIdDiscovery::~AppIdDiscovery() { } +AppIdDiscovery::~AppIdDiscovery() = default; void ClientDiscovery::initialize(AppIdInspector&) { } void ClientDiscovery::reload() { } void AppIdDiscovery::register_detector(const string&, AppIdDetector*, IpProtocol) { } @@ -72,9 +72,9 @@ void AppIdDiscovery::add_pattern_data(AppIdDetector*, snort::SearchTool&, int, u void AppIdDiscovery::register_tcp_pattern(AppIdDetector*, unsigned char const*, unsigned int, int, unsigned int) { } void AppIdDiscovery::register_udp_pattern(AppIdDetector*, unsigned char const*, unsigned int, int, unsigned int) { } int AppIdDiscovery::add_service_port(AppIdDetector*, ServiceDetectorPort const&) { return 0; } -DnsPatternMatchers::~DnsPatternMatchers() { } -SipPatternMatchers::~SipPatternMatchers() { } -SslPatternMatchers::~SslPatternMatchers() { } +DnsPatternMatchers::~DnsPatternMatchers() = default; +SipPatternMatchers::~SipPatternMatchers() = default; +SslPatternMatchers::~SslPatternMatchers() = default; void AppIdModule::reset_stats() {} TEST_GROUP(http_url_patterns_tests) diff --git a/src/network_inspectors/appid/lua_detector_api.h b/src/network_inspectors/appid/lua_detector_api.h index d29e7ae01..fb1974e26 100644 --- a/src/network_inspectors/appid/lua_detector_api.h +++ b/src/network_inspectors/appid/lua_detector_api.h @@ -142,7 +142,7 @@ public: LuaServiceObject(AppIdDiscovery* sdm, const std::string& detector_name, const std::string& log_name, bool is_custom, IpProtocol protocol, lua_State* L, OdpContext& odp_ctxt); - ServiceDetector* get_detector() + ServiceDetector* get_detector() override { return sd; } }; @@ -153,7 +153,7 @@ public: LuaClientObject(const std::string& detector_name, const std::string& log_name, bool is_custom, IpProtocol protocol, lua_State* L, OdpContext& odp_ctxt); - ClientDetector* get_detector() + ClientDetector* get_detector() override { return cd; } }; diff --git a/src/network_inspectors/appid/service_plugins/service_discovery.h b/src/network_inspectors/appid/service_plugins/service_discovery.h index a7719f252..5263a8385 100644 --- a/src/network_inspectors/appid/service_plugins/service_discovery.h +++ b/src/network_inspectors/appid/service_plugins/service_discovery.h @@ -63,7 +63,7 @@ enum SESSION_SERVICE_SEARCH_STATE class ServiceDiscovery : public AppIdDiscovery { public: - ~ServiceDiscovery() override { } + ~ServiceDiscovery() override = default; void initialize(AppIdInspector&) override; void reload() override; void finalize_service_patterns(); diff --git a/src/network_inspectors/appid/service_plugins/test/service_netbios_test.cc b/src/network_inspectors/appid/service_plugins/test/service_netbios_test.cc index 145a1c7b2..33061e067 100644 --- a/src/network_inspectors/appid/service_plugins/test/service_netbios_test.cc +++ b/src/network_inspectors/appid/service_plugins/test/service_netbios_test.cc @@ -42,7 +42,7 @@ int ServiceDiscovery::identify_service(AppIdSession&, Packet*, AppidSessionDirec AppidChangeBits&) { return 0; } int ServiceDiscovery::add_ftp_service_state(AppIdSession&) { return 0; } bool ServiceDiscovery::do_service_discovery(AppIdSession&, Packet*, AppidSessionDirection, - AppidChangeBits&) { return 0; } + AppidChangeBits&) { return false; } int ServiceDiscovery::incompatible_data(AppIdSession&, const Packet*,AppidSessionDirection, ServiceDetector*) { return 0; } int ServiceDiscovery::fail_service(AppIdSession&, const Packet*, AppidSessionDirection, diff --git a/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h b/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h index 39b1b5fd1..8141c59f8 100644 --- a/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h +++ b/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h @@ -80,10 +80,10 @@ AppIdSessionApi::AppIdSessionApi(const AppIdSession*, const SfIp&) : StashGenericObject(STASH_GENERIC_OBJECT_APPID) {} } -SslPatternMatchers::~SslPatternMatchers() { } -SipPatternMatchers::~SipPatternMatchers() { } -HttpPatternMatchers::~HttpPatternMatchers() { } -DnsPatternMatchers::~DnsPatternMatchers() { } +SslPatternMatchers::~SslPatternMatchers() = default; +SipPatternMatchers::~SipPatternMatchers() = default; +HttpPatternMatchers::~HttpPatternMatchers() = default; +DnsPatternMatchers::~DnsPatternMatchers() = default; void ClientDiscovery::initialize(AppIdInspector&) {} void ClientDiscovery::reload() {} FpSMBData* smb_data = nullptr; @@ -121,7 +121,7 @@ int AppIdSession::add_flow_data(void* data, unsigned type, AppIdFreeFCN) } int dcerpc_validate(const uint8_t*, int){return 0; } -AppIdDiscovery::~AppIdDiscovery() { } +AppIdDiscovery::~AppIdDiscovery() = default; void show_stats(PegCount*, const PegInfo*, unsigned, const char*) { } void show_stats(PegCount*, const PegInfo*, const IndexVec&, const char*, FILE*) { } AppIdConfig config; diff --git a/src/network_inspectors/appid/service_state.h b/src/network_inspectors/appid/service_state.h index 2c9879048..628b4814f 100644 --- a/src/network_inspectors/appid/service_state.h +++ b/src/network_inspectors/appid/service_state.h @@ -227,7 +227,7 @@ public: return ss; } - ServiceDiscoveryState* get(const AppIdServiceStateKey& k, bool do_touch = 0) + ServiceDiscoveryState* get(const AppIdServiceStateKey& k, bool do_touch = false) { Map_t::const_iterator it = m.find(k); if ( it != m.end() ) { diff --git a/src/network_inspectors/appid/test/appid_api_test.cc b/src/network_inspectors/appid/test/appid_api_test.cc index 465a768c9..53e5796fd 100644 --- a/src/network_inspectors/appid/test/appid_api_test.cc +++ b/src/network_inspectors/appid/test/appid_api_test.cc @@ -55,7 +55,7 @@ class Inspector* InspectorManager::get_inspector(const char*, bool, const SnortC { return &dummy_appid_inspector; } Packet::Packet(bool) { } -Packet::~Packet() { } +Packet::~Packet() = default; Packet* DetectionEngine::get_current_packet() { diff --git a/src/network_inspectors/appid/test/appid_debug_test.cc b/src/network_inspectors/appid/test/appid_debug_test.cc index 9b14e7495..156833669 100644 --- a/src/network_inspectors/appid/test/appid_debug_test.cc +++ b/src/network_inspectors/appid/test/appid_debug_test.cc @@ -24,8 +24,8 @@ #include "network_inspectors/appid/appid_debug.cc" -#include -#include +#include +#include #include "flow/flow.h" #include "network_inspectors/appid/appid_session.h" @@ -54,7 +54,7 @@ public: AppIdInspector() = default; }; -AppIdConfig::~AppIdConfig() { } +AppIdConfig::~AppIdConfig() = default; OdpContext::OdpContext(const AppIdConfig&, snort::SnortConfig*) { } AppIdConfig stub_config; diff --git a/src/network_inspectors/appid/test/appid_discovery_test.cc b/src/network_inspectors/appid/test/appid_discovery_test.cc index 11e157c7b..657362570 100644 --- a/src/network_inspectors/appid/test/appid_discovery_test.cc +++ b/src/network_inspectors/appid/test/appid_discovery_test.cc @@ -44,7 +44,7 @@ namespace snort { // Stubs for packet Packet::Packet(bool) {} -Packet::~Packet() {} +Packet::~Packet() = default; bool Packet::get_ip_proto_next(unsigned char&, IpProtocol&) const { return true; } // Stubs for inspector @@ -87,7 +87,7 @@ time_t packet_time() { return std::time(nullptr); } // Stubs for search_tool SearchTool::SearchTool(const char*, bool) {} -SearchTool::~SearchTool() {} +SearchTool::~SearchTool() = default; void SearchTool::add(const char*, unsigned, int, bool) {} void SearchTool::add(const char*, unsigned, void*, bool) {} void SearchTool::add(const uint8_t*, unsigned, int, bool) {} @@ -122,11 +122,11 @@ void DataBus::publish(const char*, DataEvent& event, Flow*) // Stubs for matchers static HttpPatternMatchers* http_matchers; -DnsPatternMatchers::~DnsPatternMatchers() { } -HttpPatternMatchers::~HttpPatternMatchers() {} +DnsPatternMatchers::~DnsPatternMatchers() = default; +HttpPatternMatchers::~HttpPatternMatchers() = default; void HttpPatternMatchers::get_http_offsets(Packet*, AppIdHttpSession*) {} -SipPatternMatchers::~SipPatternMatchers() { } -SslPatternMatchers::~SslPatternMatchers() { } +SipPatternMatchers::~SipPatternMatchers() = default; +SslPatternMatchers::~SslPatternMatchers() = default; void ApplicationDescriptor::set_id(const Packet&, AppIdSession&, AppidSessionDirection, AppId, AppidChangeBits&) { } void ApplicationDescriptor::set_id(AppId app_id){my_id = app_id;} @@ -143,7 +143,7 @@ void PayloadAppDescriptor::update_stats(AppId, bool) {} // Stubs for AppIdModule AppIdModule::AppIdModule(): Module("appid_mock", "appid_mock_help") {} -AppIdModule::~AppIdModule() {} +AppIdModule::~AppIdModule() = default; void AppIdModule::sum_stats(bool) {} void AppIdModule::show_dynamic_stats() {} bool AppIdModule::begin(char const*, int, SnortConfig*) { return true; } @@ -202,7 +202,7 @@ void AppIdSession::set_client_appid_data(AppId, AppidChangeBits&, char*) {} void AppIdSession::examine_rtmp_metadata(AppidChangeBits&) {} void AppIdSession::examine_ssl_metadata(AppidChangeBits&) {} void AppIdSession::update_encrypted_app_id(AppId) {} -bool AppIdSession::is_tp_processing_done() const {return 0;} +bool AppIdSession::is_tp_processing_done() const {return false;} AppId AppIdSession::pick_ss_payload_app_id(AppId) const { return get_payload_id(); } AppIdSession* AppIdSession::allocate_session(const Packet*, IpProtocol, AppidSessionDirection, AppIdInspector&, OdpContext&) @@ -229,7 +229,7 @@ int ServiceDiscovery::identify_service(AppIdSession&, Packet*, AppidSessionDirec AppidChangeBits&) { return 0; } int ServiceDiscovery::add_ftp_service_state(AppIdSession&) { return 0; } bool ServiceDiscovery::do_service_discovery(AppIdSession&, Packet*, AppidSessionDirection, - AppidChangeBits&) { return 0; } + AppidChangeBits&) { return false; } int ServiceDiscovery::incompatible_data(AppIdSession&, const Packet*,AppidSessionDirection, ServiceDetector*) { return 0; } int ServiceDiscovery::fail_service(AppIdSession&, const Packet*, AppidSessionDirection, diff --git a/src/network_inspectors/appid/test/appid_http_event_test.cc b/src/network_inspectors/appid/test/appid_http_event_test.cc index b9b9708f6..4f622e5f7 100644 --- a/src/network_inspectors/appid/test/appid_http_event_test.cc +++ b/src/network_inspectors/appid/test/appid_http_event_test.cc @@ -52,7 +52,7 @@ namespace snort { AppIdApi appid_api; Packet::Packet(bool) { } -Packet::~Packet() { } +Packet::~Packet() = default; Packet* DetectionEngine::get_current_packet() { @@ -256,7 +256,7 @@ TEST_GROUP(appid_http_event) mock_session->create_http_session(); flow->set_flow_data(mock_session); appidDebug = new AppIdDebug(); - appidDebug->activate(nullptr, nullptr, 0); + appidDebug->activate(nullptr, nullptr, false); } void teardown() override diff --git a/src/network_inspectors/appid/test/appid_http_session_test.cc b/src/network_inspectors/appid/test/appid_http_session_test.cc index e3629a63b..05a1bb3b8 100644 --- a/src/network_inspectors/appid/test/appid_http_session_test.cc +++ b/src/network_inspectors/appid/test/appid_http_session_test.cc @@ -170,7 +170,7 @@ void memory::MemoryCap::update_deallocations(size_t) { } OdpContext::OdpContext(const AppIdConfig&, snort::SnortConfig*) { } -AppIdConfig::~AppIdConfig() { } +AppIdConfig::~AppIdConfig() = default; unsigned AppIdSession::inspector_id = 0; THREAD_LOCAL AppIdDebug* appidDebug = nullptr; diff --git a/src/network_inspectors/appid/test/appid_mock_definitions.h b/src/network_inspectors/appid/test/appid_mock_definitions.h index 7b5e0a398..bd4bd1d36 100644 --- a/src/network_inspectors/appid/test/appid_mock_definitions.h +++ b/src/network_inspectors/appid/test/appid_mock_definitions.h @@ -56,7 +56,7 @@ void ParseWarning(WarningGroup, const char*, ...) { } void LogLabel(const char*, FILE*) {} SearchTool::SearchTool(char const*, bool) { } -SearchTool::~SearchTool() { } +SearchTool::~SearchTool() = default; } void ApplicationDescriptor::set_id(AppId app_id){ my_id = app_id;} @@ -72,7 +72,7 @@ void ClientAppDescriptor::update_user(AppId app_id, const char* username, AppidC void ClientAppDescriptor::update_stats(AppId, bool) {} void PayloadAppDescriptor::update_stats(AppId, bool) {} -AppIdDiscovery::~AppIdDiscovery() { } +AppIdDiscovery::~AppIdDiscovery() = default; void ClientDiscovery::initialize(AppIdInspector&) { } void ClientDiscovery::reload() { } void AppIdDiscovery::register_detector(const string&, AppIdDetector*, IpProtocol) { } @@ -80,10 +80,10 @@ void AppIdDiscovery::add_pattern_data(AppIdDetector*, snort::SearchTool&, int, u void AppIdDiscovery::register_tcp_pattern(AppIdDetector*, unsigned char const*, unsigned int, int, unsigned int) { } void AppIdDiscovery::register_udp_pattern(AppIdDetector*, unsigned char const*, unsigned int, int, unsigned int) { } int AppIdDiscovery::add_service_port(AppIdDetector*, ServiceDetectorPort const&) { return 0; } -DnsPatternMatchers::~DnsPatternMatchers() { } -HttpPatternMatchers::~HttpPatternMatchers() { } -SipPatternMatchers::~SipPatternMatchers() { } -SslPatternMatchers::~SslPatternMatchers() { } +DnsPatternMatchers::~DnsPatternMatchers() = default; +HttpPatternMatchers::~HttpPatternMatchers() = default; +SipPatternMatchers::~SipPatternMatchers() = default; +SslPatternMatchers::~SslPatternMatchers() = default; void Field::set(int32_t length, const uint8_t* start, bool own_the_buffer_) { diff --git a/src/network_inspectors/appid/test/appid_mock_flow.h b/src/network_inspectors/appid/test/appid_mock_flow.h index 4e97221bb..8ecc866f6 100644 --- a/src/network_inspectors/appid/test/appid_mock_flow.h +++ b/src/network_inspectors/appid/test/appid_mock_flow.h @@ -51,7 +51,7 @@ int Flow::set_flow_data(FlowData* fd) return 0; } -FlowStash::~FlowStash() { } +FlowStash::~FlowStash() = default; #endif diff --git a/src/network_inspectors/appid/test/appid_mock_inspector.h b/src/network_inspectors/appid/test/appid_mock_inspector.h index 328ccb598..882d39cc0 100644 --- a/src/network_inspectors/appid/test/appid_mock_inspector.h +++ b/src/network_inspectors/appid/test/appid_mock_inspector.h @@ -47,7 +47,7 @@ PegCount Module::get_global_count(char const*) const { return 0; } } AppIdModule::AppIdModule(): snort::Module("appid_mock", "appid_mock_help") {} -AppIdModule::~AppIdModule() {} +AppIdModule::~AppIdModule() = default; void AppIdModule::sum_stats(bool) {} void AppIdModule::show_dynamic_stats() {} bool AppIdModule::begin(char const*, int, snort::SnortConfig*) { return true; } @@ -60,7 +60,7 @@ snort::ProfileStats* AppIdModule::get_profile() const { return nullptr; } void AppIdModule::set_trace(const Trace*) const { } const TraceOption* AppIdModule::get_trace_options() const { return nullptr; } -AppIdInspector::~AppIdInspector() { } +AppIdInspector::~AppIdInspector() = default; void AppIdInspector::eval(snort::Packet*) { } bool AppIdInspector::configure(snort::SnortConfig*) { return true; } void AppIdInspector::show(const SnortConfig*) const { } diff --git a/src/network_inspectors/appid/test/appid_mock_session.h b/src/network_inspectors/appid/test/appid_mock_session.h index 2074f5f8e..4edf20748 100644 --- a/src/network_inspectors/appid/test/appid_mock_session.h +++ b/src/network_inspectors/appid/test/appid_mock_session.h @@ -71,7 +71,7 @@ public: } }; -AppIdConfig::~AppIdConfig() { } +AppIdConfig::~AppIdConfig() = default; OdpContext::OdpContext(const AppIdConfig&, snort::SnortConfig*) { } void FlowHAState::add(uint8_t) { } diff --git a/src/network_inspectors/appid/test/service_state_test.cc b/src/network_inspectors/appid/test/service_state_test.cc index ae2db4a40..b4182b6b6 100644 --- a/src/network_inspectors/appid/test/service_state_test.cc +++ b/src/network_inspectors/appid/test/service_state_test.cc @@ -51,7 +51,7 @@ char* snort_strdup(const char* str) memcpy(p, str, n); return p; } -time_t packet_time() { return std::time(0); } +time_t packet_time() { return std::time(nullptr); } AppIdSessionApi::AppIdSessionApi(const AppIdSession*, const SfIp&) : StashGenericObject(STASH_GENERIC_OBJECT_APPID) {} @@ -82,7 +82,7 @@ void ServiceAppDescriptor::set_port_service_id(AppId){} void ClientAppDescriptor::update_user(AppId, const char*, AppidChangeBits&){} void ClientAppDescriptor::update_stats(AppId, bool) {} void PayloadAppDescriptor::update_stats(AppId, bool) {} -AppIdConfig::~AppIdConfig() { } +AppIdConfig::~AppIdConfig() = default; OdpContext::OdpContext(const AppIdConfig&, snort::SnortConfig*) { } AppIdConfig stub_config; AppIdContext stub_ctxt(stub_config); @@ -91,7 +91,7 @@ AppIdSession::AppIdSession(IpProtocol, const SfIp* ip, uint16_t, AppIdInspector& OdpContext&, uint16_t) : FlowData(0), config(stub_config), api(*(new AppIdSessionApi(this, *ip))), odp_ctxt(stub_odp_ctxt) { } AppIdSession::~AppIdSession() = default; -AppIdDiscovery::~AppIdDiscovery() {} +AppIdDiscovery::~AppIdDiscovery() = default; void ClientDiscovery::initialize(AppIdInspector&) { } void ClientDiscovery::reload() { } void AppIdDiscovery::register_detector(const std::string&, AppIdDetector*, IpProtocol) {} @@ -113,26 +113,26 @@ int ServiceDiscovery::identify_service(AppIdSession&, Packet*, AppidSessionDirec AppidChangeBits&) { return 0; } int ServiceDiscovery::add_ftp_service_state(AppIdSession&) { return 0; } bool ServiceDiscovery::do_service_discovery(AppIdSession&, Packet*, AppidSessionDirection, - AppidChangeBits&) { return 0; } + AppidChangeBits&) { return false; } int ServiceDiscovery::incompatible_data(AppIdSession&, const Packet*,AppidSessionDirection, ServiceDetector*) { return 0; } int ServiceDiscovery::fail_service(AppIdSession&, const Packet*, AppidSessionDirection, ServiceDetector*, ServiceDiscoveryState*) { return 0; } int ServiceDiscovery::add_service_port(AppIdDetector*, const ServiceDetectorPort&) { return APPID_EINVALID; } -DnsPatternMatchers::~DnsPatternMatchers() { } -HttpPatternMatchers::~HttpPatternMatchers() { } -SipPatternMatchers::~SipPatternMatchers() { } -SslPatternMatchers::~SslPatternMatchers() { } +DnsPatternMatchers::~DnsPatternMatchers() = default; +HttpPatternMatchers::~HttpPatternMatchers() = default; +SipPatternMatchers::~SipPatternMatchers() = default; +SslPatternMatchers::~SslPatternMatchers() = default; snort::SearchTool::SearchTool(char const*, bool) { } -snort::SearchTool::~SearchTool() { } +snort::SearchTool::~SearchTool() = default; TEST_GROUP(service_state_tests) { void setup() override { appidDebug = new AppIdDebug(); - appidDebug->activate(nullptr, nullptr, 0); + appidDebug->activate(nullptr, nullptr, false); } void teardown() override @@ -190,8 +190,8 @@ TEST(service_state_tests, set_service_id_failed_with_valid) // Testing 3+ failures to exceed STATE_ID_NEEDED_DUPE_DETRACT_COUNT with valid_count > 1 sds.set_state(ServiceState::VALID); - sds.set_service_id_valid(0); - sds.set_service_id_valid(0); + sds.set_service_id_valid(nullptr); + sds.set_service_id_valid(nullptr); sds.set_service_id_failed(asd, &client_ip, 0); sds.set_service_id_failed(asd, &client_ip, 0); sds.set_service_id_failed(asd, &client_ip, 0); @@ -209,8 +209,8 @@ TEST(service_state_tests, appid_service_state_key_comparison_test) IpProtocol proto = IpProtocol::TCP; uint16_t port=3000; - AppIdServiceStateKey A(&ip4, proto, port, 0, DAQ_PKTHDR_UNKNOWN, 0); - AppIdServiceStateKey B(&ip6, proto, port, 0, DAQ_PKTHDR_UNKNOWN, 0); + AppIdServiceStateKey A(&ip4, proto, port, 0, DAQ_PKTHDR_UNKNOWN, false); + AppIdServiceStateKey B(&ip6, proto, port, 0, DAQ_PKTHDR_UNKNOWN, false); // We must never be in a situation where !( Areset_ptype_scan_counts(); @@ -328,7 +328,7 @@ static inline void process_rtmp(AppIdSession& asd, bool own = true; uint16_t size = 0; - const string* field=0; + const string* field=nullptr; if ( !hsession->get_field(MISC_URL_FID) ) { @@ -424,7 +424,7 @@ static inline void process_ssl(AppIdSession& asd, { AppId tmpAppId = APP_ID_NONE; int tmpConfidence = 0; - const string* field = 0; + const string* field = nullptr; int reinspect_ssl_appid = 0; if (asd.get_session_flags(APPID_SESSION_HTTP_TUNNEL)) @@ -486,7 +486,7 @@ static inline void process_ssl(AppIdSession& asd, static inline void process_ftp_control(AppIdSession& asd, ThirdPartyAppIDAttributeData& attribute_data, AppidChangeBits& change_bits) { - const string* field=0; + const string* field=nullptr; if (!asd.get_odp_ctxt().ftp_userid_disabled && (field=attribute_data.ftp_command_user()) != nullptr) { @@ -498,7 +498,7 @@ static inline void process_ftp_control(AppIdSession& asd, static inline void process_quic(AppIdSession& asd, ThirdPartyAppIDAttributeData& attribute_data, AppidChangeBits& change_bits) { - const string* field = 0; + const string* field = nullptr; if ( !asd.tsession ) asd.tsession = new TlsSession(); diff --git a/src/network_inspectors/reputation/reputation_parse.cc b/src/network_inspectors/reputation/reputation_parse.cc index 7128c77ed..f5c788565 100644 --- a/src/network_inspectors/reputation/reputation_parse.cc +++ b/src/network_inspectors/reputation/reputation_parse.cc @@ -837,7 +837,7 @@ static bool process_line_in_manifest(ListFile* list_item, const char* manifest, list_item->intfs.clear(); - while ((token = strtok_r(next_ptr, MANIFEST_SEPARATORS, &next_ptr)) != NULL) + while ((token = strtok_r(next_ptr, MANIFEST_SEPARATORS, &next_ptr)) != nullptr) { char* end_str; long intf_id; diff --git a/src/network_inspectors/rna/rna_config.h b/src/network_inspectors/rna/rna_config.h index 8c99ba0b9..98729c125 100644 --- a/src/network_inspectors/rna/rna_config.h +++ b/src/network_inspectors/rna/rna_config.h @@ -46,8 +46,8 @@ struct RnaConfig uint16_t max_payloads = 100; uint16_t max_host_services = 100; uint16_t max_host_service_info = 16; - bool enable_banner_grab = 0; - bool log_when_idle = 0; + bool enable_banner_grab = false; + bool log_when_idle = false; }; #endif diff --git a/src/network_inspectors/rna/rna_fingerprint.h b/src/network_inspectors/rna/rna_fingerprint.h index 73041d426..2dc37f153 100644 --- a/src/network_inspectors/rna/rna_fingerprint.h +++ b/src/network_inspectors/rna/rna_fingerprint.h @@ -65,7 +65,7 @@ public: std::string fpuuid; uint8_t ttl = 0; - virtual ~FpFingerprint() { } + virtual ~FpFingerprint() = default; virtual void clear() { diff --git a/src/network_inspectors/rna/rna_fingerprint_tcp.cc b/src/network_inspectors/rna/rna_fingerprint_tcp.cc index 9a723212c..e606d8665 100644 --- a/src/network_inspectors/rna/rna_fingerprint_tcp.cc +++ b/src/network_inspectors/rna/rna_fingerprint_tcp.cc @@ -402,7 +402,7 @@ const TcpFingerprint* TcpFpProcessor::get(const Packet* p, RNAFlow* flowp) const /* build a key for the lookup */ if (p->is_ip6()) - fpk.isIpv6 = 1; + fpk.isIpv6 = true; else if (p->ptrs.ip_api.get_ip4h()->df()) fpk.df = true; @@ -414,7 +414,7 @@ const TcpFingerprint* TcpFpProcessor::get(const Packet* p, RNAFlow* flowp) const get_tcp_option(p, tcp::TcpOptCode::SACKOK, fpk.sackok_pos); fpk.ws = get_tcp_option(p, tcp::TcpOptCode::WSCALE, fpk.ws_pos); get_tcp_option(p, tcp::TcpOptCode::TIMESTAMP, fpk.timestamp_pos); - mssOptionPresent = 1; + mssOptionPresent = true; } TCP_FP_MODE traffic_source = p->ptrs.tcph->is_ack() ? TCP_FP_MODE::SERVER : TCP_FP_MODE::CLIENT; @@ -508,7 +508,7 @@ TEST_CASE("clear_fingerprint", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2 3 4 8"; rawfp.ws = "6"; - rawfp.df = 1; + rawfp.df = true; TcpFingerprint tfp(rawfp); tfp.clear(); @@ -543,7 +543,7 @@ TEST_CASE("raw_to_tcp_fp", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2 3 4 8"; rawfp.ws = "6"; - rawfp.df = 1; + rawfp.df = true; TcpFingerprint tfpe; tfpe.fpid = rawfp.fpid; @@ -581,7 +581,7 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2 3 4 8"; rawfp.ws = "6"; - rawfp.df = 1; + rawfp.df = true; processor->push(rawfp); TcpFingerprint f948(rawfp); @@ -594,7 +594,7 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2 4 8 3"; rawfp.ws = "8"; - rawfp.df = 1; + rawfp.df = true; processor->push(rawfp); TcpFingerprint f30962(rawfp); @@ -607,7 +607,7 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2 4 8 3"; rawfp.ws = "7"; - rawfp.df = 0; + rawfp.df = false; processor->push(rawfp); TcpFingerprint f110005(rawfp); @@ -620,7 +620,7 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2 4 8 3"; rawfp.ws = "7"; - rawfp.df = 0; + rawfp.df = false; processor->push(rawfp); TcpFingerprint f120001(rawfp); @@ -633,7 +633,7 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") rawfp.id = "X"; rawfp.topts = "2"; rawfp.ws = "0-1"; - rawfp.df = 0; + rawfp.df = false; processor->push(rawfp); TcpFingerprint f2(rawfp); @@ -668,8 +668,8 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") key.sackok_pos = 1; // SACKOK = 4 in position 1 key.timestamp_pos = 2; // TIMESTAMP = 8 in position 2 key.ws_pos = 3; // WSCALE = 3 in position 3 - key.df = 0; - key.isIpv6 = 1; + key.df = false; + key.isIpv6 = true; syn_tcpopts[key.mss_pos] = (uint8_t) tcp::TcpOptCode::MAXSEG; syn_tcpopts[key.timestamp_pos] = (uint8_t) tcp::TcpOptCode::TIMESTAMP; syn_tcpopts[key.sackok_pos] = (uint8_t) tcp::TcpOptCode::SACKOK; @@ -706,8 +706,8 @@ TEST_CASE("get_tcp_fp", "[rna_fingerprint_tcp]") key.sackok_pos = 1; // SACKOK = 4 in position 1 key.timestamp_pos = 2; // TIMESTAMP = 8 in position 2 key.ws_pos = 3; // WSCALE = 3 in position 3 - key.df = 1; - key.isIpv6 = 0; + key.df = true; + key.isIpv6 = false; syn_tcpopts[key.mss_pos] = (uint8_t) tcp::TcpOptCode::MAXSEG; syn_tcpopts[key.timestamp_pos] = (uint8_t) tcp::TcpOptCode::TIMESTAMP; syn_tcpopts[key.sackok_pos] = (uint8_t) tcp::TcpOptCode::SACKOK; diff --git a/src/network_inspectors/rna/rna_module.cc b/src/network_inspectors/rna/rna_module.cc index abf7c4257..a0affe312 100644 --- a/src/network_inspectors/rna/rna_module.cc +++ b/src/network_inspectors/rna/rna_module.cc @@ -25,10 +25,10 @@ #include "rna_module.h" #include +#include #include #include #include -#include #include #include "host_tracker/host_cache.h" @@ -568,14 +568,14 @@ bool RnaModule::log_mac_cache(const char* outfile) if ( !outfile ) { LogMessage("File name is needed!\n"); - return 0; + return false; } struct stat file_stat; if ( stat(outfile, &file_stat) == 0 ) { LogMessage("File %s already exists!\n", outfile); - return 0; + return false; } ofstream out_stream(outfile); @@ -600,7 +600,7 @@ bool RnaModule::log_mac_cache(const char* outfile) } out_stream.close(); - return 0; + return false; } bool RnaModule::is_valid_fqn(const char* fqn) const diff --git a/src/network_inspectors/rna/rna_pnd.cc b/src/network_inspectors/rna/rna_pnd.cc index 5da304a27..62585b4fb 100644 --- a/src/network_inspectors/rna/rna_pnd.cc +++ b/src/network_inspectors/rna/rna_pnd.cc @@ -87,8 +87,7 @@ RnaPnd::RnaPnd(const bool en, const std::string& cp, RnaConfig* rc) : update_timeout = (rc ? rc->update_timeout : 0); } -RnaPnd::~RnaPnd() -{ } +RnaPnd::~RnaPnd() = default; void RnaPnd::analyze_appid_changes(DataEvent& event) { diff --git a/src/network_inspectors/rna/test/rna_module_mock.h b/src/network_inspectors/rna/test/rna_module_mock.h index 69b5eb469..46cf49b2d 100644 --- a/src/network_inspectors/rna/test/rna_module_mock.h +++ b/src/network_inspectors/rna/test/rna_module_mock.h @@ -54,7 +54,7 @@ void Module::show_interval_stats(std::vector #include #include +#include #include #include diff --git a/src/parser/parse_so_rule.cc b/src/parser/parse_so_rule.cc index 9e0f501e8..abc1f3faf 100644 --- a/src/parser/parse_so_rule.cc +++ b/src/parser/parse_so_rule.cc @@ -35,7 +35,7 @@ class SoRuleParser { public: - SoRuleParser() { } + SoRuleParser() = default; bool parse_so_rule(const char* in, std::string& stub, std::string& opts); diff --git a/src/payload_injector/test/payload_injector_test.cc b/src/payload_injector/test/payload_injector_test.cc index db592eefe..01f5ec80a 100644 --- a/src/payload_injector/test/payload_injector_test.cc +++ b/src/payload_injector/test/payload_injector_test.cc @@ -60,11 +60,11 @@ Flow::Flow() flow_state = Flow::FlowState::SETUP; } -Flow::~Flow() { } +Flow::~Flow() = default; IpsContext::IpsContext(unsigned int) { } -IpsContext::~IpsContext() { } +IpsContext::~IpsContext() = default; SnortConfig::SnortConfig(snort::SnortConfig const*) { } -SnortConfig::~SnortConfig() { } +SnortConfig::~SnortConfig() = default; IpsContext ips_context; SnortConfig conf; @@ -80,9 +80,9 @@ Packet::Packet(bool) static void set_not_configured() { conf.payload_injector_config = nullptr; } static void set_configured() { conf.payload_injector_config = &pi_conf; } -Packet::~Packet() { } +Packet::~Packet() = default; int DetectionEngine::queue_event(unsigned int, unsigned int, snort::Actions::Type) { return 0; } -FlowData::~FlowData() { } +FlowData::~FlowData() = default; FlowData::FlowData(unsigned int, snort::Inspector*) { } // Inspector mocks, used by MockInspector class @@ -107,8 +107,8 @@ class MockInspector : public snort::Inspector { public: - MockInspector() { } - ~MockInspector() override { } + MockInspector() = default; + ~MockInspector() override = default; void eval(snort::Packet*) override { } bool configure(snort::SnortConfig*) override { return true; } }; @@ -131,8 +131,8 @@ InjectionReturnStatus PayloadInjector::get_http2_payload(InjectionControl, // Mocks for snort::Flow::get_flow_data unsigned Http2FlowData::inspector_id = 0; -Http2Stream::~Http2Stream() { } -HpackDynamicTable::~HpackDynamicTable() { } +Http2Stream::~Http2Stream() = default; +HpackDynamicTable::~HpackDynamicTable() = default; Http2DataCutter::Http2DataCutter(Http2FlowData* _session_data, HttpCommon::SourceId src_id) : session_data(_session_data), source_id(src_id) { } Http2FlowData::Http2FlowData(snort::Flow*) : @@ -146,7 +146,7 @@ Http2FlowData::Http2FlowData(snort::Flow*) : }, data_cutter {Http2DataCutter(this, SRC_CLIENT), Http2DataCutter(this, SRC_SERVER)} { } -Http2FlowData::~Http2FlowData() { } +Http2FlowData::~Http2FlowData() = default; Http2FlowData http2_flow_data(nullptr); void Http2FlowData::set_mid_frame(bool val) { continuation_expected[SRC_SERVER] = val; } bool Http2FlowData::is_mid_frame() const { return continuation_expected[SRC_SERVER]; } diff --git a/src/ports/port_object2.cc b/src/ports/port_object2.cc index fd801521f..6beda7234 100644 --- a/src/ports/port_object2.cc +++ b/src/ports/port_object2.cc @@ -110,7 +110,7 @@ PortObject2* PortObject2New(int nrules) { PortObject2* po = (PortObject2*)snort_calloc(sizeof(PortObject2)); po->item_list = sflist_new(); - po->rule_hash = new GHash(nrules, sizeof(int), 0, snort_free); + po->rule_hash = new GHash(nrules, sizeof(int), false, snort_free); po->rule_hash->set_hashkey_ops(new PortObject2HashKeyOps(nrules)); return po; diff --git a/src/ports/port_table.cc b/src/ports/port_table.cc index bde982249..0cfda623f 100644 --- a/src/ports/port_table.cc +++ b/src/ports/port_table.cc @@ -451,12 +451,12 @@ static void PortTableCompileMergePortObjects(PortTable* p) PortObject** pol = upA.get(); // Create a Merged Port Object Table - hash by ports, no user keys, don't free data - GHash* mhash = new GHash(PO_HASH_TBL_ROWS, sizeof(PortObject*), 0, nullptr); + GHash* mhash = new GHash(PO_HASH_TBL_ROWS, sizeof(PortObject*), false, nullptr); mhash->set_hashkey_ops(new PortObjectHashKeyOps(PO_HASH_TBL_ROWS)); p->pt_mpo_hash = mhash; // Create a Merged Port Object Table - hash by pointers, no user keys, don't free data - GHash* mhashx = new GHash(PO_HASH_TBL_ROWS, sizeof(plx_t*), 0, nullptr); + GHash* mhashx = new GHash(PO_HASH_TBL_ROWS, sizeof(plx_t*), false, nullptr); mhashx->set_hashkey_ops(new PlxHashKeyOps(PO_HASH_TBL_ROWS)); p->pt_mpxo_hash = mhashx; diff --git a/src/ports/port_var_table.cc b/src/ports/port_var_table.cc index 848ccf589..a44cb61c8 100644 --- a/src/ports/port_var_table.cc +++ b/src/ports/port_var_table.cc @@ -46,7 +46,7 @@ PortVarTable* PortVarTableCreate() * so 1000 entries is ok, worst that happens is somewhat slower * config/rule processing. */ - GHash* h = new GHash(1000, 0, 0, PortObjectFree); + GHash* h = new GHash(1000, 0, false, PortObjectFree); PortObject* po = PortObjectNew(); // Create default port objects PortObjectAddPortAny(po); // Default has an ANY port PortVarTableAdd(h, po); // Add ANY to the table diff --git a/src/pub_sub/data_decrypt_event.h b/src/pub_sub/data_decrypt_event.h index 88e6489f7..3fbb63263 100644 --- a/src/pub_sub/data_decrypt_event.h +++ b/src/pub_sub/data_decrypt_event.h @@ -19,7 +19,7 @@ public: }; DataDecryptEvent(const StateEventType& type) : m_type(type) { } - StateEventType get_type(void) const { return m_type; } + StateEventType get_type() const { return m_type; } private: StateEventType m_type; diff --git a/src/search_engines/test/hyperscan_test.cc b/src/search_engines/test/hyperscan_test.cc index 7b3a44618..f9b8aa9f4 100644 --- a/src/search_engines/test/hyperscan_test.cc +++ b/src/search_engines/test/hyperscan_test.cc @@ -22,7 +22,7 @@ #include "config.h" #endif -#include +#include #include "framework/base_api.h" #include "framework/counts.h" diff --git a/src/search_engines/test/search_tool_test.cc b/src/search_engines/test/search_tool_test.cc index 6b7b13eea..559b56bbe 100644 --- a/src/search_engines/test/search_tool_test.cc +++ b/src/search_engines/test/search_tool_test.cc @@ -27,7 +27,7 @@ #include "search_engines/search_tool.h" #undef private -#include +#include #include "detection/fp_config.h" #include "framework/base_api.h" diff --git a/src/service_inspectors/cip/cip_session.cc b/src/service_inspectors/cip/cip_session.cc index 7903c8d93..65525563d 100644 --- a/src/service_inspectors/cip/cip_session.cc +++ b/src/service_inspectors/cip/cip_session.cc @@ -27,11 +27,12 @@ #include "cip_session.h" -#include -#include -#include -#include #include + +#include +#include +#include + #include "time/timersub.h" // For TIMERSUB #include "cip_parsing.h" // For CIP constants @@ -203,7 +204,7 @@ static bool cip_connection_signature_match(const CipConnectionSignature* left, static CipConnection* cip_find_connection_slot(CipConnectionList* connection_list, const struct timeval* timestamp) { - CipConnection* connection = NULL; + CipConnection* connection = nullptr; // Prune old connections if the list is at max capacity. if (connection_list->count == connection_list->list_size) @@ -229,7 +230,7 @@ CipConnection* cip_find_connection_by_id( uint32_t connection_id, bool established) { - CipConnection* connection = NULL; + CipConnection* connection = nullptr; for (uint32_t i = 0; i < connection_list->list_size; ++i) { @@ -260,7 +261,7 @@ static const CipConnection* cip_find_connection_by_id_any( uint32_t ot_connection_id, uint32_t to_connection_id) { - const CipConnection* connection = NULL; + const CipConnection* connection = nullptr; for (uint32_t i = 0; i < connection_list->list_size; ++i) { @@ -286,7 +287,7 @@ static const CipConnection* cip_find_connection_by_id_any( static const CipConnection* cip_find_connection_any(const CipConnectionList* connection_list, const CipConnectionSignature* signature) { - const CipConnection* connection = NULL; + const CipConnection* connection = nullptr; for (uint32_t i = 0; i < connection_list->list_size; ++i) { @@ -305,7 +306,7 @@ static CipConnection* cip_find_connection(CipConnectionList* connection_list, const CipConnectionSignature* signature, bool established) { - CipConnection* connection = NULL; + CipConnection* connection = nullptr; for (uint32_t i = 0; i < connection_list->list_size; ++i) { @@ -411,7 +412,7 @@ static CipUnconnectedMessage* find_unconnected_request_slot( CipUnconnectedMessageList* unconnected_list, const struct timeval* timestamp) { - CipUnconnectedMessage* unconnected_message = NULL; + CipUnconnectedMessage* unconnected_message = nullptr; // Prune old messages if the list is at max capacity. if (unconnected_list->count == unconnected_list->list_size) @@ -435,7 +436,7 @@ static CipUnconnectedMessage* find_unconnected_request( CipUnconnectedMessageList* unconnected_list, uint64_t sender_context) { - CipUnconnectedMessage* unconnected_message = NULL; + CipUnconnectedMessage* unconnected_message = nullptr; for (uint32_t i = 0; i < unconnected_list->list_size; ++i) { diff --git a/src/service_inspectors/cip/cip_session.h b/src/service_inspectors/cip/cip_session.h index 773b10cdd..17cdc8c4d 100644 --- a/src/service_inspectors/cip/cip_session.h +++ b/src/service_inspectors/cip/cip_session.h @@ -24,8 +24,8 @@ #ifndef CIP_SESSION_H #define CIP_SESSION_H -#include -#include +#include + #include "main/snort_config.h" #include "main/snort_types.h" diff --git a/src/service_inspectors/dce_rpc/dce_db.h b/src/service_inspectors/dce_rpc/dce_db.h index f868f9cd3..091fb1d61 100644 --- a/src/service_inspectors/dce_rpc/dce_db.h +++ b/src/service_inspectors/dce_rpc/dce_db.h @@ -49,7 +49,7 @@ class DCE2_DbMap : public DCE2_Db { public: - DCE2_DbMap() { } + DCE2_DbMap() = default; ~DCE2_DbMap() { diff --git a/src/service_inspectors/dce_rpc/dce_smb2.cc b/src/service_inspectors/dce_rpc/dce_smb2.cc index 99b0698b8..9b3f3db74 100644 --- a/src/service_inspectors/dce_rpc/dce_smb2.cc +++ b/src/service_inspectors/dce_rpc/dce_smb2.cc @@ -52,7 +52,7 @@ const char* smb2_command_string[SMB2_COM_MAX] = { "SMB2_COM_SET_INFO", "SMB2_COM_OPLOCK_BREAK"}; -static inline SmbFlowKey get_flow_key(void) +static inline SmbFlowKey get_flow_key() { SmbFlowKey key; const FlowKey* flow_key = DetectionEngine::get_current_packet()->flow->key; @@ -110,7 +110,7 @@ DCE2_Smb2FileTracker::DCE2_Smb2FileTracker(uint64_t file_id_v, DCE2_Smb2TreeTrac memory::MemoryCap::update_allocations(sizeof(*this)); } -DCE2_Smb2FileTracker::~DCE2_Smb2FileTracker(void) +DCE2_Smb2FileTracker::~DCE2_Smb2FileTracker() { debug_logf(dce_smb_trace, nullptr, "file tracker %" PRIu64 " file name hash %" PRIu64 " terminating\n", @@ -135,7 +135,7 @@ DCE2_Smb2TreeTracker::DCE2_Smb2TreeTracker (uint32_t tid_v, uint8_t share_type_v memory::MemoryCap::update_allocations(sizeof(*this)); } -DCE2_Smb2TreeTracker::~DCE2_Smb2TreeTracker(void) +DCE2_Smb2TreeTracker::~DCE2_Smb2TreeTracker() { debug_logf(dce_smb_trace, nullptr, "tree tracker %" PRIu32 " terminating\n", tid); @@ -158,7 +158,7 @@ DCE2_Smb2SessionTracker::DCE2_Smb2SessionTracker() memory::MemoryCap::update_allocations(sizeof(*this)); } -DCE2_Smb2SessionTracker::~DCE2_Smb2SessionTracker(void) +DCE2_Smb2SessionTracker::~DCE2_Smb2SessionTracker() { debug_logf(dce_smb_trace, nullptr, "session tracker %" PRIu64 " terminating\n", session_id); removeSessionFromAllConnection(); diff --git a/src/service_inspectors/dce_rpc/dce_smb2_utils.h b/src/service_inspectors/dce_rpc/dce_smb2_utils.h index 290eeff5e..ec83b1ed1 100644 --- a/src/service_inspectors/dce_rpc/dce_smb2_utils.h +++ b/src/service_inspectors/dce_rpc/dce_smb2_utils.h @@ -38,7 +38,7 @@ public: SmbSessionCache_map(const size_t initial_size) : LruCacheShared(initial_size) { } - virtual ~SmbSessionCache_map() { } + ~SmbSessionCache_map() override = default; }; typedef SmbSessionCache_map SmbSessionCache; diff --git a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc index b423e7619..a3f3251a9 100644 --- a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc +++ b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc @@ -129,13 +129,13 @@ FTP_BOUNCE_TO* ftp_bounce_lookup_first(BOUNCE_LOOKUP* BounceLookup, int* iError) if (!iError) { - return NULL; + return nullptr; } if (!BounceLookup) { *iError = FTPP_INVALID_ARG; - return NULL; + return nullptr; } *iError = FTPP_SUCCESS; @@ -155,13 +155,13 @@ FTP_BOUNCE_TO* ftp_bounce_lookup_next(BOUNCE_LOOKUP* BounceLookup, int* iError) if (!iError) { - return NULL; + return nullptr; } if (!BounceLookup) { *iError = FTPP_INVALID_ARG; - return NULL; + return nullptr; } *iError = FTPP_SUCCESS; diff --git a/src/service_inspectors/http2_inspect/http2_data_frame.h b/src/service_inspectors/http2_inspect/http2_data_frame.h index 2ca965487..9b77cfee8 100644 --- a/src/service_inspectors/http2_inspect/http2_data_frame.h +++ b/src/service_inspectors/http2_inspect/http2_data_frame.h @@ -28,7 +28,7 @@ class Http2Stream; class Http2DataFrame : public Http2Frame { public: - ~Http2DataFrame() override {} + ~Http2DataFrame() override = default; bool valid_sequence(Http2Enums::StreamState state) override; void analyze_http1() override; void clear() override; diff --git a/src/service_inspectors/http2_inspect/http2_frame.h b/src/service_inspectors/http2_inspect/http2_frame.h index 1bb4662ff..2ac5434ee 100644 --- a/src/service_inspectors/http2_inspect/http2_frame.h +++ b/src/service_inspectors/http2_inspect/http2_frame.h @@ -39,7 +39,7 @@ class Http2Stream; class Http2Frame { public: - virtual ~Http2Frame() { } + virtual ~Http2Frame() = default; static Http2Frame* new_frame(const uint8_t* header_buffer, const uint32_t header_len, const uint8_t* data_buffer, const uint32_t data_len, Http2FlowData* session_data, HttpCommon::SourceId source_id, Http2Stream* stream); diff --git a/src/service_inspectors/http2_inspect/http2_hpack_dynamic_table.cc b/src/service_inspectors/http2_inspect/http2_hpack_dynamic_table.cc index ee1c34903..bee00e890 100644 --- a/src/service_inspectors/http2_inspect/http2_hpack_dynamic_table.cc +++ b/src/service_inspectors/http2_inspect/http2_hpack_dynamic_table.cc @@ -24,7 +24,7 @@ #include "http2_hpack_dynamic_table.h" #include "http2_module.h" -#include +#include #include "http2_hpack_table.h" diff --git a/src/service_inspectors/http2_inspect/http2_hpack_string_decode.cc b/src/service_inspectors/http2_inspect/http2_hpack_string_decode.cc index e9c7e33d5..155276314 100644 --- a/src/service_inspectors/http2_inspect/http2_hpack_string_decode.cc +++ b/src/service_inspectors/http2_inspect/http2_hpack_string_decode.cc @@ -26,7 +26,7 @@ #include "http2_enum.h" #include "http2_huffman_state_machine.h" -#include +#include using namespace Http2Enums; diff --git a/src/service_inspectors/http2_inspect/http2_hpack_table.cc b/src/service_inspectors/http2_inspect/http2_hpack_table.cc index 93e33682a..a44b29e17 100644 --- a/src/service_inspectors/http2_inspect/http2_hpack_table.cc +++ b/src/service_inspectors/http2_inspect/http2_hpack_table.cc @@ -25,7 +25,7 @@ #include "http2_flow_data.h" #include "http2_hpack_table.h" -#include +#include #define MAKE_TABLE_ENTRY(name, value) \ HpackTableEntry(strlen(name), (const uint8_t*)name, strlen(value), (const uint8_t*)value) diff --git a/src/service_inspectors/http2_inspect/http2_request_line.cc b/src/service_inspectors/http2_inspect/http2_request_line.cc index 7e3fb9e2a..a78ac3683 100644 --- a/src/service_inspectors/http2_inspect/http2_request_line.cc +++ b/src/service_inspectors/http2_inspect/http2_request_line.cc @@ -23,8 +23,8 @@ #include "http2_request_line.h" -#include #include +#include #include "service_inspectors/http_inspect/http_common.h" #include "service_inspectors/http_inspect/http_field.h" diff --git a/src/service_inspectors/iec104/iec104_parse_apdu.h b/src/service_inspectors/iec104/iec104_parse_apdu.h index 22246beba..19f7651dc 100644 --- a/src/service_inspectors/iec104/iec104_parse_apdu.h +++ b/src/service_inspectors/iec104/iec104_parse_apdu.h @@ -21,7 +21,7 @@ #ifndef IEC104_PARSE_APCI_H #define IEC104_PARSE_APCI_H -#include +#include void parseIec104ApciU(const struct Iec104ApciU* apci); void parseIec104ApciS(const struct Iec104ApciS* apci); diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc index cfac6277d..f18f1c6b9 100644 --- a/src/service_inspectors/imap/imap.cc +++ b/src/service_inspectors/imap/imap.cc @@ -752,7 +752,7 @@ bool Imap::configure(SnortConfig*) config->decode_conf.sync_all_depths(); if (config->decode_conf.get_file_depth() > -1) - config->log_config.log_filename = 1; + config->log_config.log_filename = true; IMAP_SearchInit(); return true; diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc index 1b41b53e5..81b09b3ae 100644 --- a/src/service_inspectors/pop/pop.cc +++ b/src/service_inspectors/pop/pop.cc @@ -691,7 +691,7 @@ bool Pop::configure(SnortConfig* ) config->decode_conf.sync_all_depths(); if (config->decode_conf.get_file_depth() > -1) - config->log_config.log_filename = 1; + config->log_config.log_filename = true; POP_SearchInit(); return true; diff --git a/src/service_inspectors/sip/sip_splitter.cc b/src/service_inspectors/sip/sip_splitter.cc index a2a750060..0c6ad6cb1 100644 --- a/src/service_inspectors/sip/sip_splitter.cc +++ b/src/service_inspectors/sip/sip_splitter.cc @@ -24,8 +24,8 @@ #include "sip_splitter.h" -#include -#include +#include +#include using namespace snort; diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc index d30466b44..80f421b02 100644 --- a/src/service_inspectors/smtp/smtp.cc +++ b/src/service_inspectors/smtp/smtp.cc @@ -1466,7 +1466,7 @@ bool Smtp::configure(SnortConfig*) config->decode_conf.sync_all_depths(); if (config->decode_conf.get_file_depth() > -1) - config->log_config.log_filename = 1; + config->log_config.log_filename = true; SMTP_ResponseSearchInit(); SMTP_CommandSearchInit(config); @@ -1625,7 +1625,7 @@ TEST_CASE("handle_header_line", "[smtp]") // Setup MailLogConfig log_config; DecodeConfig decode_conf; - log_config.log_email_hdrs = 0; + log_config.log_email_hdrs = false; SmtpMime mime_ssn(&decode_conf, &log_config); smtp_normalizing = true; SmtpProtoConf config; diff --git a/src/stream/base/stream_module.h b/src/stream/base/stream_module.h index 5979f73f4..7bb1ec6c4 100644 --- a/src/stream/base/stream_module.h +++ b/src/stream/base/stream_module.h @@ -87,7 +87,7 @@ struct StreamModuleConfig class StreamReloadResourceManager : public snort::ReloadResourceTuner { public: - StreamReloadResourceManager() {} + StreamReloadResourceManager() = default; bool tinit() override; bool tune_packet_context() override; @@ -120,7 +120,7 @@ private: class StreamUnloadReloadResourceManager : public snort::ReloadResourceTuner { public: - StreamUnloadReloadResourceManager() { } + StreamUnloadReloadResourceManager() = default; bool tinit() override; bool tune_packet_context() override; diff --git a/src/stream/tcp/segment_overlap_editor.h b/src/stream/tcp/segment_overlap_editor.h index 6f789e4f2..f25598a7b 100644 --- a/src/stream/tcp/segment_overlap_editor.h +++ b/src/stream/tcp/segment_overlap_editor.h @@ -101,7 +101,7 @@ struct TcpReassemblerState class SegmentOverlapEditor { protected: - SegmentOverlapEditor() { } + SegmentOverlapEditor() = default; virtual ~SegmentOverlapEditor() = default; void eval_left(TcpReassemblerState&); diff --git a/src/stream/tcp/tcp_stream_session.cc b/src/stream/tcp/tcp_stream_session.cc index c8152f835..00c979249 100644 --- a/src/stream/tcp/tcp_stream_session.cc +++ b/src/stream/tcp/tcp_stream_session.cc @@ -34,8 +34,7 @@ TcpStreamSession::TcpStreamSession(Flow* f) : Session(f), client(true), server(false) { } -TcpStreamSession::~TcpStreamSession() -{ } +TcpStreamSession::~TcpStreamSession() = default; void TcpStreamSession::init_new_tcp_session(TcpSegmentDescriptor& tsd) { diff --git a/src/stream/tcp/test/tcp_normalizer_test.cc b/src/stream/tcp/test/tcp_normalizer_test.cc index ac50a1b6a..0f5c76dd4 100644 --- a/src/stream/tcp/test/tcp_normalizer_test.cc +++ b/src/stream/tcp/test/tcp_normalizer_test.cc @@ -48,7 +48,7 @@ public: }; TcpSession::TcpSession( Flow* ) : Session( flow ) { } -TcpSession::~TcpSession( void ) { } +TcpSession::~TcpSession() = default; bool TcpSession::setup(Packet*){ return true; } void TcpSession::update_direction(char, SfIp const*, unsigned short){ } int TcpSession::process(Packet*){ return 0; } @@ -75,7 +75,7 @@ class TcpSessionMock : public TcpSession { public: TcpSessionMock( Flow* flow ) : TcpSession( flow ), client( true ), server( false ) { } - ~TcpSessionMock( void ) { } + ~TcpSessionMock() = default; TcpStreamTracker client; TcpStreamTracker server; diff --git a/src/stream/test/stream_splitter_test.cc b/src/stream/test/stream_splitter_test.cc index 8ee9a620a..a100c9001 100644 --- a/src/stream/test/stream_splitter_test.cc +++ b/src/stream/test/stream_splitter_test.cc @@ -46,7 +46,7 @@ static StreamSplitter* next_splitter = nullptr; Flow::Flow() = default; Packet::Packet(bool) { } -Packet::~Packet() { } +Packet::~Packet() = default; struct Packet* DetectionEngine::get_current_packet() { return nullptr; } diff --git a/src/trace/trace.cc b/src/trace/trace.cc index 550b31881..b6656668b 100644 --- a/src/trace/trace.cc +++ b/src/trace/trace.cc @@ -105,7 +105,7 @@ public: Module(name, "trace_test_help"), test_trace_options(trace_options) { } - virtual const TraceOption* get_trace_options() const + const TraceOption* get_trace_options() const override { return test_trace_options; } private: diff --git a/tools/snort2lua/data/data_types/dt_rule.h b/tools/snort2lua/data/data_types/dt_rule.h index d6bc5f140..97c444243 100644 --- a/tools/snort2lua/data/data_types/dt_rule.h +++ b/tools/snort2lua/data/data_types/dt_rule.h @@ -40,7 +40,7 @@ public: void update_option(const std::string& keyword, const std::string& val); void add_suboption(const std::string& keyword); void add_suboption(const std::string& keyword, const std::string& val); - void reset_sticky(void); + void reset_sticky(); void set_curr_options_buffer(const std::string& buffer, bool add_option); void update_rule_action(const std::string&); void set_rule_old_action(const std::string&); diff --git a/tools/snort2lua/data/dt_rule_api.cc b/tools/snort2lua/data/dt_rule_api.cc index 429909214..bc709241d 100644 --- a/tools/snort2lua/data/dt_rule_api.cc +++ b/tools/snort2lua/data/dt_rule_api.cc @@ -232,7 +232,7 @@ void RuleApi::add_suboption(const std::string& keyword, DataApi::developer_error("Add some header data before adding content!!"); } -void RuleApi::reset_sticky(void) +void RuleApi::reset_sticky() { if (curr_rule) curr_rule->reset_sticky(); diff --git a/tools/snort2lua/data/dt_rule_api.h b/tools/snort2lua/data/dt_rule_api.h index d44310e81..fa3decd00 100644 --- a/tools/snort2lua/data/dt_rule_api.h +++ b/tools/snort2lua/data/dt_rule_api.h @@ -71,7 +71,7 @@ public: void update_option(const std::string& keyword, const std::string& val); void add_suboption(const std::string& keyword); void add_suboption(const std::string& keyword, const std::string& val); - void reset_sticky(void); + void reset_sticky(); void set_curr_options_buffer(const std::string& buffer, bool add_option=false); void set_rule_old_action(const std::string&); std::string& get_rule_old_action();