Make the plugin structure more... legal.

This commit is contained in:
Johanna Amann 2015-03-18 11:15:18 -07:00
parent 88beb31270
commit 90bc5add6e
3 changed files with 4 additions and 32 deletions

View file

@ -4,13 +4,9 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Bro SSL)
bro_plugin_cc(SSL.cc Plugin_SSL.cc)
bro_plugin_cc(SSL.cc DTLS.cc Plugin.cc)
bro_plugin_bif(events.bif)
bro_plugin_pac(tls-handshake.pac tls-handshake-protocol.pac tls-handshake-analyzer.pac ssl-defs.pac)
bro_plugin_pac(ssl.pac ssl-dtls-analyzer.pac ssl-analyzer.pac ssl-dtls-protocol.pac ssl-protocol.pac ssl-defs.pac)
bro_plugin_end()
bro_plugin_begin(Bro DTLS)
bro_plugin_cc(DTLS.cc Plugin_DTLS.cc)
bro_plugin_pac(dtls.pac ssl-dtls-analyzer.pac dtls-analyzer.pac ssl-dtls-protocol.pac dtls-protocol.pac ssl-defs.pac)
bro_plugin_end()

View file

@ -4,6 +4,7 @@
#include "plugin/Plugin.h"
#include "SSL.h"
#include "DTLS.h"
namespace plugin {
namespace Bro_SSL {
@ -13,10 +14,11 @@ public:
plugin::Configuration Configure()
{
AddComponent(new ::analyzer::Component("SSL", ::analyzer::ssl::SSL_Analyzer::Instantiate));
AddComponent(new ::analyzer::Component("DTLS", ::analyzer::dtls::DTLS_Analyzer::Instantiate));
plugin::Configuration config;
config.name = "Bro::SSL";
config.description = "SSL analyzer";
config.description = "SSL/TLS and DTLS analyzer";
return config;
}
} plugin;

View file

@ -1,26 +0,0 @@
// See the file in the main distribution directory for copyright.
#include "plugin/Plugin.h"
#include "DTLS.h"
namespace plugin {
namespace Bro_DTLS {
class Plugin : public plugin::Plugin {
public:
plugin::Configuration Configure()
{
AddComponent(new ::analyzer::Component("DTLS", ::analyzer::dtls::DTLS_Analyzer::Instantiate));
plugin::Configuration config;
config.name = "Bro::DTLS";
config.description = "DTLS analyzer";
return config;
}
} plugin;
}
}