Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 20:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Mark all of the aliased classes in plugin/Plugin.h deprecated, and fix all of the plugins that were using them

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-14 17:25:40 -07:00
parent e77e8c4b7b
commit 7a5dae4354
76 changed files with 297 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/DebugLogger.cc
View file

@ -163,7 +163,7 @@ void DebugLogger::Log(DebugStream stream, const char* fmt, ...)
fflush(file); 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(); std::string tok = std::string("plugin-") + plugin.Name();
tok = strreplace(tok, "::", "-"); tok = strreplace(tok, "::", "-");

6
src/analyzer/protocol/arp/Plugin.cc
View file

@ -6,11 +6,11 @@
namespace plugin { namespace plugin {
namespace Zeek_ARP { namespace Zeek_ARP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::ARP"; config.name = "Zeek::ARP";
config.description = "ARP Parsing"; config.description = "ARP Parsing";
return config; return config;

6
src/analyzer/protocol/ayiya/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_AYIYA { namespace Zeek_AYIYA {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("AYIYA", ::analyzer::ayiya::AYIYA_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("AYIYA", ::analyzer::ayiya::AYIYA_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::AYIYA"; config.name = "Zeek::AYIYA";
config.description = "AYIYA Analyzer"; config.description = "AYIYA Analyzer";
return config; return config;

6
src/analyzer/protocol/bittorrent/Plugin.cc
View file

@ -8,14 +8,14 @@
namespace plugin { namespace plugin {
namespace Zeek_BitTorrent { namespace Zeek_BitTorrent {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("BitTorrent", ::analyzer::bittorrent::BitTorrent_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("BitTorrent", ::analyzer::bittorrent::BitTorrent_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("BitTorrentTracker", ::analyzer::bittorrent::BitTorrentTracker_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("BitTorrentTracker", ::analyzer::bittorrent::BitTorrentTracker_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::BitTorrent"; config.name = "Zeek::BitTorrent";
config.description = "BitTorrent Analyzer"; config.description = "BitTorrent Analyzer";
return config; return config;

6
src/analyzer/protocol/conn-size/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_ConnSize { namespace Zeek_ConnSize {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("ConnSize", ::analyzer::conn_size::ConnSize_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("ConnSize", ::analyzer::conn_size::ConnSize_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::ConnSize"; config.name = "Zeek::ConnSize";
config.description = "Connection size analyzer"; config.description = "Connection size analyzer";
return config; return config;

6
src/analyzer/protocol/dce-rpc/Plugin.cc
View file

@ -8,13 +8,13 @@
namespace plugin { namespace plugin {
namespace Zeek_DCE_RPC { namespace Zeek_DCE_RPC {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("DCE_RPC", ::analyzer::dce_rpc::DCE_RPC_Analyzer::Instantiate)); 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.name = "Zeek::DCE_RPC";
config.description = "DCE-RPC analyzer"; config.description = "DCE-RPC analyzer";
return config; return config;

6
src/analyzer/protocol/dhcp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_DHCP { namespace Zeek_DHCP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("DHCP", ::analyzer::dhcp::DHCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("DHCP", ::analyzer::dhcp::DHCP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::DHCP"; config.name = "Zeek::DHCP";
config.description = "DHCP analyzer"; config.description = "DHCP analyzer";
return config; return config;

6
src/analyzer/protocol/dnp3/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_DNP3 { namespace Zeek_DNP3 {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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_TCP", ::analyzer::dnp3::DNP3_TCP_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("DNP3_UDP", ::analyzer::dnp3::DNP3_UDP_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.name = "Zeek::DNP3";
config.description = "DNP3 UDP/TCP analyzers"; config.description = "DNP3 UDP/TCP analyzers";
return config; return config;

6
src/analyzer/protocol/dns/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_DNS { namespace Zeek_DNS {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("DNS", ::analyzer::dns::DNS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("DNS", ::analyzer::dns::DNS_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("Contents_DNS", nullptr)); AddComponent(new ::analyzer::Component("Contents_DNS", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::DNS"; config.name = "Zeek::DNS";
config.description = "DNS analyzer"; config.description = "DNS analyzer";
return config; return config;

6
src/analyzer/protocol/file/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_File { namespace Zeek_File {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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("FTP_Data", ::analyzer::file::FTP_Data::Instantiate));
AddComponent(new ::analyzer::Component("IRC_Data", ::analyzer::file::IRC_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.name = "Zeek::File";
config.description = "Generic file analyzer"; config.description = "Generic file analyzer";
return config; return config;

6
src/analyzer/protocol/finger/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Finger { namespace Zeek_Finger {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("Finger", ::analyzer::finger::Finger_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Finger", ::analyzer::finger::Finger_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Finger"; config.name = "Zeek::Finger";
config.description = "Finger analyzer"; config.description = "Finger analyzer";
return config; return config;

6
src/analyzer/protocol/ftp/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_FTP { namespace Zeek_FTP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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", ::analyzer::ftp::FTP_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("FTP_ADAT", nullptr)); AddComponent(new ::analyzer::Component("FTP_ADAT", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::FTP"; config.name = "Zeek::FTP";
config.description = "FTP analyzer"; config.description = "FTP analyzer";
return config; return config;

6
src/analyzer/protocol/gnutella/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Gnutella { namespace Zeek_Gnutella {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("Gnutella", ::analyzer::gnutella::Gnutella_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Gnutella", ::analyzer::gnutella::Gnutella_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Gnutella"; config.name = "Zeek::Gnutella";
config.description = "Gnutella analyzer"; config.description = "Gnutella analyzer";
return config; return config;

6
src/analyzer/protocol/gssapi/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_GSSAPI { namespace Zeek_GSSAPI {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("GSSAPI", ::analyzer::gssapi::GSSAPI_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("GSSAPI", ::analyzer::gssapi::GSSAPI_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::GSSAPI"; config.name = "Zeek::GSSAPI";
config.description = "GSSAPI analyzer"; config.description = "GSSAPI analyzer";
return config; return config;

6
src/analyzer/protocol/gtpv1/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_GTPv1 { namespace Zeek_GTPv1 {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("GTPv1", ::analyzer::gtpv1::GTPv1_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("GTPv1", ::analyzer::gtpv1::GTPv1_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::GTPv1"; config.name = "Zeek::GTPv1";
config.description = "GTPv1 analyzer"; config.description = "GTPv1 analyzer";
return config; return config;

6
src/analyzer/protocol/http/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_HTTP { namespace Zeek_HTTP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("HTTP", ::analyzer::http::HTTP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("HTTP", ::analyzer::http::HTTP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::HTTP"; config.name = "Zeek::HTTP";
config.description = "HTTP analyzer"; config.description = "HTTP analyzer";
return config; return config;

6
src/analyzer/protocol/icmp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_ICMP { namespace Zeek_ICMP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("ICMP", ::analyzer::icmp::ICMP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("ICMP", ::analyzer::icmp::ICMP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::ICMP"; config.name = "Zeek::ICMP";
config.description = "ICMP analyzer"; config.description = "ICMP analyzer";
return config; return config;

6
src/analyzer/protocol/ident/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Ident { namespace Zeek_Ident {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("Ident", ::analyzer::ident::Ident_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Ident", ::analyzer::ident::Ident_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Ident"; config.name = "Zeek::Ident";
config.description = "Ident analyzer"; config.description = "Ident analyzer";
return config; return config;

6
src/analyzer/protocol/imap/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_IMAP { namespace Zeek_IMAP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("IMAP", ::analyzer::imap::IMAP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("IMAP", ::analyzer::imap::IMAP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::IMAP"; config.name = "Zeek::IMAP";
config.description = "IMAP analyzer (StartTLS only)"; config.description = "IMAP analyzer (StartTLS only)";
return config; return config;

6
src/analyzer/protocol/irc/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_IRC { namespace Zeek_IRC {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("IRC", ::analyzer::irc::IRC_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("IRC", ::analyzer::irc::IRC_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::IRC"; config.name = "Zeek::IRC";
config.description = "IRC analyzer"; config.description = "IRC analyzer";
return config; return config;

8
src/analyzer/protocol/krb/Plugin.cc
View file

@ -7,17 +7,19 @@
namespace plugin { namespace plugin {
namespace Zeek_KRB { namespace Zeek_KRB {
class Plugin : public plugin::Plugin {
class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("KRB", ::analyzer::krb::KRB_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("KRB", ::analyzer::krb::KRB_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("KRB_TCP", ::analyzer::krb_tcp::KRB_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("KRB_TCP", ::analyzer::krb_tcp::KRB_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::KRB"; config.name = "Zeek::KRB";
config.description = "Kerberos analyzer"; config.description = "Kerberos analyzer";
return config; return config;
} }
} plugin; } plugin;
} }
} }

6
src/analyzer/protocol/login/Plugin.cc
View file

@ -10,9 +10,9 @@
namespace plugin { namespace plugin {
namespace Zeek_Login { namespace Zeek_Login {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("Telnet", ::analyzer::login::Telnet_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Telnet", ::analyzer::login::Telnet_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("Rsh", ::analyzer::login::Rsh_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_Rsh", nullptr));
AddComponent(new ::analyzer::Component("Contents_Rlogin", nullptr)); AddComponent(new ::analyzer::Component("Contents_Rlogin", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Login"; config.name = "Zeek::Login";
config.description = "Telnet/Rsh/Rlogin analyzers"; config.description = "Telnet/Rsh/Rlogin analyzers";
return config; return config;

6
src/analyzer/protocol/mime/Plugin.cc
View file

@ -6,11 +6,11 @@
namespace plugin { namespace plugin {
namespace Zeek_MIME { namespace Zeek_MIME {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::MIME"; config.name = "Zeek::MIME";
config.description = "MIME parsing"; config.description = "MIME parsing";
return config; return config;

6
src/analyzer/protocol/modbus/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Modbus { namespace Zeek_Modbus {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("MODBUS", ::analyzer::modbus::ModbusTCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("MODBUS", ::analyzer::modbus::ModbusTCP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Modbus"; config.name = "Zeek::Modbus";
config.description = "Modbus analyzer"; config.description = "Modbus analyzer";
return config; return config;

6
src/analyzer/protocol/mqtt/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_MQTT { namespace Zeek_MQTT {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("MQTT", AddComponent(new ::analyzer::Component("MQTT",
::analyzer::MQTT::MQTT_Analyzer::InstantiateAnalyzer)); ::analyzer::MQTT::MQTT_Analyzer::InstantiateAnalyzer));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::MQTT"; config.name = "Zeek::MQTT";
config.description = "Message Queuing Telemetry Transport v3.1.1 Protocol analyzer"; config.description = "Message Queuing Telemetry Transport v3.1.1 Protocol analyzer";
return config; return config;

8
src/analyzer/protocol/mysql/Plugin.cc
View file

@ -6,16 +6,18 @@
namespace plugin { namespace plugin {
namespace Zeek_MySQL { namespace Zeek_MySQL {
class Plugin : public plugin::Plugin {
class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("MySQL", ::analyzer::MySQL::MySQL_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("MySQL", ::analyzer::MySQL::MySQL_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::MySQL"; config.name = "Zeek::MySQL";
config.description = "MySQL analyzer"; config.description = "MySQL analyzer";
return config; return config;
} }
} plugin; } plugin;
} }
} }

6
src/analyzer/protocol/ncp/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_NCP { namespace Zeek_NCP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("NCP", ::analyzer::ncp::NCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("NCP", ::analyzer::ncp::NCP_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("Contents_NCP", nullptr)); AddComponent(new ::analyzer::Component("Contents_NCP", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::NCP"; config.name = "Zeek::NCP";
config.description = "NCP analyzer"; config.description = "NCP analyzer";
return config; return config;

6
src/analyzer/protocol/netbios/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_NetBIOS { namespace Zeek_NetBIOS {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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("NetbiosSSN", ::analyzer::netbios_ssn::NetbiosSSN_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("Contents_NetbiosSSN", nullptr)); AddComponent(new ::analyzer::Component("Contents_NetbiosSSN", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::NetBIOS"; config.name = "Zeek::NetBIOS";
config.description = "NetBIOS analyzer support"; config.description = "NetBIOS analyzer support";
return config; return config;

6
src/analyzer/protocol/ntlm/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_NTLM { namespace Zeek_NTLM {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("NTLM", ::analyzer::ntlm::NTLM_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("NTLM", ::analyzer::ntlm::NTLM_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::NTLM"; config.name = "Zeek::NTLM";
config.description = "NTLM analyzer"; config.description = "NTLM analyzer";
return config; return config;

6
src/analyzer/protocol/ntp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_NTP { namespace Zeek_NTP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("NTP", ::analyzer::NTP::NTP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("NTP", ::analyzer::NTP::NTP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::NTP"; config.name = "Zeek::NTP";
config.description = "NTP analyzer"; config.description = "NTP analyzer";
return config; return config;

6
src/analyzer/protocol/pia/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_PIA { namespace Zeek_PIA {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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_TCP", ::analyzer::pia::PIA_TCP::Instantiate));
AddComponent(new ::analyzer::Component("PIA_UDP", ::analyzer::pia::PIA_UDP::Instantiate)); AddComponent(new ::analyzer::Component("PIA_UDP", ::analyzer::pia::PIA_UDP::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::PIA"; config.name = "Zeek::PIA";
config.description = "Analyzers implementing Dynamic Protocol"; config.description = "Analyzers implementing Dynamic Protocol";
return config; return config;

6
src/analyzer/protocol/pop3/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_POP3 { namespace Zeek_POP3 {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("POP3", ::analyzer::pop3::POP3_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("POP3", ::analyzer::pop3::POP3_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::POP3"; config.name = "Zeek::POP3";
config.description = "POP3 analyzer"; config.description = "POP3 analyzer";
return config; return config;

6
src/analyzer/protocol/radius/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_RADIUS { namespace Zeek_RADIUS {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("RADIUS", ::analyzer::RADIUS::RADIUS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("RADIUS", ::analyzer::RADIUS::RADIUS_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::RADIUS"; config.name = "Zeek::RADIUS";
config.description = "RADIUS analyzer"; config.description = "RADIUS analyzer";
return config; return config;

6
src/analyzer/protocol/rdp/Plugin.cc
View file

@ -6,14 +6,14 @@
namespace plugin { namespace plugin {
namespace Zeek_RDP { namespace Zeek_RDP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("RDP", ::analyzer::rdp::RDP_Analyzer::InstantiateAnalyzer)); AddComponent(new ::analyzer::Component("RDP", ::analyzer::rdp::RDP_Analyzer::InstantiateAnalyzer));
AddComponent(new ::analyzer::Component("RDPEUDP", ::analyzer::rdpeudp::RDP_Analyzer::InstantiateAnalyzer)); AddComponent(new ::analyzer::Component("RDPEUDP", ::analyzer::rdpeudp::RDP_Analyzer::InstantiateAnalyzer));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::RDP"; config.name = "Zeek::RDP";
config.description = "RDP analyzer"; config.description = "RDP analyzer";
return config; return config;

6
src/analyzer/protocol/rfb/Plugin.cc
View file

@ -5,14 +5,14 @@
namespace plugin { namespace plugin {
namespace Zeek_RFB { namespace Zeek_RFB {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("RFB", AddComponent(new ::analyzer::Component("RFB",
::analyzer::rfb::RFB_Analyzer::InstantiateAnalyzer)); ::analyzer::rfb::RFB_Analyzer::InstantiateAnalyzer));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::RFB"; config.name = "Zeek::RFB";
config.description = "Parser for rfb (VNC) analyzer"; config.description = "Parser for rfb (VNC) analyzer";
return config; return config;

6
src/analyzer/protocol/rpc/Plugin.cc
View file

@ -10,9 +10,9 @@
namespace plugin { namespace plugin {
namespace Zeek_RPC { namespace Zeek_RPC {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("NFS", ::analyzer::rpc::NFS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("NFS", ::analyzer::rpc::NFS_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("MOUNT", ::analyzer::rpc::MOUNT_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_RPC", nullptr));
AddComponent(new ::analyzer::Component("Contents_NFS", nullptr)); AddComponent(new ::analyzer::Component("Contents_NFS", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::RPC"; config.name = "Zeek::RPC";
config.description = "Analyzers for RPC-based protocols"; config.description = "Analyzers for RPC-based protocols";
return config; return config;

6
src/analyzer/protocol/sip/Plugin.cc
View file

@ -8,16 +8,16 @@
namespace plugin { namespace plugin {
namespace Zeek_SIP { namespace Zeek_SIP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SIP", ::analyzer::SIP::SIP_Analyzer::Instantiate)); 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. // 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)); // AddComponent(new ::analyzer::Component("SIP_TCP", ::analyzer::sip_tcp::SIP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SIP"; config.name = "Zeek::SIP";
config.description = "SIP analyzer UDP-only"; config.description = "SIP analyzer UDP-only";
return config; return config;

6
src/analyzer/protocol/smb/Plugin.cc
View file

@ -7,14 +7,14 @@
namespace plugin { namespace plugin {
namespace Zeek_SMB { namespace Zeek_SMB {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SMB", ::analyzer::smb::SMB_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("SMB", ::analyzer::smb::SMB_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("Contents_SMB", nullptr)); AddComponent(new ::analyzer::Component("Contents_SMB", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SMB"; config.name = "Zeek::SMB";
config.description = "SMB analyzer"; config.description = "SMB analyzer";
return config; return config;

6
src/analyzer/protocol/smtp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SMTP { namespace Zeek_SMTP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SMTP", ::analyzer::smtp::SMTP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("SMTP", ::analyzer::smtp::SMTP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SMTP"; config.name = "Zeek::SMTP";
config.description = "SMTP analyzer"; config.description = "SMTP analyzer";
return config; return config;

6
src/analyzer/protocol/snmp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SNMP { namespace Zeek_SNMP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SNMP", ::analyzer::snmp::SNMP_Analyzer::InstantiateAnalyzer)); AddComponent(new ::analyzer::Component("SNMP", ::analyzer::snmp::SNMP_Analyzer::InstantiateAnalyzer));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SNMP"; config.name = "Zeek::SNMP";
config.description = "SNMP analyzer"; config.description = "SNMP analyzer";
return config; return config;

6
src/analyzer/protocol/socks/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SOCKS { namespace Zeek_SOCKS {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SOCKS", ::analyzer::socks::SOCKS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("SOCKS", ::analyzer::socks::SOCKS_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SOCKS"; config.name = "Zeek::SOCKS";
config.description = "SOCKS analyzer"; config.description = "SOCKS analyzer";
return config; return config;

6
src/analyzer/protocol/ssh/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SSH { namespace Zeek_SSH {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SSH", ::analyzer::SSH::SSH_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("SSH", ::analyzer::SSH::SSH_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SSH"; config.name = "Zeek::SSH";
config.description = "Secure Shell analyzer"; config.description = "Secure Shell analyzer";
return config; return config;

6
src/analyzer/protocol/ssl/Plugin.cc
View file

@ -8,14 +8,14 @@
namespace plugin { namespace plugin {
namespace Zeek_SSL { namespace Zeek_SSL {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SSL", ::analyzer::ssl::SSL_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("SSL", ::analyzer::ssl::SSL_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("DTLS", ::analyzer::dtls::DTLS_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("DTLS", ::analyzer::dtls::DTLS_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SSL"; config.name = "Zeek::SSL";
config.description = "SSL/TLS and DTLS analyzers"; config.description = "SSL/TLS and DTLS analyzers";
return config; return config;

6
src/analyzer/protocol/stepping-stone/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SteppingStone { namespace Zeek_SteppingStone {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("SteppingStone", ::analyzer::stepping_stone::SteppingStone_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("SteppingStone", ::analyzer::stepping_stone::SteppingStone_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SteppingStone"; config.name = "Zeek::SteppingStone";
config.description = "Stepping stone analyzer"; config.description = "Stepping stone analyzer";
return config; return config;

6
src/analyzer/protocol/syslog/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Syslog { namespace Zeek_Syslog {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("Syslog", ::analyzer::syslog::Syslog_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Syslog", ::analyzer::syslog::Syslog_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Syslog"; config.name = "Zeek::Syslog";
config.description = "Syslog analyzer UDP-only"; config.description = "Syslog analyzer UDP-only";
return config; return config;

6
src/analyzer/protocol/tcp/Plugin.cc
View file

@ -7,16 +7,16 @@
namespace plugin { namespace plugin {
namespace Zeek_TCP { namespace Zeek_TCP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("TCP", ::analyzer::tcp::TCP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("TCP", ::analyzer::tcp::TCP_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("TCPStats", ::analyzer::tcp::TCPStats_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("TCPStats", ::analyzer::tcp::TCPStats_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("CONTENTLINE", nullptr)); AddComponent(new ::analyzer::Component("CONTENTLINE", nullptr));
AddComponent(new ::analyzer::Component("Contents", nullptr)); AddComponent(new ::analyzer::Component("Contents", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::TCP"; config.name = "Zeek::TCP";
config.description = "TCP analyzer"; config.description = "TCP analyzer";
return config; return config;

6
src/analyzer/protocol/teredo/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Teredo { namespace Zeek_Teredo {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("Teredo", ::analyzer::teredo::Teredo_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("Teredo", ::analyzer::teredo::Teredo_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Teredo"; config.name = "Zeek::Teredo";
config.description = "Teredo analyzer"; config.description = "Teredo analyzer";
return config; return config;

6
src/analyzer/protocol/udp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_UDP { namespace Zeek_UDP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("UDP", ::analyzer::udp::UDP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("UDP", ::analyzer::udp::UDP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::UDP"; config.name = "Zeek::UDP";
config.description = "UDP Analyzer"; config.description = "UDP Analyzer";
return config; return config;

6
src/analyzer/protocol/vxlan/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_VXLAN { namespace Zeek_VXLAN {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("VXLAN", ::analyzer::vxlan::VXLAN_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("VXLAN", ::analyzer::vxlan::VXLAN_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::VXLAN"; config.name = "Zeek::VXLAN";
config.description = "VXLAN analyzer"; config.description = "VXLAN analyzer";
return config; return config;

6
src/analyzer/protocol/xmpp/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_XMPP { namespace Zeek_XMPP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("XMPP", ::analyzer::xmpp::XMPP_Analyzer::Instantiate)); AddComponent(new ::analyzer::Component("XMPP", ::analyzer::xmpp::XMPP_Analyzer::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::XMPP"; config.name = "Zeek::XMPP";
config.description = "XMPP analyzer (StartTLS only)"; config.description = "XMPP analyzer (StartTLS only)";
return config; return config;

6
src/analyzer/protocol/zip/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_ZIP { namespace Zeek_ZIP {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::analyzer::Component("ZIP", nullptr)); AddComponent(new ::analyzer::Component("ZIP", nullptr));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::ZIP"; config.name = "Zeek::ZIP";
config.description = "Generic ZIP support analyzer"; config.description = "Generic ZIP support analyzer";
return config; return config;

6
src/file_analysis/analyzer/data_event/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_FileDataEvent { namespace Zeek_FileDataEvent {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::file_analysis::Component("DATA_EVENT", ::file_analysis::DataEvent::Instantiate)); AddComponent(new ::file_analysis::Component("DATA_EVENT", ::file_analysis::DataEvent::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::FileDataEvent"; config.name = "Zeek::FileDataEvent";
config.description = "Delivers file content"; config.description = "Delivers file content";
return config; return config;

6
src/file_analysis/analyzer/entropy/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_FileEntropy { namespace Zeek_FileEntropy {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::file_analysis::Component("ENTROPY", ::file_analysis::Entropy::Instantiate)); AddComponent(new ::file_analysis::Component("ENTROPY", ::file_analysis::Entropy::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::FileEntropy"; config.name = "Zeek::FileEntropy";
config.description = "Entropy test file content"; config.description = "Entropy test file content";
return config; return config;

6
src/file_analysis/analyzer/extract/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_FileExtract { namespace Zeek_FileExtract {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::file_analysis::Component("EXTRACT", ::file_analysis::Extract::Instantiate)); AddComponent(new ::file_analysis::Component("EXTRACT", ::file_analysis::Extract::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::FileExtract"; config.name = "Zeek::FileExtract";
config.description = "Extract file content"; config.description = "Extract file content";
return config; return config;

6
src/file_analysis/analyzer/hash/Plugin.cc
View file

@ -7,15 +7,15 @@
namespace plugin { namespace plugin {
namespace Zeek_FileHash { namespace Zeek_FileHash {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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("MD5", ::file_analysis::MD5::Instantiate));
AddComponent(new ::file_analysis::Component("SHA1", ::file_analysis::SHA1::Instantiate)); AddComponent(new ::file_analysis::Component("SHA1", ::file_analysis::SHA1::Instantiate));
AddComponent(new ::file_analysis::Component("SHA256", ::file_analysis::SHA256::Instantiate)); AddComponent(new ::file_analysis::Component("SHA256", ::file_analysis::SHA256::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::FileHash"; config.name = "Zeek::FileHash";
config.description = "Hash file content"; config.description = "Hash file content";
return config; return config;

6
src/file_analysis/analyzer/pe/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_PE { namespace Zeek_PE {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::file_analysis::Component("PE", ::file_analysis::PE::Instantiate)); AddComponent(new ::file_analysis::Component("PE", ::file_analysis::PE::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::PE"; config.name = "Zeek::PE";
config.description = "Portable Executable analyzer"; config.description = "Portable Executable analyzer";
return config; return config;

6
src/file_analysis/analyzer/unified2/Plugin.cc
View file

@ -9,13 +9,13 @@
namespace plugin { namespace plugin {
namespace Zeek_Unified2 { namespace Zeek_Unified2 {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::file_analysis::Component("UNIFIED2", ::file_analysis::Unified2::Instantiate)); AddComponent(new ::file_analysis::Component("UNIFIED2", ::file_analysis::Unified2::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Unified2"; config.name = "Zeek::Unified2";
config.description = "Analyze Unified2 alert files."; config.description = "Analyze Unified2 alert files.";
return config; return config;

8
src/file_analysis/analyzer/x509/Plugin.cc
View file

@ -8,15 +8,15 @@
namespace plugin { namespace plugin {
namespace Zeek_X509 { namespace Zeek_X509 {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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("X509", ::file_analysis::X509::Instantiate));
AddComponent(new ::file_analysis::Component("OCSP_REQUEST", ::file_analysis::OCSP::InstantiateRequest)); AddComponent(new ::file_analysis::Component("OCSP_REQUEST", ::file_analysis::OCSP::InstantiateRequest));
AddComponent(new ::file_analysis::Component("OCSP_REPLY", ::file_analysis::OCSP::InstantiateReply)); AddComponent(new ::file_analysis::Component("OCSP_REPLY", ::file_analysis::OCSP::InstantiateReply));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::X509"; config.name = "Zeek::X509";
config.description = "X509 and OCSP analyzer"; config.description = "X509 and OCSP analyzer";
return config; return config;
@ -24,7 +24,7 @@ public:
void Done() override void Done() override
{ {
plugin::Plugin::Done(); zeek::plugin::Plugin::Done();
::file_analysis::X509::FreeRootStore(); ::file_analysis::X509::FreeRootStore();
} }
} plugin; } plugin;

6
src/input/readers/ascii/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_AsciiReader { namespace Zeek_AsciiReader {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::input::Component("Ascii", ::input::reader::Ascii::Instantiate)); AddComponent(new ::input::Component("Ascii", ::input::reader::Ascii::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::AsciiReader"; config.name = "Zeek::AsciiReader";
config.description = "ASCII input reader"; config.description = "ASCII input reader";
return config; return config;

6
src/input/readers/benchmark/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_BenchmarkReader { namespace Zeek_BenchmarkReader {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::input::Component("Benchmark", ::input::reader::Benchmark::Instantiate)); AddComponent(new ::input::Component("Benchmark", ::input::reader::Benchmark::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::BenchmarkReader"; config.name = "Zeek::BenchmarkReader";
config.description = "Benchmark input reader"; config.description = "Benchmark input reader";
return config; return config;

6
src/input/readers/binary/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_BinaryReader { namespace Zeek_BinaryReader {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::input::Component("Binary", ::input::reader::Binary::Instantiate)); AddComponent(new ::input::Component("Binary", ::input::reader::Binary::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::BinaryReader"; config.name = "Zeek::BinaryReader";
config.description = "Binary input reader"; config.description = "Binary input reader";
return config; return config;

6
src/input/readers/config/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_ConfigReader { namespace Zeek_ConfigReader {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::input::Component("Config", ::input::reader::Config::Instantiate)); AddComponent(new ::input::Component("Config", ::input::reader::Config::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::ConfigReader"; config.name = "Zeek::ConfigReader";
config.description = "Configuration file input reader"; config.description = "Configuration file input reader";
return config; return config;

4
src/input/readers/raw/Plugin.cc
View file

@ -10,11 +10,11 @@ Plugin::Plugin()
{ {
} }
plugin::Configuration Plugin::Configure() zeek::plugin::Configuration Plugin::Configure()
{ {
AddComponent(new ::input::Component("Raw", ::input::reader::Raw::Instantiate)); AddComponent(new ::input::Component("Raw", ::input::reader::Raw::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::RawReader"; config.name = "Zeek::RawReader";
config.description = "Raw input reader"; config.description = "Raw input reader";
return config; return config;

4
src/input/readers/raw/Plugin.h
View file

@ -11,11 +11,11 @@
namespace plugin { namespace plugin {
namespace Zeek_RawReader { namespace Zeek_RawReader {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
Plugin(); Plugin();
plugin::Configuration Configure() override; zeek::plugin::Configuration Configure() override;
void InitPreScript() override; void InitPreScript() override;
void Done() override; void Done() override;

6
src/input/readers/sqlite/Plugin.cc
View file

@ -7,13 +7,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SQLiteReader { namespace Zeek_SQLiteReader {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::input::Component("SQLite", ::input::reader::SQLite::Instantiate)); AddComponent(new ::input::Component("SQLite", ::input::reader::SQLite::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SQLiteReader"; config.name = "Zeek::SQLiteReader";
config.description = "SQLite input reader"; config.description = "SQLite input reader";
return config; return config;

6
src/iosource/pcap/Plugin.cc
View file

@ -8,14 +8,14 @@
namespace plugin { namespace plugin {
namespace Zeek_Pcap { namespace Zeek_Pcap {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: 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::PktSrcComponent("PcapReader", "pcap", ::iosource::PktSrcComponent::BOTH, ::iosource::pcap::PcapSource::Instantiate));
AddComponent(new ::iosource::PktDumperComponent("PcapWriter", "pcap", ::iosource::pcap::PcapDumper::Instantiate)); AddComponent(new ::iosource::PktDumperComponent("PcapWriter", "pcap", ::iosource::pcap::PcapDumper::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::Pcap"; config.name = "Zeek::Pcap";
config.description = "Packet acquisition via libpcap"; config.description = "Packet acquisition via libpcap";
return config; return config;

6
src/logging/writers/ascii/Plugin.cc
View file

@ -8,13 +8,13 @@
namespace plugin { namespace plugin {
namespace Zeek_AsciiWriter { namespace Zeek_AsciiWriter {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::logging::Component("Ascii", ::logging::writer::Ascii::Instantiate)); AddComponent(new ::logging::Component("Ascii", ::logging::writer::Ascii::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::AsciiWriter"; config.name = "Zeek::AsciiWriter";
config.description = "ASCII log writer"; config.description = "ASCII log writer";
return config; return config;

6
src/logging/writers/none/Plugin.cc
View file

@ -8,13 +8,13 @@
namespace plugin { namespace plugin {
namespace Zeek_NoneWriter { namespace Zeek_NoneWriter {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::logging::Component("None", ::logging::writer::None::Instantiate)); AddComponent(new ::logging::Component("None", ::logging::writer::None::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::NoneWriter"; config.name = "Zeek::NoneWriter";
config.description = "None log writer (primarily for debugging)"; config.description = "None log writer (primarily for debugging)";
return config; return config;

6
src/logging/writers/sqlite/Plugin.cc
View file

@ -8,13 +8,13 @@
namespace plugin { namespace plugin {
namespace Zeek_SQLiteWriter { namespace Zeek_SQLiteWriter {
class Plugin : public plugin::Plugin { class Plugin : public zeek::plugin::Plugin {
public: public:
plugin::Configuration Configure() override zeek::plugin::Configuration Configure() override
{ {
AddComponent(new ::logging::Component("SQLite", ::logging::writer::SQLite::Instantiate)); AddComponent(new ::logging::Component("SQLite", ::logging::writer::SQLite::Instantiate));
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Zeek::SQLiteWriter"; config.name = "Zeek::SQLiteWriter";
config.description = "SQLite log writer"; config.description = "SQLite log writer";
return config; return config;

12
src/plugin/Plugin.h
View file

@ -957,10 +957,10 @@ private:
} }
namespace plugin { namespace plugin {
using VersionNumber = zeek::plugin::VersionNumber; using VersionNumber [[deprecated("Remove in v4.1. Use zeek::plugin::VersionNumber instead")]] = zeek::plugin::VersionNumber;
using Configuration = zeek::plugin::Configuration; using Configuration [[deprecated("Remove in v4.1. Use zeek::plugin::Configuration instead")]] = zeek::plugin::Configuration;
using BifItem = zeek::plugin::BifItem; using BifItem [[deprecated("Remove in v4.1. Use zeek::plugin::BifItem instead")]] = zeek::plugin::BifItem;
using HookArgument = zeek::plugin::HookArgument; using HookArgument [[deprecated("Remove in v4.1. Use zeek::plugin::HookArgument instead")]] = zeek::plugin::HookArgument;
using HookArgumentList = zeek::plugin::HookArgumentList; using HookArgumentList [[deprecated("Remove in v4.1. Use zeek::plugin::HookArgumentList instead")]] = zeek::plugin::HookArgumentList;
using Plugin = zeek::plugin::Plugin; using Plugin [[deprecated("Remove in v4.1. Use zeek::plugin::Plugin instead")]] = zeek::plugin::Plugin;
} }

6
testing/btest/plugins/func-hook-plugin/src/Plugin.cc
View file

@ -61,7 +61,7 @@ std::pair<bool, IntrusivePtr<Val>> Plugin::HookFunctionCall(const Func* func,
return {}; return {};
} }
void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args)
{ {
ODesc d; ODesc d;
d.SetShort(); d.SetShort();
@ -70,7 +70,9 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args)
hook_name(hook), d.Description()); 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; ODesc d1;
d1.SetShort(); d1.SetShort();

9
testing/btest/plugins/func-hook-plugin/src/Plugin.h
View file

@ -6,7 +6,7 @@
namespace plugin { namespace plugin {
namespace Demo_Hooks { namespace Demo_Hooks {
class Plugin : public ::plugin::Plugin class Plugin : public zeek::plugin::Plugin
{ {
protected: protected:
@ -14,8 +14,11 @@ protected:
Frame* frame, Frame* frame,
zeek::Args* args) override; zeek::Args* args) override;
void MetaHookPre(HookType hook, const HookArgumentList& args) override; void MetaHookPre(zeek::plugin::HookType hook,
void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) override; 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. // Overridden from plugin::Plugin.
plugin::Configuration Configure() override; plugin::Configuration Configure() override;

40
testing/btest/plugins/hooks-plugin/src/Plugin.cc
View file

@ -11,21 +11,21 @@ namespace plugin { namespace Demo_Hooks { Plugin plugin; } }
using namespace plugin::Demo_Hooks; using namespace plugin::Demo_Hooks;
plugin::Configuration Plugin::Configure() zeek::plugin::Configuration Plugin::Configure()
{ {
EnableHook(HOOK_LOAD_FILE); EnableHook(zeek::plugin::HOOK_LOAD_FILE);
EnableHook(HOOK_CALL_FUNCTION); EnableHook(zeek::plugin::HOOK_CALL_FUNCTION);
EnableHook(HOOK_QUEUE_EVENT); EnableHook(zeek::plugin::HOOK_QUEUE_EVENT);
EnableHook(HOOK_DRAIN_EVENTS); EnableHook(zeek::plugin::HOOK_DRAIN_EVENTS);
EnableHook(HOOK_UPDATE_NETWORK_TIME); EnableHook(zeek::plugin::HOOK_UPDATE_NETWORK_TIME);
EnableHook(META_HOOK_PRE); EnableHook(zeek::plugin::META_HOOK_PRE);
EnableHook(META_HOOK_POST); EnableHook(zeek::plugin::META_HOOK_POST);
EnableHook(HOOK_BRO_OBJ_DTOR); EnableHook(zeek::plugin::HOOK_BRO_OBJ_DTOR);
EnableHook(HOOK_SETUP_ANALYZER_TREE); EnableHook(zeek::plugin::HOOK_SETUP_ANALYZER_TREE);
EnableHook(HOOK_LOG_INIT); EnableHook(zeek::plugin::HOOK_LOG_INIT);
EnableHook(HOOK_LOG_WRITE); EnableHook(zeek::plugin::HOOK_LOG_WRITE);
plugin::Configuration config; zeek::plugin::Configuration config;
config.name = "Demo::Hooks"; config.name = "Demo::Hooks";
config.description = "Exercises all plugin hooks"; config.description = "Exercises all plugin hooks";
config.version.major = 1; config.version.major = 1;
@ -34,11 +34,11 @@ plugin::Configuration Plugin::Configure()
return config; 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; 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 ) if ( ! first )
d->Add(", "); d->Add(", ");
@ -59,8 +59,8 @@ std::pair<bool, Val*> Plugin::HookCallFunction(const Func* func, Frame* frame, v
{ {
ODesc d; ODesc d;
d.SetShort(); d.SetShort();
HookArgument(func).Describe(&d); zeek::plugin::HookArgument(func).Describe(&d);
HookArgument(args).Describe(&d); zeek::plugin::HookArgument(args).Describe(&d);
fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookCallFunction", fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookCallFunction",
d.Description()); d.Description());
@ -71,7 +71,7 @@ bool Plugin::HookQueueEvent(Event* event)
{ {
ODesc d; ODesc d;
d.SetShort(); d.SetShort();
HookArgument(event).Describe(&d); zeek::plugin::HookArgument(event).Describe(&d);
fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookQueueEvent", fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookQueueEvent",
d.Description()); d.Description());
@ -105,7 +105,7 @@ void Plugin::HookBroObjDtor(void* obj)
fprintf(stderr, "%.6f %-15s\n", ::network_time, "| HookBroObjDtor"); 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; ODesc d;
d.SetShort(); d.SetShort();
@ -114,7 +114,7 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args)
hook_name(hook), d.Description()); 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; ODesc d1;
d1.SetShort(); d1.SetShort();

10
testing/btest/plugins/hooks-plugin/src/Plugin.h
View file

@ -6,7 +6,7 @@
namespace plugin { namespace plugin {
namespace Demo_Hooks { namespace Demo_Hooks {
class Plugin : public ::plugin::Plugin class Plugin : public zeek::plugin::Plugin
{ {
protected: protected:
int HookLoadFile(const LoadType type, const std::string& file, const std::string& resolved) override; 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; 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; 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 HookSetupAnalyzerTree(Connection *conn) override;
void MetaHookPre(HookType hook, const HookArgumentList& args) override; void MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args) override;
void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) 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; void RenderVal(const threading::Value* val, ODesc &d) const;
// Overridden from plugin::Plugin. // Overridden from zeek::plugin::Plugin.
plugin::Configuration Configure() override; zeek::plugin::Configuration Configure() override;
}; };
extern Plugin plugin; extern Plugin plugin;

5
testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.cc
View file

@ -80,7 +80,7 @@ std::pair<bool, Val*> Plugin::HookCallFunction(const Func* func, Frame* frame, v
/* return {}; */ /* return {}; */
/* } */ /* } */
void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args) void Plugin::MetaHookPre(zeek::plugin::HookType hook, const zeek::plugin::HookArgumentList& args)
{ {
ODesc d; ODesc d;
d.SetShort(); d.SetShort();
@ -89,7 +89,8 @@ void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args)
hook_name(hook), d.Description()); 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; ODesc d1;
d1.SetShort(); d1.SetShort();

9
testing/btest/plugins/legacy-func-hook-plugin/src/Plugin.h
View file

@ -6,7 +6,7 @@
namespace plugin { namespace plugin {
namespace Demo_Hooks { namespace Demo_Hooks {
class Plugin : public ::plugin::Plugin class Plugin : public zeek::plugin::Plugin
{ {
protected: protected:
std::pair<bool, Val*> HookCallFunction(const Func* func, Frame* frame, val_list* args) override; std::pair<bool, Val*> HookCallFunction(const Func* func, Frame* frame, val_list* args) override;
@ -15,8 +15,11 @@ protected:
/* Frame* frame, */ /* Frame* frame, */
/* zeek::Args* args) override; */ /* zeek::Args* args) override; */
void MetaHookPre(HookType hook, const HookArgumentList& args) override; void MetaHookPre(zeek::plugin::HookType hook,
void MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result) override; 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. // Overridden from plugin::Plugin.
plugin::Configuration Configure() override; plugin::Configuration Configure() override;