mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +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
|
|
@ -3,206 +3,168 @@
|
|||
#include "zeek/Reporter.h"
|
||||
#include "zeek/Val.h"
|
||||
|
||||
namespace zeek::detail
|
||||
{
|
||||
namespace zeek::detail {
|
||||
|
||||
prefix_t* PrefixTable::MakePrefix(const IPAddr& addr, int width)
|
||||
{
|
||||
prefix_t* prefix = (prefix_t*)util::safe_malloc(sizeof(prefix_t));
|
||||
prefix_t* PrefixTable::MakePrefix(const IPAddr& addr, int width) {
|
||||
prefix_t* prefix = (prefix_t*)util::safe_malloc(sizeof(prefix_t));
|
||||
|
||||
addr.CopyIPv6(&prefix->add.sin6);
|
||||
prefix->family = AF_INET6;
|
||||
prefix->bitlen = width;
|
||||
prefix->ref_count = 1;
|
||||
addr.CopyIPv6(&prefix->add.sin6);
|
||||
prefix->family = AF_INET6;
|
||||
prefix->bitlen = width;
|
||||
prefix->ref_count = 1;
|
||||
|
||||
return prefix;
|
||||
}
|
||||
return prefix;
|
||||
}
|
||||
|
||||
IPPrefix PrefixTable::PrefixToIPPrefix(prefix_t* prefix)
|
||||
{
|
||||
return IPPrefix(
|
||||
IPAddr(IPv6, reinterpret_cast<const uint32_t*>(&prefix->add.sin6), IPAddr::Network),
|
||||
prefix->bitlen, true);
|
||||
}
|
||||
IPPrefix PrefixTable::PrefixToIPPrefix(prefix_t* prefix) {
|
||||
return IPPrefix(IPAddr(IPv6, reinterpret_cast<const uint32_t*>(&prefix->add.sin6), IPAddr::Network), prefix->bitlen,
|
||||
true);
|
||||
}
|
||||
|
||||
void* PrefixTable::Insert(const IPAddr& addr, int width, void* data)
|
||||
{
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
patricia_node_t* node = patricia_lookup(tree, prefix);
|
||||
Deref_Prefix(prefix);
|
||||
void* PrefixTable::Insert(const IPAddr& addr, int width, void* data) {
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
patricia_node_t* node = patricia_lookup(tree, prefix);
|
||||
Deref_Prefix(prefix);
|
||||
|
||||
if ( ! node )
|
||||
{
|
||||
reporter->InternalWarning("Cannot create node in patricia tree");
|
||||
return nullptr;
|
||||
}
|
||||
if ( ! node ) {
|
||||
reporter->InternalWarning("Cannot create node in patricia tree");
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void* old = node->data;
|
||||
void* old = node->data;
|
||||
|
||||
// If there is no data to be associated with addr, we take the
|
||||
// node itself.
|
||||
node->data = data ? data : node;
|
||||
// If there is no data to be associated with addr, we take the
|
||||
// node itself.
|
||||
node->data = data ? data : node;
|
||||
|
||||
return old;
|
||||
}
|
||||
return old;
|
||||
}
|
||||
|
||||
void* PrefixTable::Insert(const Val* value, void* data)
|
||||
{
|
||||
// [elem] -> elem
|
||||
if ( value->GetType()->Tag() == TYPE_LIST && value->AsListVal()->Length() == 1 )
|
||||
value = value->AsListVal()->Idx(0).get();
|
||||
void* PrefixTable::Insert(const Val* value, void* data) {
|
||||
// [elem] -> elem
|
||||
if ( value->GetType()->Tag() == TYPE_LIST && value->AsListVal()->Length() == 1 )
|
||||
value = value->AsListVal()->Idx(0).get();
|
||||
|
||||
switch ( value->GetType()->Tag() )
|
||||
{
|
||||
case TYPE_ADDR:
|
||||
return Insert(value->AsAddr(), 128, data);
|
||||
break;
|
||||
switch ( value->GetType()->Tag() ) {
|
||||
case TYPE_ADDR: return Insert(value->AsAddr(), 128, data); break;
|
||||
|
||||
case TYPE_SUBNET:
|
||||
return Insert(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6(), data);
|
||||
break;
|
||||
case TYPE_SUBNET: return Insert(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6(), data); break;
|
||||
|
||||
default:
|
||||
reporter->InternalWarning("Wrong index type for PrefixTable");
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
default: reporter->InternalWarning("Wrong index type for PrefixTable"); return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
std::list<std::tuple<IPPrefix, void*>> PrefixTable::FindAll(const IPAddr& addr, int width) const
|
||||
{
|
||||
std::list<std::tuple<IPPrefix, void*>> out;
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
std::list<std::tuple<IPPrefix, void*>> PrefixTable::FindAll(const IPAddr& addr, int width) const {
|
||||
std::list<std::tuple<IPPrefix, void*>> out;
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
|
||||
int elems = 0;
|
||||
patricia_node_t** list = nullptr;
|
||||
int elems = 0;
|
||||
patricia_node_t** list = nullptr;
|
||||
|
||||
patricia_search_all(tree, prefix, &list, &elems);
|
||||
patricia_search_all(tree, prefix, &list, &elems);
|
||||
|
||||
for ( int i = 0; i < elems; ++i )
|
||||
out.emplace_back(PrefixToIPPrefix(list[i]->prefix), list[i]->data);
|
||||
for ( int i = 0; i < elems; ++i )
|
||||
out.emplace_back(PrefixToIPPrefix(list[i]->prefix), list[i]->data);
|
||||
|
||||
Deref_Prefix(prefix);
|
||||
free(list);
|
||||
return out;
|
||||
}
|
||||
Deref_Prefix(prefix);
|
||||
free(list);
|
||||
return out;
|
||||
}
|
||||
|
||||
std::list<std::tuple<IPPrefix, void*>> PrefixTable::FindAll(const SubNetVal* value) const
|
||||
{
|
||||
return FindAll(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6());
|
||||
}
|
||||
std::list<std::tuple<IPPrefix, void*>> PrefixTable::FindAll(const SubNetVal* value) const {
|
||||
return FindAll(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6());
|
||||
}
|
||||
|
||||
void* PrefixTable::Lookup(const IPAddr& addr, int width, bool exact) const
|
||||
{
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
patricia_node_t* node = exact ? patricia_search_exact(tree, prefix)
|
||||
: patricia_search_best(tree, prefix);
|
||||
void* PrefixTable::Lookup(const IPAddr& addr, int width, bool exact) const {
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
patricia_node_t* node = exact ? patricia_search_exact(tree, prefix) : patricia_search_best(tree, prefix);
|
||||
|
||||
int elems = 0;
|
||||
patricia_node_t** list = nullptr;
|
||||
int elems = 0;
|
||||
patricia_node_t** list = nullptr;
|
||||
|
||||
Deref_Prefix(prefix);
|
||||
return node ? node->data : nullptr;
|
||||
}
|
||||
Deref_Prefix(prefix);
|
||||
return node ? node->data : nullptr;
|
||||
}
|
||||
|
||||
void* PrefixTable::Lookup(const Val* value, bool exact) const
|
||||
{
|
||||
// [elem] -> elem
|
||||
if ( value->GetType()->Tag() == TYPE_LIST && value->AsListVal()->Length() == 1 )
|
||||
value = value->AsListVal()->Idx(0).get();
|
||||
void* PrefixTable::Lookup(const Val* value, bool exact) const {
|
||||
// [elem] -> elem
|
||||
if ( value->GetType()->Tag() == TYPE_LIST && value->AsListVal()->Length() == 1 )
|
||||
value = value->AsListVal()->Idx(0).get();
|
||||
|
||||
switch ( value->GetType()->Tag() )
|
||||
{
|
||||
case TYPE_ADDR:
|
||||
return Lookup(value->AsAddr(), 128, exact);
|
||||
break;
|
||||
switch ( value->GetType()->Tag() ) {
|
||||
case TYPE_ADDR: return Lookup(value->AsAddr(), 128, exact); break;
|
||||
|
||||
case TYPE_SUBNET:
|
||||
return Lookup(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6(), exact);
|
||||
break;
|
||||
case TYPE_SUBNET: return Lookup(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6(), exact); break;
|
||||
|
||||
default:
|
||||
reporter->InternalWarning("Wrong index type %d for PrefixTable",
|
||||
value->GetType()->Tag());
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
default:
|
||||
reporter->InternalWarning("Wrong index type %d for PrefixTable", value->GetType()->Tag());
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void* PrefixTable::Remove(const IPAddr& addr, int width)
|
||||
{
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
patricia_node_t* node = patricia_search_exact(tree, prefix);
|
||||
Deref_Prefix(prefix);
|
||||
void* PrefixTable::Remove(const IPAddr& addr, int width) {
|
||||
prefix_t* prefix = MakePrefix(addr, width);
|
||||
patricia_node_t* node = patricia_search_exact(tree, prefix);
|
||||
Deref_Prefix(prefix);
|
||||
|
||||
if ( ! node )
|
||||
return nullptr;
|
||||
if ( ! node )
|
||||
return nullptr;
|
||||
|
||||
void* old = node->data;
|
||||
patricia_remove(tree, node);
|
||||
void* old = node->data;
|
||||
patricia_remove(tree, node);
|
||||
|
||||
return old;
|
||||
}
|
||||
return old;
|
||||
}
|
||||
|
||||
void* PrefixTable::Remove(const Val* value)
|
||||
{
|
||||
// [elem] -> elem
|
||||
if ( value->GetType()->Tag() == TYPE_LIST && value->AsListVal()->Length() == 1 )
|
||||
value = value->AsListVal()->Idx(0).get();
|
||||
void* PrefixTable::Remove(const Val* value) {
|
||||
// [elem] -> elem
|
||||
if ( value->GetType()->Tag() == TYPE_LIST && value->AsListVal()->Length() == 1 )
|
||||
value = value->AsListVal()->Idx(0).get();
|
||||
|
||||
switch ( value->GetType()->Tag() )
|
||||
{
|
||||
case TYPE_ADDR:
|
||||
return Remove(value->AsAddr(), 128);
|
||||
break;
|
||||
switch ( value->GetType()->Tag() ) {
|
||||
case TYPE_ADDR: return Remove(value->AsAddr(), 128); break;
|
||||
|
||||
case TYPE_SUBNET:
|
||||
return Remove(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6());
|
||||
break;
|
||||
case TYPE_SUBNET: return Remove(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6()); break;
|
||||
|
||||
default:
|
||||
reporter->InternalWarning("Wrong index type for PrefixTable");
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
default: reporter->InternalWarning("Wrong index type for PrefixTable"); return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
PrefixTable::iterator PrefixTable::InitIterator()
|
||||
{
|
||||
iterator i;
|
||||
i.Xsp = i.Xstack;
|
||||
i.Xrn = tree->head;
|
||||
i.Xnode = nullptr;
|
||||
return i;
|
||||
}
|
||||
PrefixTable::iterator PrefixTable::InitIterator() {
|
||||
iterator i;
|
||||
i.Xsp = i.Xstack;
|
||||
i.Xrn = tree->head;
|
||||
i.Xnode = nullptr;
|
||||
return i;
|
||||
}
|
||||
|
||||
void* PrefixTable::GetNext(iterator* i)
|
||||
{
|
||||
while ( true )
|
||||
{
|
||||
i->Xnode = i->Xrn;
|
||||
if ( ! i->Xnode )
|
||||
return nullptr;
|
||||
void* PrefixTable::GetNext(iterator* i) {
|
||||
while ( true ) {
|
||||
i->Xnode = i->Xrn;
|
||||
if ( ! i->Xnode )
|
||||
return nullptr;
|
||||
|
||||
if ( i->Xrn->l )
|
||||
{
|
||||
if ( i->Xrn->r )
|
||||
*i->Xsp++ = i->Xrn->r;
|
||||
if ( i->Xrn->l ) {
|
||||
if ( i->Xrn->r )
|
||||
*i->Xsp++ = i->Xrn->r;
|
||||
|
||||
i->Xrn = i->Xrn->l;
|
||||
}
|
||||
i->Xrn = i->Xrn->l;
|
||||
}
|
||||
|
||||
else if ( i->Xrn->r )
|
||||
i->Xrn = i->Xrn->r;
|
||||
else if ( i->Xrn->r )
|
||||
i->Xrn = i->Xrn->r;
|
||||
|
||||
else if ( i->Xsp != i->Xstack )
|
||||
i->Xrn = *(--i->Xsp);
|
||||
else if ( i->Xsp != i->Xstack )
|
||||
i->Xrn = *(--i->Xsp);
|
||||
|
||||
else
|
||||
i->Xrn = (patricia_node_t*)nullptr;
|
||||
else
|
||||
i->Xrn = (patricia_node_t*)nullptr;
|
||||
|
||||
if ( i->Xnode->prefix )
|
||||
return (void*)i->Xnode->data;
|
||||
}
|
||||
if ( i->Xnode->prefix )
|
||||
return (void*)i->Xnode->data;
|
||||
}
|
||||
|
||||
// Not reached.
|
||||
}
|
||||
// Not reached.
|
||||
}
|
||||
|
||||
} // namespace zeek::detail
|
||||
} // namespace zeek::detail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue