mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Reformat Zeek in Spicy style
This largely copies over Spicy's `.clang-format` configuration file. The one place where we deviate is header include order since Zeek depends on headers being included in a certain order.
This commit is contained in:
Benjamin Bannier
parent
7b8e7ed72c
commit
f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
|
|
@ -8,49 +8,38 @@
|
|||
|
||||
using namespace btest::plugin::Demo_Foo;
|
||||
|
||||
Foo::Foo(zeek::Connection* conn) : zeek::analyzer::tcp::TCP_ApplicationAnalyzer("Foo", conn)
|
||||
{
|
||||
interp = new binpac::Foo::Foo_Conn(this);
|
||||
}
|
||||
Foo::Foo(zeek::Connection* conn) : zeek::analyzer::tcp::TCP_ApplicationAnalyzer("Foo", conn) {
|
||||
interp = new binpac::Foo::Foo_Conn(this);
|
||||
}
|
||||
|
||||
Foo::~Foo()
|
||||
{
|
||||
delete interp;
|
||||
}
|
||||
Foo::~Foo() { delete interp; }
|
||||
|
||||
void Foo::Done()
|
||||
{
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::Done();
|
||||
void Foo::Done() {
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::Done();
|
||||
|
||||
interp->FlowEOF(true);
|
||||
interp->FlowEOF(false);
|
||||
}
|
||||
interp->FlowEOF(true);
|
||||
interp->FlowEOF(false);
|
||||
}
|
||||
|
||||
void Foo::EndpointEOF(bool is_orig)
|
||||
{
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::EndpointEOF(is_orig);
|
||||
interp->FlowEOF(is_orig);
|
||||
}
|
||||
void Foo::EndpointEOF(bool is_orig) {
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::EndpointEOF(is_orig);
|
||||
interp->FlowEOF(is_orig);
|
||||
}
|
||||
|
||||
void Foo::DeliverStream(int len, const u_char* data, bool orig)
|
||||
{
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::DeliverStream(len, data, orig);
|
||||
void Foo::DeliverStream(int len, const u_char* data, bool orig) {
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::DeliverStream(len, data, orig);
|
||||
|
||||
if ( TCP() && TCP()->IsPartial() )
|
||||
return;
|
||||
if ( TCP() && TCP()->IsPartial() )
|
||||
return;
|
||||
|
||||
try
|
||||
{
|
||||
interp->NewData(orig, data, data + len);
|
||||
}
|
||||
catch ( const binpac::Exception& e )
|
||||
{
|
||||
AnalyzerViolation(zeek::util::fmt("Binpac exception: %s", e.c_msg()));
|
||||
}
|
||||
}
|
||||
try {
|
||||
interp->NewData(orig, data, data + len);
|
||||
} catch ( const binpac::Exception& e ) {
|
||||
AnalyzerViolation(zeek::util::fmt("Binpac exception: %s", e.c_msg()));
|
||||
}
|
||||
}
|
||||
|
||||
void Foo::Undelivered(uint64_t seq, int len, bool orig)
|
||||
{
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::Undelivered(seq, len, orig);
|
||||
interp->NewGap(orig, len);
|
||||
}
|
||||
void Foo::Undelivered(uint64_t seq, int len, bool orig) {
|
||||
zeek::analyzer::tcp::TCP_ApplicationAnalyzer::Undelivered(seq, len, orig);
|
||||
interp->NewGap(orig, len);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,32 +4,28 @@
|
|||
#include "analyzer/protocol/pia/PIA.h"
|
||||
#include "analyzer/protocol/tcp/TCP.h"
|
||||
|
||||
namespace binpac
|
||||
{
|
||||
namespace Foo
|
||||
{
|
||||
namespace binpac {
|
||||
namespace Foo {
|
||||
class Foo_Conn;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace binpac
|
||||
|
||||
namespace btest::plugin::Demo_Foo
|
||||
{
|
||||
namespace btest::plugin::Demo_Foo {
|
||||
|
||||
class Foo : public zeek::analyzer::tcp::TCP_ApplicationAnalyzer
|
||||
{
|
||||
class Foo : public zeek::analyzer::tcp::TCP_ApplicationAnalyzer {
|
||||
public:
|
||||
Foo(zeek::Connection* conn);
|
||||
~Foo();
|
||||
Foo(zeek::Connection* conn);
|
||||
~Foo();
|
||||
|
||||
virtual void Done();
|
||||
virtual void DeliverStream(int len, const u_char* data, bool orig);
|
||||
virtual void Undelivered(uint64_t seq, int len, bool orig);
|
||||
virtual void EndpointEOF(bool is_orig);
|
||||
virtual void Done();
|
||||
virtual void DeliverStream(int len, const u_char* data, bool orig);
|
||||
virtual void Undelivered(uint64_t seq, int len, bool orig);
|
||||
virtual void EndpointEOF(bool is_orig);
|
||||
|
||||
static zeek::analyzer::Analyzer* Instantiate(zeek::Connection* conn) { return new Foo(conn); }
|
||||
static zeek::analyzer::Analyzer* Instantiate(zeek::Connection* conn) { return new Foo(conn); }
|
||||
|
||||
protected:
|
||||
binpac::Foo::Foo_Conn* interp;
|
||||
};
|
||||
binpac::Foo::Foo_Conn* interp;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace btest::plugin::Demo_Foo
|
||||
|
|
|
|||
|
|
@ -5,32 +5,28 @@
|
|||
#include "analyzer/Component.h"
|
||||
#include "analyzer/Manager.h"
|
||||
|
||||
namespace btest::plugin::Demo_Foo
|
||||
{
|
||||
namespace btest::plugin::Demo_Foo {
|
||||
Plugin plugin;
|
||||
}
|
||||
}
|
||||
|
||||
using namespace btest::plugin::Demo_Foo;
|
||||
|
||||
zeek::plugin::Configuration Plugin::Configure()
|
||||
{
|
||||
AddComponent(
|
||||
new zeek::analyzer::Component("Foo", btest::plugin::Demo_Foo::Foo::Instantiate, 1));
|
||||
zeek::plugin::Configuration Plugin::Configure() {
|
||||
AddComponent(new zeek::analyzer::Component("Foo", btest::plugin::Demo_Foo::Foo::Instantiate, 1));
|
||||
|
||||
zeek::plugin::Configuration config;
|
||||
config.name = "Demo::Foo";
|
||||
config.description = "A Foo test analyzer";
|
||||
config.version.major = 1;
|
||||
config.version.minor = 0;
|
||||
config.version.patch = 0;
|
||||
return config;
|
||||
}
|
||||
zeek::plugin::Configuration config;
|
||||
config.name = "Demo::Foo";
|
||||
config.description = "A Foo test analyzer";
|
||||
config.version.major = 1;
|
||||
config.version.minor = 0;
|
||||
config.version.patch = 0;
|
||||
return config;
|
||||
}
|
||||
|
||||
void Plugin::InitPostScript()
|
||||
{
|
||||
auto tag = ::zeek::analyzer_mgr->GetAnalyzerTag("Foo");
|
||||
if ( ! tag )
|
||||
::zeek::reporter->FatalError("cannot get analyzer Tag");
|
||||
void Plugin::InitPostScript() {
|
||||
auto tag = ::zeek::analyzer_mgr->GetAnalyzerTag("Foo");
|
||||
if ( ! tag )
|
||||
::zeek::reporter->FatalError("cannot get analyzer Tag");
|
||||
|
||||
zeek::analyzer_mgr->RegisterAnalyzerForPort(tag, TransportProto::TRANSPORT_TCP, 4243);
|
||||
}
|
||||
zeek::analyzer_mgr->RegisterAnalyzerForPort(tag, TransportProto::TRANSPORT_TCP, 4243);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,16 @@
|
|||
|
||||
#include <zeek/plugin/Plugin.h>
|
||||
|
||||
namespace btest::plugin::Demo_Foo
|
||||
{
|
||||
namespace btest::plugin::Demo_Foo {
|
||||
|
||||
class Plugin : public zeek::plugin::Plugin
|
||||
{
|
||||
class Plugin : public zeek::plugin::Plugin {
|
||||
protected:
|
||||
// Overridden from zeek::plugin::Plugin.
|
||||
zeek::plugin::Configuration Configure() override;
|
||||
// Overridden from zeek::plugin::Plugin.
|
||||
zeek::plugin::Configuration Configure() override;
|
||||
|
||||
void InitPostScript() override;
|
||||
};
|
||||
void InitPostScript() override;
|
||||
};
|
||||
|
||||
extern Plugin plugin;
|
||||
|
||||
}
|
||||
} // namespace btest::plugin::Demo_Foo
|
||||
|
|
|
|||
|
|
@ -1,34 +1,25 @@
|
|||
#include "Plugin.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
extern "C" {
|
||||
#include <Python.h>
|
||||
}
|
||||
}
|
||||
|
||||
namespace zeek::plugin::Zeek_PyLib
|
||||
{
|
||||
namespace zeek::plugin::Zeek_PyLib {
|
||||
Plugin plugin;
|
||||
}
|
||||
}
|
||||
|
||||
using namespace zeek::plugin::Zeek_PyLib;
|
||||
|
||||
zeek::plugin::Configuration Plugin::Configure()
|
||||
{
|
||||
zeek::plugin::Configuration config;
|
||||
config.name = "Zeek::PyLib";
|
||||
config.description = "Plugin embedding Python, whoosh.";
|
||||
config.version.major = 0;
|
||||
config.version.minor = 0;
|
||||
config.version.patch = 1;
|
||||
return config;
|
||||
}
|
||||
zeek::plugin::Configuration Plugin::Configure() {
|
||||
zeek::plugin::Configuration config;
|
||||
config.name = "Zeek::PyLib";
|
||||
config.description = "Plugin embedding Python, whoosh.";
|
||||
config.version.major = 0;
|
||||
config.version.minor = 0;
|
||||
config.version.patch = 1;
|
||||
return config;
|
||||
}
|
||||
|
||||
void Plugin::InitPostScript()
|
||||
{
|
||||
Py_Initialize();
|
||||
}
|
||||
void Plugin::InitPostScript() { Py_Initialize(); }
|
||||
|
||||
void Plugin::Done()
|
||||
{
|
||||
Py_FinalizeEx();
|
||||
}
|
||||
void Plugin::Done() { Py_FinalizeEx(); }
|
||||
|
|
|
|||
|
|
@ -2,20 +2,17 @@
|
|||
|
||||
#include <zeek/plugin/Plugin.h>
|
||||
|
||||
namespace zeek::plugin
|
||||
{
|
||||
namespace Zeek_PyLib
|
||||
{
|
||||
namespace zeek::plugin {
|
||||
namespace Zeek_PyLib {
|
||||
|
||||
class Plugin : public zeek::plugin::Plugin
|
||||
{
|
||||
class Plugin : public zeek::plugin::Plugin {
|
||||
protected:
|
||||
zeek::plugin::Configuration Configure() override;
|
||||
void InitPostScript() override;
|
||||
void Done() override;
|
||||
};
|
||||
zeek::plugin::Configuration Configure() override;
|
||||
void InitPostScript() override;
|
||||
void Done() override;
|
||||
};
|
||||
|
||||
extern Plugin plugin;
|
||||
|
||||
}
|
||||
}
|
||||
} // namespace Zeek_PyLib
|
||||
} // namespace zeek::plugin
|
||||
|
|
|
|||
|
|
@ -4,28 +4,25 @@
|
|||
#include <zeek/Reporter.h>
|
||||
#include <zeek/zeek-config.h>
|
||||
|
||||
namespace btest::plugin::Demo_Version
|
||||
{
|
||||
namespace btest::plugin::Demo_Version {
|
||||
Plugin plugin;
|
||||
}
|
||||
}
|
||||
|
||||
using namespace btest::plugin::Demo_Version;
|
||||
|
||||
zeek::plugin::Configuration Plugin::Configure()
|
||||
{
|
||||
zeek::plugin::Configuration config;
|
||||
config.name = "Demo::Version";
|
||||
config.description = "Tries to use ZEEK_VERSION_NUMBER";
|
||||
config.version.major = 1;
|
||||
config.version.minor = 0;
|
||||
config.version.patch = 0;
|
||||
return config;
|
||||
}
|
||||
zeek::plugin::Configuration Plugin::Configure() {
|
||||
zeek::plugin::Configuration config;
|
||||
config.name = "Demo::Version";
|
||||
config.description = "Tries to use ZEEK_VERSION_NUMBER";
|
||||
config.version.major = 1;
|
||||
config.version.minor = 0;
|
||||
config.version.patch = 0;
|
||||
return config;
|
||||
}
|
||||
|
||||
void Plugin::InitPostScript()
|
||||
{
|
||||
void Plugin::InitPostScript() {
|
||||
#ifndef ZEEK_VERSION_NUMBER
|
||||
#error "ZEEK_VERSION_NUMBER is not defined"
|
||||
#endif
|
||||
zeek::reporter->Info("All good ZEEK_VERSION_NUMBER=%d\n", ZEEK_VERSION_NUMBER);
|
||||
}
|
||||
zeek::reporter->Info("All good ZEEK_VERSION_NUMBER=%d\n", ZEEK_VERSION_NUMBER);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,16 @@
|
|||
|
||||
#include <zeek/plugin/Plugin.h>
|
||||
|
||||
namespace btest::plugin::Demo_Version
|
||||
{
|
||||
namespace btest::plugin::Demo_Version {
|
||||
|
||||
class Plugin : public zeek::plugin::Plugin
|
||||
{
|
||||
class Plugin : public zeek::plugin::Plugin {
|
||||
protected:
|
||||
// Overridden from zeek::plugin::Plugin.
|
||||
zeek::plugin::Configuration Configure() override;
|
||||
// Overridden from zeek::plugin::Plugin.
|
||||
zeek::plugin::Configuration Configure() override;
|
||||
|
||||
void InitPostScript() override;
|
||||
};
|
||||
void InitPostScript() override;
|
||||
};
|
||||
|
||||
extern Plugin plugin;
|
||||
|
||||
}
|
||||
} // namespace btest::plugin::Demo_Version
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue