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 2023-10-10 21:13:34 +02:00
parent 7b8e7ed72c
commit f5a76c1aed
786 changed files with 131714 additions and 153609 deletions

View file

@ -3,26 +3,23 @@
#include "RawLayer.h"
#include "packet_analysis/Component.h"
namespace zeek::plugin::PacketDemo_Bar
{
namespace zeek::plugin::PacketDemo_Bar {
class Plugin : public zeek::plugin::Plugin
{
class Plugin : public zeek::plugin::Plugin {
public:
zeek::plugin::Configuration Configure()
{
AddComponent(new zeek::packet_analysis::Component(
"Raw_Layer", zeek::packet_analysis::PacketDemo::RawLayer::Instantiate));
zeek::plugin::Configuration Configure() {
AddComponent(new zeek::packet_analysis::Component("Raw_Layer",
zeek::packet_analysis::PacketDemo::RawLayer::Instantiate));
zeek::plugin::Configuration config;
config.name = "PacketDemo::Bar";
config.description = "Demo packet analyzers (RawLayer).";
config.version.major = 1;
config.version.minor = 0;
config.version.patch = 0;
return config;
}
zeek::plugin::Configuration config;
config.name = "PacketDemo::Bar";
config.description = "Demo packet analyzers (RawLayer).";
config.version.major = 1;
config.version.minor = 0;
config.version.patch = 0;
return config;
}
} plugin;
} plugin;
}
} // namespace zeek::plugin::PacketDemo_Bar

View file

@ -8,22 +8,19 @@
using namespace zeek::packet_analysis::PacketDemo;
RawLayer::RawLayer() : zeek::packet_analysis::Analyzer("Raw_Layer") { }
RawLayer::RawLayer() : zeek::packet_analysis::Analyzer("Raw_Layer") {}
bool RawLayer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet)
{
constexpr auto layer_size = 21;
if ( layer_size >= len )
{
session_mgr->Weird("truncated_raw_layer", packet);
return false;
}
bool RawLayer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet) {
constexpr auto layer_size = 21;
if ( layer_size >= len ) {
session_mgr->Weird("truncated_raw_layer", packet);
return false;
}
uint16_t protocol = ntohs(*((const uint16_t*)(data + layer_size - 2)));
uint16_t protocol = ntohs(*((const uint16_t*)(data + layer_size - 2)));
event_mgr.Enqueue(raw_layer_message,
make_intrusive<StringVal>(layer_size, reinterpret_cast<const char*>(data)),
val_mgr->Count(protocol));
event_mgr.Enqueue(raw_layer_message, make_intrusive<StringVal>(layer_size, reinterpret_cast<const char*>(data)),
val_mgr->Count(protocol));
return ForwardPacket(len - layer_size, data + layer_size, packet, protocol);
}
return ForwardPacket(len - layer_size, data + layer_size, packet, protocol);
}

View file

@ -3,18 +3,16 @@
#include "zeek/packet_analysis/Analyzer.h"
#include "zeek/packet_analysis/Component.h"
namespace zeek::packet_analysis::PacketDemo
{
namespace zeek::packet_analysis::PacketDemo {
class RawLayer : public Analyzer
{
class RawLayer : public Analyzer {
public:
RawLayer();
~RawLayer() override = default;
RawLayer();
~RawLayer() override = default;
bool AnalyzePacket(size_t len, const uint8_t* data, Packet* packet) override;
bool AnalyzePacket(size_t len, const uint8_t* data, Packet* packet) override;
static AnalyzerPtr Instantiate() { return std::make_shared<RawLayer>(); }
};
static AnalyzerPtr Instantiate() { return std::make_shared<RawLayer>(); }
};
}
} // namespace zeek::packet_analysis::PacketDemo