diff --git a/CHANGES b/CHANGES index 9eb93d34fd..6d4eab988f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,12 @@ +3.2.0-dev.329 | 2020-03-31 08:48:10 -0700 + + * Mark input/output message classes as final, since nothing should be inheriting from them (Tim Wojtulewicz, Corelight) + + * Add missing override specifier to a number of methods, remove virtual from some as well (Tim Wojtulewicz, Corelight) + + * Add override specifier to Configure() method in almost all of the internal plugins (Tim Wojtulewicz, Corelight) + 3.2.0-dev.325 | 2020-03-31 07:04:59 +0000 * Fix bug in intel framework letting deletes of mixed-cased entries diff --git a/VERSION b/VERSION index 0cc0559bb2..9a0b5de251 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.325 +3.2.0-dev.329 diff --git a/src/Var.cc b/src/Var.cc index 28bd4d5ed5..cbbf6fbbf0 100644 --- a/src/Var.cc +++ b/src/Var.cc @@ -421,8 +421,8 @@ public: OuterIDBindingFinder(Scope* s) : scope(s) { } - virtual TraversalCode PreExpr(const Expr*); - virtual TraversalCode PostExpr(const Expr*); + TraversalCode PreExpr(const Expr*) override; + TraversalCode PostExpr(const Expr*) override; Scope* scope; vector outer_id_references; diff --git a/src/analyzer/protocol/arp/Plugin.cc b/src/analyzer/protocol/arp/Plugin.cc index 0ba8648b30..aceca7dd58 100644 --- a/src/analyzer/protocol/arp/Plugin.cc +++ b/src/analyzer/protocol/arp/Plugin.cc @@ -8,7 +8,7 @@ namespace Zeek_ARP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { plugin::Configuration config; config.name = "Zeek::ARP"; diff --git a/src/analyzer/protocol/ayiya/Plugin.cc b/src/analyzer/protocol/ayiya/Plugin.cc index 23c04543e3..df053c57a0 100644 --- a/src/analyzer/protocol/ayiya/Plugin.cc +++ b/src/analyzer/protocol/ayiya/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_AYIYA { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("AYIYA", ::analyzer::ayiya::AYIYA_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/bittorrent/Plugin.cc b/src/analyzer/protocol/bittorrent/Plugin.cc index c9d94aa16f..bf8636a103 100644 --- a/src/analyzer/protocol/bittorrent/Plugin.cc +++ b/src/analyzer/protocol/bittorrent/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_BitTorrent { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("BitTorrent", ::analyzer::bittorrent::BitTorrent_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("BitTorrentTracker", ::analyzer::bittorrent::BitTorrentTracker_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/conn-size/Plugin.cc b/src/analyzer/protocol/conn-size/Plugin.cc index 1ba5225278..3f73558051 100644 --- a/src/analyzer/protocol/conn-size/Plugin.cc +++ b/src/analyzer/protocol/conn-size/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_ConnSize { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("ConnSize", ::analyzer::conn_size::ConnSize_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/dce-rpc/Plugin.cc b/src/analyzer/protocol/dce-rpc/Plugin.cc index d821cbea2b..4974b1c427 100644 --- a/src/analyzer/protocol/dce-rpc/Plugin.cc +++ b/src/analyzer/protocol/dce-rpc/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_DCE_RPC { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DCE_RPC", ::analyzer::dce_rpc::DCE_RPC_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/dhcp/Plugin.cc b/src/analyzer/protocol/dhcp/Plugin.cc index f4895255ed..1b42b8b4fd 100644 --- a/src/analyzer/protocol/dhcp/Plugin.cc +++ b/src/analyzer/protocol/dhcp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_DHCP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DHCP", ::analyzer::dhcp::DHCP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/dnp3/Plugin.cc b/src/analyzer/protocol/dnp3/Plugin.cc index e75e19f4c5..70a9e6fcc2 100644 --- a/src/analyzer/protocol/dnp3/Plugin.cc +++ b/src/analyzer/protocol/dnp3/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_DNP3 { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DNP3_TCP", ::analyzer::dnp3::DNP3_TCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("DNP3_UDP", ::analyzer::dnp3::DNP3_UDP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/dns/Plugin.cc b/src/analyzer/protocol/dns/Plugin.cc index d360a1771c..4aa46499c0 100644 --- a/src/analyzer/protocol/dns/Plugin.cc +++ b/src/analyzer/protocol/dns/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_DNS { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DNS", ::analyzer::dns::DNS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_DNS", 0)); diff --git a/src/analyzer/protocol/file/Plugin.cc b/src/analyzer/protocol/file/Plugin.cc index 974c5949a3..4c9d6ff31a 100644 --- a/src/analyzer/protocol/file/Plugin.cc +++ b/src/analyzer/protocol/file/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_File { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("FTP_Data", ::analyzer::file::FTP_Data::Instantiate)); AddComponent(new ::analyzer::Component("IRC_Data", ::analyzer::file::IRC_Data::Instantiate)); diff --git a/src/analyzer/protocol/finger/Plugin.cc b/src/analyzer/protocol/finger/Plugin.cc index 825860b49e..65edceb642 100644 --- a/src/analyzer/protocol/finger/Plugin.cc +++ b/src/analyzer/protocol/finger/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_Finger { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Finger", ::analyzer::finger::Finger_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/ftp/Plugin.cc b/src/analyzer/protocol/ftp/Plugin.cc index 1cade7807d..49eef6c281 100644 --- a/src/analyzer/protocol/ftp/Plugin.cc +++ b/src/analyzer/protocol/ftp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_FTP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("FTP", ::analyzer::ftp::FTP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("FTP_ADAT", 0)); diff --git a/src/analyzer/protocol/gnutella/Plugin.cc b/src/analyzer/protocol/gnutella/Plugin.cc index 93031060ee..6452961b19 100644 --- a/src/analyzer/protocol/gnutella/Plugin.cc +++ b/src/analyzer/protocol/gnutella/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_Gnutella { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Gnutella", ::analyzer::gnutella::Gnutella_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/gssapi/Plugin.cc b/src/analyzer/protocol/gssapi/Plugin.cc index c0cd7fe11c..7f934cd3ac 100644 --- a/src/analyzer/protocol/gssapi/Plugin.cc +++ b/src/analyzer/protocol/gssapi/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_GSSAPI { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("GSSAPI", ::analyzer::gssapi::GSSAPI_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/gtpv1/Plugin.cc b/src/analyzer/protocol/gtpv1/Plugin.cc index 6ea6230e16..9196c05a3b 100644 --- a/src/analyzer/protocol/gtpv1/Plugin.cc +++ b/src/analyzer/protocol/gtpv1/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_GTPv1 { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("GTPv1", ::analyzer::gtpv1::GTPv1_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index e3fc68498d..14eab65ddc 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -176,7 +176,7 @@ void HTTP_Entity::Deliver(int len, const char* data, bool trailing_CRLF) class HTTP_Entity::UncompressedOutput : public analyzer::OutputHandler { public: UncompressedOutput(HTTP_Entity* e) { entity = e; } - virtual void DeliverStream(int len, const u_char* data, bool orig) + void DeliverStream(int len, const u_char* data, bool orig) override { entity->DeliverBodyClear(len, (char*) data, false); } diff --git a/src/analyzer/protocol/http/Plugin.cc b/src/analyzer/protocol/http/Plugin.cc index fcd8f29444..52d8369d9e 100644 --- a/src/analyzer/protocol/http/Plugin.cc +++ b/src/analyzer/protocol/http/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_HTTP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("HTTP", ::analyzer::http::HTTP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/icmp/Plugin.cc b/src/analyzer/protocol/icmp/Plugin.cc index 2aef006315..1a104e63c1 100644 --- a/src/analyzer/protocol/icmp/Plugin.cc +++ b/src/analyzer/protocol/icmp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_ICMP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("ICMP", ::analyzer::icmp::ICMP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/ident/Plugin.cc b/src/analyzer/protocol/ident/Plugin.cc index 5398ba0523..68042555b2 100644 --- a/src/analyzer/protocol/ident/Plugin.cc +++ b/src/analyzer/protocol/ident/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_Ident { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Ident", ::analyzer::ident::Ident_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/imap/Plugin.cc b/src/analyzer/protocol/imap/Plugin.cc index bbdac9b444..5c5ec7c4bf 100644 --- a/src/analyzer/protocol/imap/Plugin.cc +++ b/src/analyzer/protocol/imap/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_IMAP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("IMAP", ::analyzer::imap::IMAP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/irc/Plugin.cc b/src/analyzer/protocol/irc/Plugin.cc index b4d7266472..c22498c38d 100644 --- a/src/analyzer/protocol/irc/Plugin.cc +++ b/src/analyzer/protocol/irc/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_IRC { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("IRC", ::analyzer::irc::IRC_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/krb/Plugin.cc b/src/analyzer/protocol/krb/Plugin.cc index 567fd080c8..8b6d51a9e5 100644 --- a/src/analyzer/protocol/krb/Plugin.cc +++ b/src/analyzer/protocol/krb/Plugin.cc @@ -9,7 +9,7 @@ namespace plugin { namespace Zeek_KRB { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("KRB", ::analyzer::krb::KRB_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("KRB_TCP", ::analyzer::krb_tcp::KRB_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/login/Plugin.cc b/src/analyzer/protocol/login/Plugin.cc index 86cac17a14..aeedd5c04d 100644 --- a/src/analyzer/protocol/login/Plugin.cc +++ b/src/analyzer/protocol/login/Plugin.cc @@ -12,7 +12,7 @@ namespace Zeek_Login { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Telnet", ::analyzer::login::Telnet_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Rsh", ::analyzer::login::Rsh_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/mime/Plugin.cc b/src/analyzer/protocol/mime/Plugin.cc index 6cff9f0a5a..222b5a2f79 100644 --- a/src/analyzer/protocol/mime/Plugin.cc +++ b/src/analyzer/protocol/mime/Plugin.cc @@ -8,7 +8,7 @@ namespace Zeek_MIME { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { plugin::Configuration config; config.name = "Zeek::MIME"; diff --git a/src/analyzer/protocol/modbus/Plugin.cc b/src/analyzer/protocol/modbus/Plugin.cc index ee89d8efc1..9b1aef6ea5 100644 --- a/src/analyzer/protocol/modbus/Plugin.cc +++ b/src/analyzer/protocol/modbus/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_Modbus { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("MODBUS", ::analyzer::modbus::ModbusTCP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/mqtt/Plugin.cc b/src/analyzer/protocol/mqtt/Plugin.cc index 8640fde129..fcafb4a7f2 100644 --- a/src/analyzer/protocol/mqtt/Plugin.cc +++ b/src/analyzer/protocol/mqtt/Plugin.cc @@ -4,16 +4,16 @@ #include "plugin/Plugin.h" #include "analyzer/Component.h" -namespace plugin { +namespace plugin { namespace Zeek_MQTT { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("MQTT", ::analyzer::MQTT::MQTT_Analyzer::InstantiateAnalyzer)); - + plugin::Configuration config; config.name = "Zeek::MQTT"; config.description = "Message Queuing Telemetry Transport v3.1.1 Protocol analyzer"; diff --git a/src/analyzer/protocol/mysql/Plugin.cc b/src/analyzer/protocol/mysql/Plugin.cc index e4f7ec4549..965bda6993 100644 --- a/src/analyzer/protocol/mysql/Plugin.cc +++ b/src/analyzer/protocol/mysql/Plugin.cc @@ -8,7 +8,7 @@ namespace plugin { namespace Zeek_MySQL { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("MySQL", ::analyzer::MySQL::MySQL_Analyzer::Instantiate)); plugin::Configuration config; diff --git a/src/analyzer/protocol/ncp/Plugin.cc b/src/analyzer/protocol/ncp/Plugin.cc index 5e54f977bb..9f17881f1b 100644 --- a/src/analyzer/protocol/ncp/Plugin.cc +++ b/src/analyzer/protocol/ncp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_NCP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NCP", ::analyzer::ncp::NCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_NCP", 0)); diff --git a/src/analyzer/protocol/netbios/Plugin.cc b/src/analyzer/protocol/netbios/Plugin.cc index 3024c48acd..dde55af51f 100644 --- a/src/analyzer/protocol/netbios/Plugin.cc +++ b/src/analyzer/protocol/netbios/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_NetBIOS { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NetbiosSSN", ::analyzer::netbios_ssn::NetbiosSSN_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_NetbiosSSN", 0)); diff --git a/src/analyzer/protocol/ntlm/Plugin.cc b/src/analyzer/protocol/ntlm/Plugin.cc index e85b0cff17..92a3a3df77 100644 --- a/src/analyzer/protocol/ntlm/Plugin.cc +++ b/src/analyzer/protocol/ntlm/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_NTLM { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NTLM", ::analyzer::ntlm::NTLM_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/ntp/Plugin.cc b/src/analyzer/protocol/ntp/Plugin.cc index 30210731b2..437051f032 100644 --- a/src/analyzer/protocol/ntp/Plugin.cc +++ b/src/analyzer/protocol/ntp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_NTP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NTP", ::analyzer::NTP::NTP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/pia/Plugin.cc b/src/analyzer/protocol/pia/Plugin.cc index 617623d403..1dbdfa45b4 100644 --- a/src/analyzer/protocol/pia/Plugin.cc +++ b/src/analyzer/protocol/pia/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_PIA { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("PIA_TCP", ::analyzer::pia::PIA_TCP::Instantiate)); AddComponent(new ::analyzer::Component("PIA_UDP", ::analyzer::pia::PIA_UDP::Instantiate)); diff --git a/src/analyzer/protocol/pop3/Plugin.cc b/src/analyzer/protocol/pop3/Plugin.cc index 25311c928d..1f1f95da2e 100644 --- a/src/analyzer/protocol/pop3/Plugin.cc +++ b/src/analyzer/protocol/pop3/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_POP3 { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("POP3", ::analyzer::pop3::POP3_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/radius/Plugin.cc b/src/analyzer/protocol/radius/Plugin.cc index 7ec57fe252..c99d945a57 100644 --- a/src/analyzer/protocol/radius/Plugin.cc +++ b/src/analyzer/protocol/radius/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_RADIUS { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("RADIUS", ::analyzer::RADIUS::RADIUS_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/rdp/Plugin.cc b/src/analyzer/protocol/rdp/Plugin.cc index 324fbdccc8..c4771d6a5e 100644 --- a/src/analyzer/protocol/rdp/Plugin.cc +++ b/src/analyzer/protocol/rdp/Plugin.cc @@ -7,7 +7,7 @@ namespace Zeek_RDP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("RDP", ::analyzer::rdp::RDP_Analyzer::InstantiateAnalyzer)); diff --git a/src/analyzer/protocol/rfb/Plugin.cc b/src/analyzer/protocol/rfb/Plugin.cc index a195136aec..7d9d7e31bd 100644 --- a/src/analyzer/protocol/rfb/Plugin.cc +++ b/src/analyzer/protocol/rfb/Plugin.cc @@ -7,7 +7,7 @@ namespace Zeek_RFB { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("RFB", ::analyzer::rfb::RFB_Analyzer::InstantiateAnalyzer)); diff --git a/src/analyzer/protocol/rpc/Plugin.cc b/src/analyzer/protocol/rpc/Plugin.cc index 1099553f0b..da9b5f0299 100644 --- a/src/analyzer/protocol/rpc/Plugin.cc +++ b/src/analyzer/protocol/rpc/Plugin.cc @@ -12,7 +12,7 @@ namespace Zeek_RPC { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NFS", ::analyzer::rpc::NFS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("MOUNT", ::analyzer::rpc::MOUNT_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/sip/Plugin.cc b/src/analyzer/protocol/sip/Plugin.cc index 0f427c3a3a..d05930fa00 100644 --- a/src/analyzer/protocol/sip/Plugin.cc +++ b/src/analyzer/protocol/sip/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_SIP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SIP", ::analyzer::SIP::SIP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/smb/Plugin.cc b/src/analyzer/protocol/smb/Plugin.cc index 788333bb7c..aaf84af9f5 100644 --- a/src/analyzer/protocol/smb/Plugin.cc +++ b/src/analyzer/protocol/smb/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_SMB { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SMB", ::analyzer::smb::SMB_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_SMB", 0)); diff --git a/src/analyzer/protocol/smtp/Plugin.cc b/src/analyzer/protocol/smtp/Plugin.cc index 4a1a70c71e..2db99893af 100644 --- a/src/analyzer/protocol/smtp/Plugin.cc +++ b/src/analyzer/protocol/smtp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_SMTP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SMTP", ::analyzer::smtp::SMTP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/snmp/Plugin.cc b/src/analyzer/protocol/snmp/Plugin.cc index f5ce06cde0..11785903b6 100644 --- a/src/analyzer/protocol/snmp/Plugin.cc +++ b/src/analyzer/protocol/snmp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_SNMP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SNMP", ::analyzer::snmp::SNMP_Analyzer::InstantiateAnalyzer)); diff --git a/src/analyzer/protocol/socks/Plugin.cc b/src/analyzer/protocol/socks/Plugin.cc index 6e16935a26..6bd33509ad 100644 --- a/src/analyzer/protocol/socks/Plugin.cc +++ b/src/analyzer/protocol/socks/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_SOCKS { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SOCKS", ::analyzer::socks::SOCKS_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/ssh/Plugin.cc b/src/analyzer/protocol/ssh/Plugin.cc index 641bad8ab0..b9b147c86d 100644 --- a/src/analyzer/protocol/ssh/Plugin.cc +++ b/src/analyzer/protocol/ssh/Plugin.cc @@ -9,7 +9,7 @@ namespace plugin { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SSH", ::analyzer::SSH::SSH_Analyzer::Instantiate)); @@ -22,4 +22,3 @@ namespace plugin { } } - diff --git a/src/analyzer/protocol/ssl/Plugin.cc b/src/analyzer/protocol/ssl/Plugin.cc index 8e67ddbee6..ea36628e09 100644 --- a/src/analyzer/protocol/ssl/Plugin.cc +++ b/src/analyzer/protocol/ssl/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_SSL { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SSL", ::analyzer::ssl::SSL_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("DTLS", ::analyzer::dtls::DTLS_Analyzer::Instantiate)); @@ -24,4 +24,3 @@ public: } } - diff --git a/src/analyzer/protocol/stepping-stone/Plugin.cc b/src/analyzer/protocol/stepping-stone/Plugin.cc index 3152adc4c9..3d840a1b27 100644 --- a/src/analyzer/protocol/stepping-stone/Plugin.cc +++ b/src/analyzer/protocol/stepping-stone/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_SteppingStone { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SteppingStone", ::analyzer::stepping_stone::SteppingStone_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/syslog/Plugin.cc b/src/analyzer/protocol/syslog/Plugin.cc index 7e2501575b..f407275270 100644 --- a/src/analyzer/protocol/syslog/Plugin.cc +++ b/src/analyzer/protocol/syslog/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_Syslog { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Syslog", ::analyzer::syslog::Syslog_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/tcp/Plugin.cc b/src/analyzer/protocol/tcp/Plugin.cc index 078d6bb3d9..d96c3ca3ed 100644 --- a/src/analyzer/protocol/tcp/Plugin.cc +++ b/src/analyzer/protocol/tcp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_TCP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("TCP", ::analyzer::tcp::TCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("TCPStats", ::analyzer::tcp::TCPStats_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/teredo/Plugin.cc b/src/analyzer/protocol/teredo/Plugin.cc index 0098066304..05bf47ea45 100644 --- a/src/analyzer/protocol/teredo/Plugin.cc +++ b/src/analyzer/protocol/teredo/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_Teredo { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Teredo", ::analyzer::teredo::Teredo_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/udp/Plugin.cc b/src/analyzer/protocol/udp/Plugin.cc index d94f898b31..aeac50f044 100644 --- a/src/analyzer/protocol/udp/Plugin.cc +++ b/src/analyzer/protocol/udp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_UDP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("UDP", ::analyzer::udp::UDP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/vxlan/Plugin.cc b/src/analyzer/protocol/vxlan/Plugin.cc index 2dee67952a..f00bf8a418 100644 --- a/src/analyzer/protocol/vxlan/Plugin.cc +++ b/src/analyzer/protocol/vxlan/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_VXLAN { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("VXLAN", ::analyzer::vxlan::VXLAN_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/xmpp/Plugin.cc b/src/analyzer/protocol/xmpp/Plugin.cc index cd8eb16391..94befed562 100644 --- a/src/analyzer/protocol/xmpp/Plugin.cc +++ b/src/analyzer/protocol/xmpp/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_XMPP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("XMPP", ::analyzer::xmpp::XMPP_Analyzer::Instantiate)); diff --git a/src/analyzer/protocol/zip/Plugin.cc b/src/analyzer/protocol/zip/Plugin.cc index 2f00193ddd..e80d4c6a8c 100644 --- a/src/analyzer/protocol/zip/Plugin.cc +++ b/src/analyzer/protocol/zip/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_ZIP { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("ZIP", 0)); diff --git a/src/file_analysis/analyzer/data_event/Plugin.cc b/src/file_analysis/analyzer/data_event/Plugin.cc index 14eefac2e3..31330e1aca 100644 --- a/src/file_analysis/analyzer/data_event/Plugin.cc +++ b/src/file_analysis/analyzer/data_event/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_FileDataEvent { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("DATA_EVENT", ::file_analysis::DataEvent::Instantiate)); diff --git a/src/file_analysis/analyzer/entropy/Plugin.cc b/src/file_analysis/analyzer/entropy/Plugin.cc index 6ac3dffd56..1cf3b011fa 100644 --- a/src/file_analysis/analyzer/entropy/Plugin.cc +++ b/src/file_analysis/analyzer/entropy/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_FileEntropy { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("ENTROPY", ::file_analysis::Entropy::Instantiate)); diff --git a/src/file_analysis/analyzer/extract/Plugin.cc b/src/file_analysis/analyzer/extract/Plugin.cc index dc7107d858..d8f90bfd9d 100644 --- a/src/file_analysis/analyzer/extract/Plugin.cc +++ b/src/file_analysis/analyzer/extract/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_FileExtract { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("EXTRACT", ::file_analysis::Extract::Instantiate)); diff --git a/src/file_analysis/analyzer/hash/Plugin.cc b/src/file_analysis/analyzer/hash/Plugin.cc index 9e11ee3832..b557a03e04 100644 --- a/src/file_analysis/analyzer/hash/Plugin.cc +++ b/src/file_analysis/analyzer/hash/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_FileHash { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("MD5", ::file_analysis::MD5::Instantiate)); AddComponent(new ::file_analysis::Component("SHA1", ::file_analysis::SHA1::Instantiate)); diff --git a/src/file_analysis/analyzer/pe/Plugin.cc b/src/file_analysis/analyzer/pe/Plugin.cc index 0b4ae65a12..567d00e920 100644 --- a/src/file_analysis/analyzer/pe/Plugin.cc +++ b/src/file_analysis/analyzer/pe/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_PE { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("PE", ::file_analysis::PE::Instantiate)); diff --git a/src/file_analysis/analyzer/unified2/Plugin.cc b/src/file_analysis/analyzer/unified2/Plugin.cc index dba2fb0b46..5cc60f7799 100644 --- a/src/file_analysis/analyzer/unified2/Plugin.cc +++ b/src/file_analysis/analyzer/unified2/Plugin.cc @@ -11,7 +11,7 @@ namespace Zeek_Unified2 { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("UNIFIED2", ::file_analysis::Unified2::Instantiate)); diff --git a/src/input/Manager.cc b/src/input/Manager.cc index 6c4fe3e9d0..43346f7d0f 100644 --- a/src/input/Manager.cc +++ b/src/input/Manager.cc @@ -113,7 +113,7 @@ public: EventHandlerPtr event; TableStream(); - ~TableStream(); + ~TableStream() override; }; class Manager::EventStream: public Manager::Stream { @@ -125,7 +125,7 @@ public: bool want_record; EventStream(); - ~EventStream(); + ~EventStream() override; }; class Manager::AnalysisStream: public Manager::Stream { @@ -133,7 +133,7 @@ public: string file_id; AnalysisStream(); - ~AnalysisStream(); + ~AnalysisStream() override; }; Manager::TableStream::TableStream() diff --git a/src/input/ReaderBackend.cc b/src/input/ReaderBackend.cc index af46cade81..656743abb5 100644 --- a/src/input/ReaderBackend.cc +++ b/src/input/ReaderBackend.cc @@ -9,13 +9,13 @@ using threading::Field; namespace input { -class PutMessage : public threading::OutputMessage { +class PutMessage final : public threading::OutputMessage { public: PutMessage(ReaderFrontend* reader, Value* *val) : threading::OutputMessage("Put", reader), val(val) {} - virtual bool Process() + bool Process() override { input_mgr->Put(Object(), val); return true; @@ -25,13 +25,13 @@ private: Value* *val; }; -class DeleteMessage : public threading::OutputMessage { +class DeleteMessage final : public threading::OutputMessage { public: DeleteMessage(ReaderFrontend* reader, Value* *val) : threading::OutputMessage("Delete", reader), val(val) {} - virtual bool Process() + bool Process() override { return input_mgr->Delete(Object(), val); } @@ -40,12 +40,12 @@ private: Value* *val; }; -class ClearMessage : public threading::OutputMessage { +class ClearMessage final : public threading::OutputMessage { public: ClearMessage(ReaderFrontend* reader) : threading::OutputMessage("Clear", reader) {} - virtual bool Process() + bool Process() override { input_mgr->Clear(Object()); return true; @@ -54,15 +54,15 @@ public: private: }; -class SendEventMessage : public threading::OutputMessage { +class SendEventMessage final : public threading::OutputMessage { public: SendEventMessage(ReaderFrontend* reader, const char* name, const int num_vals, Value* *val) : threading::OutputMessage("SendEvent", reader), name(copy_string(name)), num_vals(num_vals), val(val) {} - virtual ~SendEventMessage() { delete [] name; } + ~SendEventMessage() override { delete [] name; } - virtual bool Process() + bool Process() override { bool success = input_mgr->SendEvent(Object(), name, num_vals, val); @@ -78,7 +78,7 @@ private: Value* *val; }; -class ReaderErrorMessage : public threading::OutputMessage +class ReaderErrorMessage final : public threading::OutputMessage { public: enum Type { @@ -89,22 +89,22 @@ public: : threading::OutputMessage("ReaderErrorMessage", reader) { type = arg_type; msg = copy_string(arg_msg); } - virtual ~ReaderErrorMessage() { delete [] msg; } + ~ReaderErrorMessage() override { delete [] msg; } - virtual bool Process(); + bool Process() override; private: const char* msg; Type type; }; -class SendEntryMessage : public threading::OutputMessage { +class SendEntryMessage final : public threading::OutputMessage { public: SendEntryMessage(ReaderFrontend* reader, Value* *val) : threading::OutputMessage("SendEntry", reader), val(val) { } - virtual bool Process() + bool Process() override { input_mgr->SendEntry(Object(), val); return true; @@ -114,12 +114,12 @@ private: Value* *val; }; -class EndCurrentSendMessage : public threading::OutputMessage { +class EndCurrentSendMessage final : public threading::OutputMessage { public: EndCurrentSendMessage(ReaderFrontend* reader) : threading::OutputMessage("EndCurrentSend", reader) {} - virtual bool Process() + bool Process() override { input_mgr->EndCurrentSend(Object()); return true; @@ -128,12 +128,12 @@ public: private: }; -class EndOfDataMessage : public threading::OutputMessage { +class EndOfDataMessage final : public threading::OutputMessage { public: EndOfDataMessage(ReaderFrontend* reader) : threading::OutputMessage("EndOfData", reader) {} - virtual bool Process() + bool Process() override { input_mgr->SendEndOfData(Object()); return true; @@ -142,12 +142,12 @@ public: private: }; -class ReaderClosedMessage : public threading::OutputMessage { +class ReaderClosedMessage final : public threading::OutputMessage { public: ReaderClosedMessage(ReaderFrontend* reader) : threading::OutputMessage("ReaderClosed", reader) {} - virtual bool Process() + bool Process() override { Object()->SetDisable(); return input_mgr->RemoveStreamContinuation(Object()); @@ -156,13 +156,13 @@ public: private: }; -class DisableMessage : public threading::OutputMessage +class DisableMessage final : public threading::OutputMessage { public: - DisableMessage(ReaderFrontend* writer) + DisableMessage(ReaderFrontend* writer) : threading::OutputMessage("Disable", writer) {} - virtual bool Process() + bool Process() override { Object()->SetDisable(); // And - because we do not need disabled objects any more - diff --git a/src/input/ReaderFrontend.cc b/src/input/ReaderFrontend.cc index 09e9dba456..898d4b30da 100644 --- a/src/input/ReaderFrontend.cc +++ b/src/input/ReaderFrontend.cc @@ -6,7 +6,7 @@ namespace input { -class InitMessage : public threading::InputMessage +class InitMessage final : public threading::InputMessage { public: InitMessage(ReaderBackend* backend, @@ -14,7 +14,7 @@ public: : threading::InputMessage("Init", backend), num_fields(num_fields), fields(fields) { } - virtual bool Process() + bool Process() override { return Object()->Init(num_fields, fields); } @@ -24,14 +24,14 @@ private: const threading::Field* const* fields; }; -class UpdateMessage : public threading::InputMessage +class UpdateMessage final : public threading::InputMessage { public: UpdateMessage(ReaderBackend* backend) : threading::InputMessage("Update", backend) { } - virtual bool Process() { return Object()->Update(); } + bool Process() override { return Object()->Update(); } }; ReaderFrontend::ReaderFrontend(const ReaderBackend::ReaderInfo& arg_info, EnumVal* type) @@ -98,4 +98,3 @@ const char* ReaderFrontend::Name() const } } - diff --git a/src/input/readers/ascii/Plugin.cc b/src/input/readers/ascii/Plugin.cc index 79738ccba5..365d7370e7 100644 --- a/src/input/readers/ascii/Plugin.cc +++ b/src/input/readers/ascii/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_AsciiReader { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::input::Component("Ascii", ::input::reader::Ascii::Instantiate)); diff --git a/src/input/readers/benchmark/Plugin.cc b/src/input/readers/benchmark/Plugin.cc index 8da8b24148..8a75149c60 100644 --- a/src/input/readers/benchmark/Plugin.cc +++ b/src/input/readers/benchmark/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_BenchmarkReader { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::input::Component("Benchmark", ::input::reader::Benchmark::Instantiate)); diff --git a/src/input/readers/binary/Plugin.cc b/src/input/readers/binary/Plugin.cc index a84260eb67..f39d85ca9a 100644 --- a/src/input/readers/binary/Plugin.cc +++ b/src/input/readers/binary/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_BinaryReader { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::input::Component("Binary", ::input::reader::Binary::Instantiate)); diff --git a/src/input/readers/config/Plugin.cc b/src/input/readers/config/Plugin.cc index 810acc2370..72ccc7f8af 100644 --- a/src/input/readers/config/Plugin.cc +++ b/src/input/readers/config/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_ConfigReader { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::input::Component("Config", ::input::reader::Config::Instantiate)); diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc index 5791b836a1..d5b17cd62f 100644 --- a/src/input/readers/raw/Plugin.cc +++ b/src/input/readers/raw/Plugin.cc @@ -32,4 +32,3 @@ std::unique_lock Plugin::ForkMutex() { return std::unique_lock(fork_mutex, std::defer_lock); } - diff --git a/src/input/readers/sqlite/Plugin.cc b/src/input/readers/sqlite/Plugin.cc index 6217d3bf93..4ab173394d 100644 --- a/src/input/readers/sqlite/Plugin.cc +++ b/src/input/readers/sqlite/Plugin.cc @@ -9,7 +9,7 @@ namespace Zeek_SQLiteReader { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::input::Component("SQLite", ::input::reader::SQLite::Instantiate)); diff --git a/src/iosource/pcap/Plugin.cc b/src/iosource/pcap/Plugin.cc index 4aec5bd4cd..66249ef132 100644 --- a/src/iosource/pcap/Plugin.cc +++ b/src/iosource/pcap/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_Pcap { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::iosource::PktSrcComponent("PcapReader", "pcap", ::iosource::PktSrcComponent::BOTH, ::iosource::pcap::PcapSource::Instantiate)); AddComponent(new ::iosource::PktDumperComponent("PcapWriter", "pcap", ::iosource::pcap::PcapDumper::Instantiate)); @@ -24,4 +24,3 @@ public: } } - diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc index e85990e6c8..d1af7e674c 100644 --- a/src/logging/Manager.cc +++ b/src/logging/Manager.cc @@ -1399,7 +1399,7 @@ public: rotate = arg_rotate; } - ~RotationTimer(); + ~RotationTimer() override; void Dispatch(double t, bool is_expire) override; diff --git a/src/logging/WriterBackend.cc b/src/logging/WriterBackend.cc index 23fc855019..4512234734 100644 --- a/src/logging/WriterBackend.cc +++ b/src/logging/WriterBackend.cc @@ -16,7 +16,7 @@ using threading::Field; namespace logging { -class RotationFinishedMessage : public threading::OutputMessage +class RotationFinishedMessage final : public threading::OutputMessage { public: RotationFinishedMessage(WriterFrontend* writer, const char* new_name, const char* old_name, @@ -25,13 +25,13 @@ public: new_name(copy_string(new_name)), old_name(copy_string(old_name)), open(open), close(close), success(success), terminating(terminating) { } - virtual ~RotationFinishedMessage() + ~RotationFinishedMessage() override { delete [] new_name; delete [] old_name; } - virtual bool Process() + bool Process() override { return log_mgr->FinishedRotation(Object(), new_name, old_name, open, close, success, terminating); } @@ -45,22 +45,22 @@ private: bool terminating; }; -class FlushWriteBufferMessage : public threading::OutputMessage +class FlushWriteBufferMessage final : public threading::OutputMessage { public: - FlushWriteBufferMessage(WriterFrontend* writer) + FlushWriteBufferMessage(WriterFrontend* writer) : threading::OutputMessage("FlushWriteBuffer", writer) {} - virtual bool Process() { Object()->FlushWriteBuffer(); return true; } + bool Process() override { Object()->FlushWriteBuffer(); return true; } }; -class DisableMessage : public threading::OutputMessage +class DisableMessage final : public threading::OutputMessage { public: - DisableMessage(WriterFrontend* writer) + DisableMessage(WriterFrontend* writer) : threading::OutputMessage("Disable", writer) {} - virtual bool Process() { Object()->SetDisable(); return true; } + bool Process() override { Object()->SetDisable(); return true; } }; } diff --git a/src/logging/WriterFrontend.cc b/src/logging/WriterFrontend.cc index 342c4f06a6..f8ce418482 100644 --- a/src/logging/WriterFrontend.cc +++ b/src/logging/WriterFrontend.cc @@ -14,7 +14,7 @@ namespace logging { // Messages sent from frontend to backend (i.e., "InputMessages"). -class InitMessage : public threading::InputMessage +class InitMessage final : public threading::InputMessage { public: InitMessage(WriterBackend* backend, const int num_fields, const Field* const* fields) @@ -23,14 +23,14 @@ public: {} - virtual bool Process() { return Object()->Init(num_fields, fields); } + bool Process() override { return Object()->Init(num_fields, fields); } private: const int num_fields; const Field * const* fields; }; -class RotateMessage : public threading::InputMessage +class RotateMessage final : public threading::InputMessage { public: RotateMessage(WriterBackend* backend, WriterFrontend* frontend, const char* rotated_path, const double open, @@ -42,7 +42,7 @@ public: virtual ~RotateMessage() { delete [] rotated_path; } - virtual bool Process() { return Object()->Rotate(rotated_path, open, close, terminating); } + bool Process() override { return Object()->Rotate(rotated_path, open, close, terminating); } private: WriterFrontend* frontend; @@ -52,14 +52,14 @@ private: const bool terminating; }; -class WriteMessage : public threading::InputMessage +class WriteMessage final : public threading::InputMessage { public: WriteMessage(WriterBackend* backend, int num_fields, int num_writes, Value*** vals) : threading::InputMessage("Write", backend), num_fields(num_fields), num_writes(num_writes), vals(vals) {} - virtual bool Process() { return Object()->Write(num_fields, num_writes, vals); } + bool Process() override { return Object()->Write(num_fields, num_writes, vals); } private: int num_fields; @@ -67,27 +67,27 @@ private: Value ***vals; }; -class SetBufMessage : public threading::InputMessage +class SetBufMessage final : public threading::InputMessage { public: SetBufMessage(WriterBackend* backend, const bool enabled) : threading::InputMessage("SetBuf", backend), enabled(enabled) { } - virtual bool Process() { return Object()->SetBuf(enabled); } + bool Process() override { return Object()->SetBuf(enabled); } private: const bool enabled; }; -class FlushMessage : public threading::InputMessage +class FlushMessage final : public threading::InputMessage { public: FlushMessage(WriterBackend* backend, double network_time) : threading::InputMessage("Flush", backend), network_time(network_time) {} - virtual bool Process() { return Object()->Flush(network_time); } + bool Process() override { return Object()->Flush(network_time); } private: double network_time; }; diff --git a/src/logging/writers/ascii/Plugin.cc b/src/logging/writers/ascii/Plugin.cc index cc258c4236..bc9aa80d99 100644 --- a/src/logging/writers/ascii/Plugin.cc +++ b/src/logging/writers/ascii/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_AsciiWriter { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::logging::Component("Ascii", ::logging::writer::Ascii::Instantiate)); diff --git a/src/logging/writers/none/Plugin.cc b/src/logging/writers/none/Plugin.cc index 3c86a238a1..92dbcabded 100644 --- a/src/logging/writers/none/Plugin.cc +++ b/src/logging/writers/none/Plugin.cc @@ -10,7 +10,7 @@ namespace Zeek_NoneWriter { class Plugin : public plugin::Plugin { public: - plugin::Configuration Configure() + plugin::Configuration Configure() override { AddComponent(new ::logging::Component("None", ::logging::writer::None::Instantiate)); diff --git a/src/threading/MsgThread.cc b/src/threading/MsgThread.cc index a1aac9ea15..f662d0a46c 100644 --- a/src/threading/MsgThread.cc +++ b/src/threading/MsgThread.cc @@ -15,13 +15,13 @@ namespace threading { ////// Messages. // Signals child thread to shutdown operation. -class FinishMessage : public InputMessage +class FinishMessage final : public InputMessage { public: FinishMessage(MsgThread* thread, double network_time) : InputMessage("Finish", thread), network_time(network_time) { } - virtual bool Process() { + bool Process() override { if ( Object()->child_finished ) return true; bool result = Object()->OnFinish(network_time); @@ -34,28 +34,28 @@ private: }; // Signals main thread that operations shut down. -class FinishedMessage : public OutputMessage +class FinishedMessage final : public OutputMessage { public: FinishedMessage(MsgThread* thread) : OutputMessage("FinishedMessage", thread) { } - virtual bool Process() { + bool Process() override { Object()->main_finished = true; return true; } }; /// Sends a heartbeat to the child thread. -class HeartbeatMessage : public InputMessage +class HeartbeatMessage final : public InputMessage { public: HeartbeatMessage(MsgThread* thread, double arg_network_time, double arg_current_time) : InputMessage("Heartbeat", thread) { network_time = arg_network_time; current_time = arg_current_time; } - virtual bool Process() { + bool Process() override { return Object()->OnHeartbeat(network_time, current_time); } @@ -65,7 +65,7 @@ private: }; // A message from the child to be passed on to the Reporter. -class ReporterMessage : public OutputMessage +class ReporterMessage final : public OutputMessage { public: enum Type { @@ -77,9 +77,9 @@ public: : OutputMessage("ReporterMessage", thread) { type = arg_type; msg = copy_string(arg_msg); } - ~ReporterMessage() { delete [] msg; } + ~ReporterMessage() override { delete [] msg; } - virtual bool Process(); + bool Process() override; private: const char* msg; @@ -87,13 +87,13 @@ private: }; // A message from the the child to the main process, requesting suicide. -class KillMeMessage : public OutputMessage +class KillMeMessage final : public OutputMessage { public: KillMeMessage(MsgThread* thread) : OutputMessage("ReporterMessage", thread) {} - virtual bool Process() + bool Process() override { Object()->SignalStop(); Object()->WaitForStop(); @@ -104,16 +104,16 @@ public: #ifdef DEBUG // A debug message from the child to be passed on to the DebugLogger. -class DebugMessage : public OutputMessage +class DebugMessage final : public OutputMessage { public: DebugMessage(DebugStream arg_stream, MsgThread* thread, const char* arg_msg) : OutputMessage("DebugMessage", thread) { stream = arg_stream; msg = copy_string(arg_msg); } - virtual ~DebugMessage() { delete [] msg; } + ~DebugMessage() override { delete [] msg; } - virtual bool Process() + bool Process() override { debug_logger.Log(stream, "%s: %s", Object()->Name(), msg); return true;