diff --git a/src/DebugLogger.cc b/src/DebugLogger.cc index 8234e14b08..8f8be1fc97 100644 --- a/src/DebugLogger.cc +++ b/src/DebugLogger.cc @@ -163,7 +163,7 @@ void DebugLogger::Log(DebugStream stream, const char* fmt, ...) fflush(file); } -void DebugLogger::Log(const plugin::Plugin& plugin, const char* fmt, ...) +void DebugLogger::Log(const zeek::plugin::Plugin& plugin, const char* fmt, ...) { std::string tok = std::string("plugin-") + plugin.Name(); tok = strreplace(tok, "::", "-"); diff --git a/src/analyzer/protocol/arp/Plugin.cc b/src/analyzer/protocol/arp/Plugin.cc index aceca7dd58..18bba8067c 100644 --- a/src/analyzer/protocol/arp/Plugin.cc +++ b/src/analyzer/protocol/arp/Plugin.cc @@ -6,11 +6,11 @@ namespace plugin { namespace Zeek_ARP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::ARP"; config.description = "ARP Parsing"; return config; diff --git a/src/analyzer/protocol/ayiya/Plugin.cc b/src/analyzer/protocol/ayiya/Plugin.cc index df053c57a0..b16de5bf37 100644 --- a/src/analyzer/protocol/ayiya/Plugin.cc +++ b/src/analyzer/protocol/ayiya/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_AYIYA { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("AYIYA", ::analyzer::ayiya::AYIYA_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::AYIYA"; config.description = "AYIYA Analyzer"; return config; diff --git a/src/analyzer/protocol/bittorrent/Plugin.cc b/src/analyzer/protocol/bittorrent/Plugin.cc index bf8636a103..ea47b945ff 100644 --- a/src/analyzer/protocol/bittorrent/Plugin.cc +++ b/src/analyzer/protocol/bittorrent/Plugin.cc @@ -8,14 +8,14 @@ namespace plugin { namespace Zeek_BitTorrent { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("BitTorrent", ::analyzer::bittorrent::BitTorrent_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("BitTorrentTracker", ::analyzer::bittorrent::BitTorrentTracker_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::BitTorrent"; config.description = "BitTorrent Analyzer"; return config; diff --git a/src/analyzer/protocol/conn-size/Plugin.cc b/src/analyzer/protocol/conn-size/Plugin.cc index 3f73558051..7068a27baf 100644 --- a/src/analyzer/protocol/conn-size/Plugin.cc +++ b/src/analyzer/protocol/conn-size/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_ConnSize { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("ConnSize", ::analyzer::conn_size::ConnSize_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::ConnSize"; config.description = "Connection size analyzer"; return config; diff --git a/src/analyzer/protocol/dce-rpc/Plugin.cc b/src/analyzer/protocol/dce-rpc/Plugin.cc index 4974b1c427..eb002174dc 100644 --- a/src/analyzer/protocol/dce-rpc/Plugin.cc +++ b/src/analyzer/protocol/dce-rpc/Plugin.cc @@ -8,13 +8,13 @@ namespace plugin { namespace Zeek_DCE_RPC { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DCE_RPC", ::analyzer::dce_rpc::DCE_RPC_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::DCE_RPC"; config.description = "DCE-RPC analyzer"; return config; diff --git a/src/analyzer/protocol/dhcp/Plugin.cc b/src/analyzer/protocol/dhcp/Plugin.cc index 1b42b8b4fd..5d2b3f8939 100644 --- a/src/analyzer/protocol/dhcp/Plugin.cc +++ b/src/analyzer/protocol/dhcp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_DHCP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DHCP", ::analyzer::dhcp::DHCP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::DHCP"; config.description = "DHCP analyzer"; return config; diff --git a/src/analyzer/protocol/dnp3/Plugin.cc b/src/analyzer/protocol/dnp3/Plugin.cc index 70a9e6fcc2..ad8639969e 100644 --- a/src/analyzer/protocol/dnp3/Plugin.cc +++ b/src/analyzer/protocol/dnp3/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_DNP3 { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::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)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::DNP3"; config.description = "DNP3 UDP/TCP analyzers"; return config; diff --git a/src/analyzer/protocol/dns/Plugin.cc b/src/analyzer/protocol/dns/Plugin.cc index 4aceaf0ff4..7f6eba2376 100644 --- a/src/analyzer/protocol/dns/Plugin.cc +++ b/src/analyzer/protocol/dns/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_DNS { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("DNS", ::analyzer::dns::DNS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_DNS", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::DNS"; config.description = "DNS analyzer"; return config; diff --git a/src/analyzer/protocol/file/Plugin.cc b/src/analyzer/protocol/file/Plugin.cc index 4c9d6ff31a..6f775cad33 100644 --- a/src/analyzer/protocol/file/Plugin.cc +++ b/src/analyzer/protocol/file/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_File { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::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)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::File"; config.description = "Generic file analyzer"; return config; diff --git a/src/analyzer/protocol/finger/Plugin.cc b/src/analyzer/protocol/finger/Plugin.cc index 65edceb642..36a8b6f218 100644 --- a/src/analyzer/protocol/finger/Plugin.cc +++ b/src/analyzer/protocol/finger/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_Finger { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Finger", ::analyzer::finger::Finger_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Finger"; config.description = "Finger analyzer"; return config; diff --git a/src/analyzer/protocol/ftp/Plugin.cc b/src/analyzer/protocol/ftp/Plugin.cc index b7743355a7..86dff3a911 100644 --- a/src/analyzer/protocol/ftp/Plugin.cc +++ b/src/analyzer/protocol/ftp/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_FTP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("FTP", ::analyzer::ftp::FTP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("FTP_ADAT", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::FTP"; config.description = "FTP analyzer"; return config; diff --git a/src/analyzer/protocol/gnutella/Plugin.cc b/src/analyzer/protocol/gnutella/Plugin.cc index 6452961b19..380d43559e 100644 --- a/src/analyzer/protocol/gnutella/Plugin.cc +++ b/src/analyzer/protocol/gnutella/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_Gnutella { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Gnutella", ::analyzer::gnutella::Gnutella_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Gnutella"; config.description = "Gnutella analyzer"; return config; diff --git a/src/analyzer/protocol/gssapi/Plugin.cc b/src/analyzer/protocol/gssapi/Plugin.cc index 7f934cd3ac..fc478e29c9 100644 --- a/src/analyzer/protocol/gssapi/Plugin.cc +++ b/src/analyzer/protocol/gssapi/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_GSSAPI { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("GSSAPI", ::analyzer::gssapi::GSSAPI_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::GSSAPI"; config.description = "GSSAPI analyzer"; return config; diff --git a/src/analyzer/protocol/gtpv1/Plugin.cc b/src/analyzer/protocol/gtpv1/Plugin.cc index 9196c05a3b..94482bff96 100644 --- a/src/analyzer/protocol/gtpv1/Plugin.cc +++ b/src/analyzer/protocol/gtpv1/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_GTPv1 { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("GTPv1", ::analyzer::gtpv1::GTPv1_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::GTPv1"; config.description = "GTPv1 analyzer"; return config; diff --git a/src/analyzer/protocol/http/Plugin.cc b/src/analyzer/protocol/http/Plugin.cc index 52d8369d9e..d75e5eaaae 100644 --- a/src/analyzer/protocol/http/Plugin.cc +++ b/src/analyzer/protocol/http/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_HTTP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("HTTP", ::analyzer::http::HTTP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::HTTP"; config.description = "HTTP analyzer"; return config; diff --git a/src/analyzer/protocol/icmp/Plugin.cc b/src/analyzer/protocol/icmp/Plugin.cc index 1a104e63c1..ffa23f28ba 100644 --- a/src/analyzer/protocol/icmp/Plugin.cc +++ b/src/analyzer/protocol/icmp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_ICMP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("ICMP", ::analyzer::icmp::ICMP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::ICMP"; config.description = "ICMP analyzer"; return config; diff --git a/src/analyzer/protocol/ident/Plugin.cc b/src/analyzer/protocol/ident/Plugin.cc index 68042555b2..a338a00543 100644 --- a/src/analyzer/protocol/ident/Plugin.cc +++ b/src/analyzer/protocol/ident/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_Ident { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Ident", ::analyzer::ident::Ident_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Ident"; config.description = "Ident analyzer"; return config; diff --git a/src/analyzer/protocol/imap/Plugin.cc b/src/analyzer/protocol/imap/Plugin.cc index 5c5ec7c4bf..8851f821eb 100644 --- a/src/analyzer/protocol/imap/Plugin.cc +++ b/src/analyzer/protocol/imap/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_IMAP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("IMAP", ::analyzer::imap::IMAP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::IMAP"; config.description = "IMAP analyzer (StartTLS only)"; return config; diff --git a/src/analyzer/protocol/irc/Plugin.cc b/src/analyzer/protocol/irc/Plugin.cc index c22498c38d..d54ef4d9c6 100644 --- a/src/analyzer/protocol/irc/Plugin.cc +++ b/src/analyzer/protocol/irc/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_IRC { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("IRC", ::analyzer::irc::IRC_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::IRC"; config.description = "IRC analyzer"; return config; diff --git a/src/analyzer/protocol/krb/Plugin.cc b/src/analyzer/protocol/krb/Plugin.cc index 8b6d51a9e5..cce65b797a 100644 --- a/src/analyzer/protocol/krb/Plugin.cc +++ b/src/analyzer/protocol/krb/Plugin.cc @@ -6,18 +6,20 @@ #include "analyzer/Component.h" namespace plugin { - namespace Zeek_KRB { - class Plugin : public plugin::Plugin { - public: - 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)); - plugin::Configuration config; - config.name = "Zeek::KRB"; - config.description = "Kerberos analyzer"; - return config; - } - } plugin; - } +namespace Zeek_KRB { + +class Plugin : public zeek::plugin::Plugin { +public: + zeek::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)); + zeek::plugin::Configuration config; + config.name = "Zeek::KRB"; + config.description = "Kerberos analyzer"; + return config; + } +} plugin; + +} } diff --git a/src/analyzer/protocol/login/Plugin.cc b/src/analyzer/protocol/login/Plugin.cc index 27457b04d7..bc3a440537 100644 --- a/src/analyzer/protocol/login/Plugin.cc +++ b/src/analyzer/protocol/login/Plugin.cc @@ -10,9 +10,9 @@ namespace plugin { namespace Zeek_Login { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Telnet", ::analyzer::login::Telnet_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Rsh", ::analyzer::login::Rsh_Analyzer::Instantiate)); @@ -22,7 +22,7 @@ public: AddComponent(new ::analyzer::Component("Contents_Rsh", nullptr)); AddComponent(new ::analyzer::Component("Contents_Rlogin", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Login"; config.description = "Telnet/Rsh/Rlogin analyzers"; return config; diff --git a/src/analyzer/protocol/mime/Plugin.cc b/src/analyzer/protocol/mime/Plugin.cc index 222b5a2f79..fefe969098 100644 --- a/src/analyzer/protocol/mime/Plugin.cc +++ b/src/analyzer/protocol/mime/Plugin.cc @@ -6,11 +6,11 @@ namespace plugin { namespace Zeek_MIME { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::MIME"; config.description = "MIME parsing"; return config; diff --git a/src/analyzer/protocol/modbus/Plugin.cc b/src/analyzer/protocol/modbus/Plugin.cc index 9b1aef6ea5..e31bd4f89d 100644 --- a/src/analyzer/protocol/modbus/Plugin.cc +++ b/src/analyzer/protocol/modbus/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_Modbus { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("MODBUS", ::analyzer::modbus::ModbusTCP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Modbus"; config.description = "Modbus analyzer"; return config; diff --git a/src/analyzer/protocol/mqtt/Plugin.cc b/src/analyzer/protocol/mqtt/Plugin.cc index fcafb4a7f2..ab820ecb44 100644 --- a/src/analyzer/protocol/mqtt/Plugin.cc +++ b/src/analyzer/protocol/mqtt/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_MQTT { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("MQTT", ::analyzer::MQTT::MQTT_Analyzer::InstantiateAnalyzer)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::MQTT"; config.description = "Message Queuing Telemetry Transport v3.1.1 Protocol analyzer"; return config; diff --git a/src/analyzer/protocol/mysql/Plugin.cc b/src/analyzer/protocol/mysql/Plugin.cc index 965bda6993..6a3d7d3ccc 100644 --- a/src/analyzer/protocol/mysql/Plugin.cc +++ b/src/analyzer/protocol/mysql/Plugin.cc @@ -5,17 +5,19 @@ #include "analyzer/Component.h" namespace plugin { - namespace Zeek_MySQL { - class Plugin : public plugin::Plugin { - public: - plugin::Configuration Configure() override - { - AddComponent(new ::analyzer::Component("MySQL", ::analyzer::MySQL::MySQL_Analyzer::Instantiate)); - plugin::Configuration config; - config.name = "Zeek::MySQL"; - config.description = "MySQL analyzer"; - return config; - } - } plugin; - } +namespace Zeek_MySQL { + +class Plugin : public zeek::plugin::Plugin { +public: + zeek::plugin::Configuration Configure() override + { + AddComponent(new ::analyzer::Component("MySQL", ::analyzer::MySQL::MySQL_Analyzer::Instantiate)); + zeek::plugin::Configuration config; + config.name = "Zeek::MySQL"; + config.description = "MySQL analyzer"; + return config; + } +} plugin; + +} } diff --git a/src/analyzer/protocol/ncp/Plugin.cc b/src/analyzer/protocol/ncp/Plugin.cc index b76fcbf748..24030935fc 100644 --- a/src/analyzer/protocol/ncp/Plugin.cc +++ b/src/analyzer/protocol/ncp/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_NCP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NCP", ::analyzer::ncp::NCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_NCP", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::NCP"; config.description = "NCP analyzer"; return config; diff --git a/src/analyzer/protocol/netbios/Plugin.cc b/src/analyzer/protocol/netbios/Plugin.cc index 47db030464..d5d8671d4b 100644 --- a/src/analyzer/protocol/netbios/Plugin.cc +++ b/src/analyzer/protocol/netbios/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_NetBIOS { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NetbiosSSN", ::analyzer::netbios_ssn::NetbiosSSN_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_NetbiosSSN", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::NetBIOS"; config.description = "NetBIOS analyzer support"; return config; diff --git a/src/analyzer/protocol/ntlm/Plugin.cc b/src/analyzer/protocol/ntlm/Plugin.cc index 92a3a3df77..572d9b97c6 100644 --- a/src/analyzer/protocol/ntlm/Plugin.cc +++ b/src/analyzer/protocol/ntlm/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_NTLM { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NTLM", ::analyzer::ntlm::NTLM_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::NTLM"; config.description = "NTLM analyzer"; return config; diff --git a/src/analyzer/protocol/ntp/Plugin.cc b/src/analyzer/protocol/ntp/Plugin.cc index 437051f032..0b03791e1a 100644 --- a/src/analyzer/protocol/ntp/Plugin.cc +++ b/src/analyzer/protocol/ntp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_NTP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NTP", ::analyzer::NTP::NTP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::NTP"; config.description = "NTP analyzer"; return config; diff --git a/src/analyzer/protocol/pia/Plugin.cc b/src/analyzer/protocol/pia/Plugin.cc index 1dbdfa45b4..b3482f2913 100644 --- a/src/analyzer/protocol/pia/Plugin.cc +++ b/src/analyzer/protocol/pia/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_PIA { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::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)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::PIA"; config.description = "Analyzers implementing Dynamic Protocol"; return config; diff --git a/src/analyzer/protocol/pop3/Plugin.cc b/src/analyzer/protocol/pop3/Plugin.cc index 1f1f95da2e..1f287798f7 100644 --- a/src/analyzer/protocol/pop3/Plugin.cc +++ b/src/analyzer/protocol/pop3/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_POP3 { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("POP3", ::analyzer::pop3::POP3_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::POP3"; config.description = "POP3 analyzer"; return config; diff --git a/src/analyzer/protocol/radius/Plugin.cc b/src/analyzer/protocol/radius/Plugin.cc index c99d945a57..5b765d2596 100644 --- a/src/analyzer/protocol/radius/Plugin.cc +++ b/src/analyzer/protocol/radius/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_RADIUS { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("RADIUS", ::analyzer::RADIUS::RADIUS_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::RADIUS"; config.description = "RADIUS analyzer"; return config; diff --git a/src/analyzer/protocol/rdp/Plugin.cc b/src/analyzer/protocol/rdp/Plugin.cc index 7d07d4c564..70145b109e 100644 --- a/src/analyzer/protocol/rdp/Plugin.cc +++ b/src/analyzer/protocol/rdp/Plugin.cc @@ -6,18 +6,18 @@ namespace plugin { namespace Zeek_RDP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override - { - AddComponent(new ::analyzer::Component("RDP", ::analyzer::rdp::RDP_Analyzer::InstantiateAnalyzer)); - AddComponent(new ::analyzer::Component("RDPEUDP", ::analyzer::rdpeudp::RDP_Analyzer::InstantiateAnalyzer)); + zeek::plugin::Configuration Configure() override + { + AddComponent(new ::analyzer::Component("RDP", ::analyzer::rdp::RDP_Analyzer::InstantiateAnalyzer)); + AddComponent(new ::analyzer::Component("RDPEUDP", ::analyzer::rdpeudp::RDP_Analyzer::InstantiateAnalyzer)); - plugin::Configuration config; - config.name = "Zeek::RDP"; - config.description = "RDP analyzer"; - return config; - } + zeek::plugin::Configuration config; + config.name = "Zeek::RDP"; + config.description = "RDP analyzer"; + return config; + } } plugin; } diff --git a/src/analyzer/protocol/rfb/Plugin.cc b/src/analyzer/protocol/rfb/Plugin.cc index 7d9d7e31bd..1bc665e25d 100644 --- a/src/analyzer/protocol/rfb/Plugin.cc +++ b/src/analyzer/protocol/rfb/Plugin.cc @@ -5,14 +5,14 @@ namespace plugin { namespace Zeek_RFB { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("RFB", ::analyzer::rfb::RFB_Analyzer::InstantiateAnalyzer)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::RFB"; config.description = "Parser for rfb (VNC) analyzer"; return config; diff --git a/src/analyzer/protocol/rpc/Plugin.cc b/src/analyzer/protocol/rpc/Plugin.cc index 6e284c9dbf..21f44a247f 100644 --- a/src/analyzer/protocol/rpc/Plugin.cc +++ b/src/analyzer/protocol/rpc/Plugin.cc @@ -10,9 +10,9 @@ namespace plugin { namespace Zeek_RPC { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("NFS", ::analyzer::rpc::NFS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("MOUNT", ::analyzer::rpc::MOUNT_Analyzer::Instantiate)); @@ -20,7 +20,7 @@ public: AddComponent(new ::analyzer::Component("Contents_RPC", nullptr)); AddComponent(new ::analyzer::Component("Contents_NFS", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::RPC"; config.description = "Analyzers for RPC-based protocols"; return config; diff --git a/src/analyzer/protocol/sip/Plugin.cc b/src/analyzer/protocol/sip/Plugin.cc index d05930fa00..4a6d253cbd 100644 --- a/src/analyzer/protocol/sip/Plugin.cc +++ b/src/analyzer/protocol/sip/Plugin.cc @@ -8,16 +8,16 @@ namespace plugin { namespace Zeek_SIP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SIP", ::analyzer::SIP::SIP_Analyzer::Instantiate)); // We don't fully support SIP-over-TCP yet, so we don't activate this component. // AddComponent(new ::analyzer::Component("SIP_TCP", ::analyzer::sip_tcp::SIP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SIP"; config.description = "SIP analyzer UDP-only"; return config; diff --git a/src/analyzer/protocol/smb/Plugin.cc b/src/analyzer/protocol/smb/Plugin.cc index 2c10066eed..a4935fe204 100644 --- a/src/analyzer/protocol/smb/Plugin.cc +++ b/src/analyzer/protocol/smb/Plugin.cc @@ -7,14 +7,14 @@ namespace plugin { namespace Zeek_SMB { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SMB", ::analyzer::smb::SMB_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Contents_SMB", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SMB"; config.description = "SMB analyzer"; return config; diff --git a/src/analyzer/protocol/smtp/Plugin.cc b/src/analyzer/protocol/smtp/Plugin.cc index 2db99893af..d1a28ddc02 100644 --- a/src/analyzer/protocol/smtp/Plugin.cc +++ b/src/analyzer/protocol/smtp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_SMTP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SMTP", ::analyzer::smtp::SMTP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SMTP"; config.description = "SMTP analyzer"; return config; diff --git a/src/analyzer/protocol/snmp/Plugin.cc b/src/analyzer/protocol/snmp/Plugin.cc index 11785903b6..887b9a73ac 100644 --- a/src/analyzer/protocol/snmp/Plugin.cc +++ b/src/analyzer/protocol/snmp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_SNMP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SNMP", ::analyzer::snmp::SNMP_Analyzer::InstantiateAnalyzer)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SNMP"; config.description = "SNMP analyzer"; return config; diff --git a/src/analyzer/protocol/socks/Plugin.cc b/src/analyzer/protocol/socks/Plugin.cc index 6bd33509ad..da2375991c 100644 --- a/src/analyzer/protocol/socks/Plugin.cc +++ b/src/analyzer/protocol/socks/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_SOCKS { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SOCKS", ::analyzer::socks::SOCKS_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SOCKS"; config.description = "SOCKS analyzer"; return config; diff --git a/src/analyzer/protocol/ssh/Plugin.cc b/src/analyzer/protocol/ssh/Plugin.cc index b9b147c86d..395192bb60 100644 --- a/src/analyzer/protocol/ssh/Plugin.cc +++ b/src/analyzer/protocol/ssh/Plugin.cc @@ -5,20 +5,20 @@ #include "analyzer/Component.h" namespace plugin { - namespace Zeek_SSH { +namespace Zeek_SSH { - class Plugin : public plugin::Plugin { - public: - plugin::Configuration Configure() override - { - AddComponent(new ::analyzer::Component("SSH", ::analyzer::SSH::SSH_Analyzer::Instantiate)); - - plugin::Configuration config; - config.name = "Zeek::SSH"; - config.description = "Secure Shell analyzer"; - return config; - } - } plugin; +class Plugin : public zeek::plugin::Plugin { +public: + zeek::plugin::Configuration Configure() override + { + AddComponent(new ::analyzer::Component("SSH", ::analyzer::SSH::SSH_Analyzer::Instantiate)); + zeek::plugin::Configuration config; + config.name = "Zeek::SSH"; + config.description = "Secure Shell analyzer"; + return config; } - } + } plugin; + +} +} diff --git a/src/analyzer/protocol/ssl/Plugin.cc b/src/analyzer/protocol/ssl/Plugin.cc index ea36628e09..72ea74dc7a 100644 --- a/src/analyzer/protocol/ssl/Plugin.cc +++ b/src/analyzer/protocol/ssl/Plugin.cc @@ -8,14 +8,14 @@ namespace plugin { namespace Zeek_SSL { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SSL", ::analyzer::ssl::SSL_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("DTLS", ::analyzer::dtls::DTLS_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SSL"; config.description = "SSL/TLS and DTLS analyzers"; return config; diff --git a/src/analyzer/protocol/stepping-stone/Plugin.cc b/src/analyzer/protocol/stepping-stone/Plugin.cc index 3d840a1b27..61e408bfce 100644 --- a/src/analyzer/protocol/stepping-stone/Plugin.cc +++ b/src/analyzer/protocol/stepping-stone/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_SteppingStone { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("SteppingStone", ::analyzer::stepping_stone::SteppingStone_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SteppingStone"; config.description = "Stepping stone analyzer"; return config; diff --git a/src/analyzer/protocol/syslog/Plugin.cc b/src/analyzer/protocol/syslog/Plugin.cc index f407275270..80cbf2e974 100644 --- a/src/analyzer/protocol/syslog/Plugin.cc +++ b/src/analyzer/protocol/syslog/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_Syslog { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Syslog", ::analyzer::syslog::Syslog_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Syslog"; config.description = "Syslog analyzer UDP-only"; return config; diff --git a/src/analyzer/protocol/tcp/Plugin.cc b/src/analyzer/protocol/tcp/Plugin.cc index 9f06936baa..a6dd74e460 100644 --- a/src/analyzer/protocol/tcp/Plugin.cc +++ b/src/analyzer/protocol/tcp/Plugin.cc @@ -7,16 +7,16 @@ namespace plugin { namespace Zeek_TCP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("TCP", ::analyzer::tcp::TCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("TCPStats", ::analyzer::tcp::TCPStats_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("CONTENTLINE", nullptr)); AddComponent(new ::analyzer::Component("Contents", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::TCP"; config.description = "TCP analyzer"; return config; diff --git a/src/analyzer/protocol/teredo/Plugin.cc b/src/analyzer/protocol/teredo/Plugin.cc index 05bf47ea45..12d4fc66a3 100644 --- a/src/analyzer/protocol/teredo/Plugin.cc +++ b/src/analyzer/protocol/teredo/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_Teredo { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("Teredo", ::analyzer::teredo::Teredo_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Teredo"; config.description = "Teredo analyzer"; return config; diff --git a/src/analyzer/protocol/udp/Plugin.cc b/src/analyzer/protocol/udp/Plugin.cc index aeac50f044..5eb42a867f 100644 --- a/src/analyzer/protocol/udp/Plugin.cc +++ b/src/analyzer/protocol/udp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_UDP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("UDP", ::analyzer::udp::UDP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::UDP"; config.description = "UDP Analyzer"; return config; diff --git a/src/analyzer/protocol/vxlan/Plugin.cc b/src/analyzer/protocol/vxlan/Plugin.cc index f00bf8a418..d199f4fe9d 100644 --- a/src/analyzer/protocol/vxlan/Plugin.cc +++ b/src/analyzer/protocol/vxlan/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_VXLAN { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("VXLAN", ::analyzer::vxlan::VXLAN_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::VXLAN"; config.description = "VXLAN analyzer"; return config; diff --git a/src/analyzer/protocol/xmpp/Plugin.cc b/src/analyzer/protocol/xmpp/Plugin.cc index 94befed562..f7f89852d9 100644 --- a/src/analyzer/protocol/xmpp/Plugin.cc +++ b/src/analyzer/protocol/xmpp/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_XMPP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("XMPP", ::analyzer::xmpp::XMPP_Analyzer::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::XMPP"; config.description = "XMPP analyzer (StartTLS only)"; return config; diff --git a/src/analyzer/protocol/zip/Plugin.cc b/src/analyzer/protocol/zip/Plugin.cc index d59cde2ca0..751797a55a 100644 --- a/src/analyzer/protocol/zip/Plugin.cc +++ b/src/analyzer/protocol/zip/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_ZIP { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::analyzer::Component("ZIP", nullptr)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::ZIP"; config.description = "Generic ZIP support analyzer"; return config; diff --git a/src/file_analysis/analyzer/data_event/Plugin.cc b/src/file_analysis/analyzer/data_event/Plugin.cc index 31330e1aca..e90e628c4e 100644 --- a/src/file_analysis/analyzer/data_event/Plugin.cc +++ b/src/file_analysis/analyzer/data_event/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_FileDataEvent { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("DATA_EVENT", ::file_analysis::DataEvent::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::FileDataEvent"; config.description = "Delivers file content"; return config; diff --git a/src/file_analysis/analyzer/entropy/Plugin.cc b/src/file_analysis/analyzer/entropy/Plugin.cc index 1cf3b011fa..1592ce7a95 100644 --- a/src/file_analysis/analyzer/entropy/Plugin.cc +++ b/src/file_analysis/analyzer/entropy/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_FileEntropy { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("ENTROPY", ::file_analysis::Entropy::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::FileEntropy"; config.description = "Entropy test file content"; return config; diff --git a/src/file_analysis/analyzer/extract/Plugin.cc b/src/file_analysis/analyzer/extract/Plugin.cc index d8f90bfd9d..8b9d442c40 100644 --- a/src/file_analysis/analyzer/extract/Plugin.cc +++ b/src/file_analysis/analyzer/extract/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_FileExtract { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("EXTRACT", ::file_analysis::Extract::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::FileExtract"; config.description = "Extract file content"; return config; diff --git a/src/file_analysis/analyzer/hash/Plugin.cc b/src/file_analysis/analyzer/hash/Plugin.cc index b557a03e04..e7c09c5417 100644 --- a/src/file_analysis/analyzer/hash/Plugin.cc +++ b/src/file_analysis/analyzer/hash/Plugin.cc @@ -7,15 +7,15 @@ namespace plugin { namespace Zeek_FileHash { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("MD5", ::file_analysis::MD5::Instantiate)); AddComponent(new ::file_analysis::Component("SHA1", ::file_analysis::SHA1::Instantiate)); AddComponent(new ::file_analysis::Component("SHA256", ::file_analysis::SHA256::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::FileHash"; config.description = "Hash file content"; return config; diff --git a/src/file_analysis/analyzer/pe/Plugin.cc b/src/file_analysis/analyzer/pe/Plugin.cc index 567d00e920..5e7800c9c7 100644 --- a/src/file_analysis/analyzer/pe/Plugin.cc +++ b/src/file_analysis/analyzer/pe/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_PE { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("PE", ::file_analysis::PE::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::PE"; config.description = "Portable Executable analyzer"; return config; diff --git a/src/file_analysis/analyzer/unified2/Plugin.cc b/src/file_analysis/analyzer/unified2/Plugin.cc index 5cc60f7799..2e33ed0881 100644 --- a/src/file_analysis/analyzer/unified2/Plugin.cc +++ b/src/file_analysis/analyzer/unified2/Plugin.cc @@ -9,13 +9,13 @@ namespace plugin { namespace Zeek_Unified2 { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("UNIFIED2", ::file_analysis::Unified2::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Unified2"; config.description = "Analyze Unified2 alert files."; return config; diff --git a/src/file_analysis/analyzer/x509/Plugin.cc b/src/file_analysis/analyzer/x509/Plugin.cc index 221816fca5..e52be3f8d5 100644 --- a/src/file_analysis/analyzer/x509/Plugin.cc +++ b/src/file_analysis/analyzer/x509/Plugin.cc @@ -8,15 +8,15 @@ namespace plugin { namespace Zeek_X509 { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::file_analysis::Component("X509", ::file_analysis::X509::Instantiate)); AddComponent(new ::file_analysis::Component("OCSP_REQUEST", ::file_analysis::OCSP::InstantiateRequest)); AddComponent(new ::file_analysis::Component("OCSP_REPLY", ::file_analysis::OCSP::InstantiateReply)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::X509"; config.description = "X509 and OCSP analyzer"; return config; @@ -24,7 +24,7 @@ public: void Done() override { - plugin::Plugin::Done(); + zeek::plugin::Plugin::Done(); ::file_analysis::X509::FreeRootStore(); } } plugin; diff --git a/src/input/readers/ascii/Plugin.cc b/src/input/readers/ascii/Plugin.cc index 365d7370e7..296d6bdd2e 100644 --- a/src/input/readers/ascii/Plugin.cc +++ b/src/input/readers/ascii/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_AsciiReader { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::input::Component("Ascii", ::input::reader::Ascii::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::AsciiReader"; config.description = "ASCII input reader"; return config; diff --git a/src/input/readers/benchmark/Plugin.cc b/src/input/readers/benchmark/Plugin.cc index 8a75149c60..ce81218f54 100644 --- a/src/input/readers/benchmark/Plugin.cc +++ b/src/input/readers/benchmark/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_BenchmarkReader { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::input::Component("Benchmark", ::input::reader::Benchmark::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::BenchmarkReader"; config.description = "Benchmark input reader"; return config; diff --git a/src/input/readers/binary/Plugin.cc b/src/input/readers/binary/Plugin.cc index f39d85ca9a..c258d20549 100644 --- a/src/input/readers/binary/Plugin.cc +++ b/src/input/readers/binary/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_BinaryReader { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::input::Component("Binary", ::input::reader::Binary::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::BinaryReader"; config.description = "Binary input reader"; return config; diff --git a/src/input/readers/config/Plugin.cc b/src/input/readers/config/Plugin.cc index 72ccc7f8af..8ea2c115ed 100644 --- a/src/input/readers/config/Plugin.cc +++ b/src/input/readers/config/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_ConfigReader { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::input::Component("Config", ::input::reader::Config::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::ConfigReader"; config.description = "Configuration file input reader"; return config; diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc index d5b17cd62f..ae25c62850 100644 --- a/src/input/readers/raw/Plugin.cc +++ b/src/input/readers/raw/Plugin.cc @@ -10,11 +10,11 @@ Plugin::Plugin() { } -plugin::Configuration Plugin::Configure() +zeek::plugin::Configuration Plugin::Configure() { AddComponent(new ::input::Component("Raw", ::input::reader::Raw::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::RawReader"; config.description = "Raw input reader"; return config; diff --git a/src/input/readers/raw/Plugin.h b/src/input/readers/raw/Plugin.h index 16f76ad3d6..86fded2575 100644 --- a/src/input/readers/raw/Plugin.h +++ b/src/input/readers/raw/Plugin.h @@ -11,11 +11,11 @@ namespace plugin { namespace Zeek_RawReader { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: Plugin(); - plugin::Configuration Configure() override; + zeek::plugin::Configuration Configure() override; void InitPreScript() override; void Done() override; diff --git a/src/input/readers/sqlite/Plugin.cc b/src/input/readers/sqlite/Plugin.cc index 4ab173394d..5b5a296263 100644 --- a/src/input/readers/sqlite/Plugin.cc +++ b/src/input/readers/sqlite/Plugin.cc @@ -7,13 +7,13 @@ namespace plugin { namespace Zeek_SQLiteReader { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::input::Component("SQLite", ::input::reader::SQLite::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SQLiteReader"; config.description = "SQLite input reader"; return config; diff --git a/src/iosource/pcap/Plugin.cc b/src/iosource/pcap/Plugin.cc index 66249ef132..388645a598 100644 --- a/src/iosource/pcap/Plugin.cc +++ b/src/iosource/pcap/Plugin.cc @@ -8,14 +8,14 @@ namespace plugin { namespace Zeek_Pcap { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::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)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::Pcap"; config.description = "Packet acquisition via libpcap"; return config; diff --git a/src/logging/writers/ascii/Plugin.cc b/src/logging/writers/ascii/Plugin.cc index bc9aa80d99..ad41deeaf7 100644 --- a/src/logging/writers/ascii/Plugin.cc +++ b/src/logging/writers/ascii/Plugin.cc @@ -8,13 +8,13 @@ namespace plugin { namespace Zeek_AsciiWriter { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::logging::Component("Ascii", ::logging::writer::Ascii::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::AsciiWriter"; config.description = "ASCII log writer"; return config; diff --git a/src/logging/writers/none/Plugin.cc b/src/logging/writers/none/Plugin.cc index 92dbcabded..e767fc28d3 100644 --- a/src/logging/writers/none/Plugin.cc +++ b/src/logging/writers/none/Plugin.cc @@ -8,13 +8,13 @@ namespace plugin { namespace Zeek_NoneWriter { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::logging::Component("None", ::logging::writer::None::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::NoneWriter"; config.description = "None log writer (primarily for debugging)"; return config; diff --git a/src/logging/writers/sqlite/Plugin.cc b/src/logging/writers/sqlite/Plugin.cc index a7ddc95472..906407b673 100644 --- a/src/logging/writers/sqlite/Plugin.cc +++ b/src/logging/writers/sqlite/Plugin.cc @@ -8,13 +8,13 @@ namespace plugin { namespace Zeek_SQLiteWriter { -class Plugin : public plugin::Plugin { +class Plugin : public zeek::plugin::Plugin { public: - plugin::Configuration Configure() override + zeek::plugin::Configuration Configure() override { AddComponent(new ::logging::Component("SQLite", ::logging::writer::SQLite::Instantiate)); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Zeek::SQLiteWriter"; config.description = "SQLite log writer"; return config; diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index e9d5825bc8..6854c5d321 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -957,10 +957,10 @@ private: } namespace plugin { - using VersionNumber = zeek::plugin::VersionNumber; - using Configuration = zeek::plugin::Configuration; - using BifItem = zeek::plugin::BifItem; - using HookArgument = zeek::plugin::HookArgument; - using HookArgumentList = zeek::plugin::HookArgumentList; - using Plugin = zeek::plugin::Plugin; + using VersionNumber [[deprecated("Remove in v4.1. Use zeek::plugin::VersionNumber instead")]] = zeek::plugin::VersionNumber; + using Configuration [[deprecated("Remove in v4.1. Use zeek::plugin::Configuration instead")]] = zeek::plugin::Configuration; + using BifItem [[deprecated("Remove in v4.1. Use zeek::plugin::BifItem instead")]] = zeek::plugin::BifItem; + using HookArgument [[deprecated("Remove in v4.1. Use zeek::plugin::HookArgument instead")]] = zeek::plugin::HookArgument; + using HookArgumentList [[deprecated("Remove in v4.1. Use zeek::plugin::HookArgumentList instead")]] = zeek::plugin::HookArgumentList; + using Plugin [[deprecated("Remove in v4.1. Use zeek::plugin::Plugin instead")]] = zeek::plugin::Plugin; } diff --git a/testing/btest/plugins/func-hook-plugin/src/Plugin.cc b/testing/btest/plugins/func-hook-plugin/src/Plugin.cc index f1b089e65e..c71788fa86 100644 --- a/testing/btest/plugins/func-hook-plugin/src/Plugin.cc +++ b/testing/btest/plugins/func-hook-plugin/src/Plugin.cc @@ -61,7 +61,7 @@ std::pair> Plugin::HookFunctionCall(const Func* func, return {}; } -void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) +void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args) { ODesc d; d.SetShort(); @@ -70,7 +70,9 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) hook_name(hook), d.Description()); } -void Plugin::MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) +void Plugin::MetaHookPost(zeek::plugin::HookType hook, + const zeek::plugin::HookArgumentList& args, + zeek::plugin::HookArgument result) { ODesc d1; d1.SetShort(); diff --git a/testing/btest/plugins/func-hook-plugin/src/Plugin.h b/testing/btest/plugins/func-hook-plugin/src/Plugin.h index c480466e9e..d437213719 100644 --- a/testing/btest/plugins/func-hook-plugin/src/Plugin.h +++ b/testing/btest/plugins/func-hook-plugin/src/Plugin.h @@ -6,7 +6,7 @@ namespace plugin { namespace Demo_Hooks { -class Plugin : public ::plugin::Plugin +class Plugin : public zeek::plugin::Plugin { protected: @@ -14,8 +14,11 @@ protected: Frame* frame, zeek::Args* args) override; - void MetaHookPre(HookType hook, const HookArgumentList& args) override; - void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) override; + void MetaHookPre(zeek::plugin::HookType hook, + const zeek::plugin::HookArgumentList& args) override; + void MetaHookPost(zeek::plugin::HookType hook, + const zeek::plugin::HookArgumentList& args, + zeek::plugin::HookArgument result) override; // Overridden from plugin::Plugin. plugin::Configuration Configure() override; diff --git a/testing/btest/plugins/hooks-plugin/src/Plugin.cc b/testing/btest/plugins/hooks-plugin/src/Plugin.cc index 473de5f5c0..4166443a6a 100644 --- a/testing/btest/plugins/hooks-plugin/src/Plugin.cc +++ b/testing/btest/plugins/hooks-plugin/src/Plugin.cc @@ -11,21 +11,21 @@ namespace plugin { namespace Demo_Hooks { Plugin plugin; } } using namespace plugin::Demo_Hooks; -plugin::Configuration Plugin::Configure() +zeek::plugin::Configuration Plugin::Configure() { - EnableHook(HOOK_LOAD_FILE); - EnableHook(HOOK_CALL_FUNCTION); - EnableHook(HOOK_QUEUE_EVENT); - EnableHook(HOOK_DRAIN_EVENTS); - EnableHook(HOOK_UPDATE_NETWORK_TIME); - EnableHook(META_HOOK_PRE); - EnableHook(META_HOOK_POST); - EnableHook(HOOK_BRO_OBJ_DTOR); - EnableHook(HOOK_SETUP_ANALYZER_TREE); - EnableHook(HOOK_LOG_INIT); - EnableHook(HOOK_LOG_WRITE); + EnableHook(zeek::plugin::HOOK_LOAD_FILE); + EnableHook(zeek::plugin::HOOK_CALL_FUNCTION); + EnableHook(zeek::plugin::HOOK_QUEUE_EVENT); + EnableHook(zeek::plugin::HOOK_DRAIN_EVENTS); + EnableHook(zeek::plugin::HOOK_UPDATE_NETWORK_TIME); + EnableHook(zeek::plugin::META_HOOK_PRE); + EnableHook(zeek::plugin::META_HOOK_POST); + EnableHook(zeek::plugin::HOOK_BRO_OBJ_DTOR); + EnableHook(zeek::plugin::HOOK_SETUP_ANALYZER_TREE); + EnableHook(zeek::plugin::HOOK_LOG_INIT); + EnableHook(zeek::plugin::HOOK_LOG_WRITE); - plugin::Configuration config; + zeek::plugin::Configuration config; config.name = "Demo::Hooks"; config.description = "Exercises all plugin hooks"; config.version.major = 1; @@ -34,11 +34,11 @@ plugin::Configuration Plugin::Configure() return config; } -static void describe_hook_args(const plugin::HookArgumentList& args, ODesc* d) +static void describe_hook_args(const zeek::plugin::HookArgumentList& args, ODesc* d) { bool first = true; - for ( plugin::HookArgumentList::const_iterator i = args.begin(); i != args.end(); i++ ) + for ( zeek::plugin::HookArgumentList::const_iterator i = args.begin(); i != args.end(); i++ ) { if ( ! first ) d->Add(", "); @@ -59,8 +59,8 @@ std::pair Plugin::HookCallFunction(const Func* func, Frame* frame, v { ODesc d; d.SetShort(); - HookArgument(func).Describe(&d); - HookArgument(args).Describe(&d); + zeek::plugin::HookArgument(func).Describe(&d); + zeek::plugin::HookArgument(args).Describe(&d); fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookCallFunction", d.Description()); @@ -71,7 +71,7 @@ bool Plugin::HookQueueEvent(Event* event) { ODesc d; d.SetShort(); - HookArgument(event).Describe(&d); + zeek::plugin::HookArgument(event).Describe(&d); fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookQueueEvent", d.Description()); @@ -105,7 +105,7 @@ void Plugin::HookBroObjDtor(void* obj) fprintf(stderr, "%.6f %-15s\n", ::network_time, "| HookBroObjDtor"); } -void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) +void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args) { ODesc d; d.SetShort(); @@ -114,7 +114,7 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) hook_name(hook), d.Description()); } -void Plugin::MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) +void Plugin::MetaHookPost(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args, zeek::plugin::HookArgument result) { ODesc d1; d1.SetShort(); diff --git a/testing/btest/plugins/hooks-plugin/src/Plugin.h b/testing/btest/plugins/hooks-plugin/src/Plugin.h index 9319663e70..91ba95b387 100644 --- a/testing/btest/plugins/hooks-plugin/src/Plugin.h +++ b/testing/btest/plugins/hooks-plugin/src/Plugin.h @@ -6,7 +6,7 @@ namespace plugin { namespace Demo_Hooks { -class Plugin : public ::plugin::Plugin +class Plugin : public zeek::plugin::Plugin { protected: int HookLoadFile(const LoadType type, const std::string& file, const std::string& resolved) override; @@ -18,13 +18,13 @@ protected: void HookLogInit(const std::string& writer, const std::string& instantiating_filter, bool local, bool remote, const logging::WriterBackend::WriterInfo& info, int num_fields, const threading::Field* const* fields) override; bool HookLogWrite(const std::string& writer, const std::string& filter, const logging::WriterBackend::WriterInfo& info, int num_fields, const threading::Field* const* fields, threading::Value** vals) override; void HookSetupAnalyzerTree(Connection *conn) override; - void MetaHookPre(HookType hook, const HookArgumentList& args) override; - void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) override; + void MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args) override; + void MetaHookPost(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args, zeek::plugin::HookArgument result) override; void RenderVal(const threading::Value* val, ODesc &d) const; - // Overridden from plugin::Plugin. - plugin::Configuration Configure() override; + // Overridden from zeek::plugin::Plugin. + zeek::plugin::Configuration Configure() override; }; extern Plugin plugin; diff --git a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc index c4f06fc651..7dba8c0a97 100644 --- a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc +++ b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc @@ -80,7 +80,7 @@ std::pair Plugin::HookCallFunction(const Func* func, Frame* frame, v /* return {}; */ /* } */ -void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) +void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args) { ODesc d; d.SetShort(); @@ -89,7 +89,8 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) hook_name(hook), d.Description()); } -void Plugin::MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) +void Plugin::MetaHookPost(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args, + zeek::plugin::HookArgument result) { ODesc d1; d1.SetShort(); diff --git a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h index 305192b31e..5a3a79b4a7 100644 --- a/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h +++ b/testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h @@ -6,7 +6,7 @@ namespace plugin { namespace Demo_Hooks { -class Plugin : public ::plugin::Plugin +class Plugin : public zeek::plugin::Plugin { protected: std::pair HookCallFunction(const Func* func, Frame* frame, val_list* args) override; @@ -15,8 +15,11 @@ protected: /* Frame* frame, */ /* zeek::Args* args) override; */ - void MetaHookPre(HookType hook, const HookArgumentList& args) override; - void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) override; + void MetaHookPre(zeek::plugin::HookType hook, + const zeek::plugin::HookArgumentList& args) override; + void MetaHookPost(zeek::plugin::HookType hook, + const zeek::plugin::HookArgumentList& args, + zeek::plugin::HookArgument result) override; // Overridden from plugin::Plugin. plugin::Configuration Configure() override;