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

Move all Val classes to the zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:55:28 -04:00
parent ec9eff0bd5
commit 64332ca22c
265 changed files with 3154 additions and 3086 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/supervisor/Supervisor.cc
View file

@ -1105,50 +1105,50 @@ std::string Supervisor::NodeConfig::ToJSON() const
RecordValPtr Supervisor::NodeConfig::ToRecord() const
{
const auto& rt = zeek::BifType::Record::Supervisor::NodeConfig;
auto rval = zeek::make_intrusive<RecordVal>(rt);
rval->Assign(rt->FieldOffset("name"), zeek::make_intrusive<StringVal>(name));
auto rval = zeek::make_intrusive<zeek::RecordVal>(rt);
rval->Assign(rt->FieldOffset("name"), zeek::make_intrusive<zeek::StringVal>(name));
if ( interface )
rval->Assign(rt->FieldOffset("interface"), zeek::make_intrusive<StringVal>(*interface));
rval->Assign(rt->FieldOffset("interface"), zeek::make_intrusive<zeek::StringVal>(*interface));
if ( directory )
rval->Assign(rt->FieldOffset("directory"), zeek::make_intrusive<StringVal>(*directory));
rval->Assign(rt->FieldOffset("directory"), zeek::make_intrusive<zeek::StringVal>(*directory));
if ( stdout_file )
rval->Assign(rt->FieldOffset("stdout_file"), zeek::make_intrusive<StringVal>(*stdout_file));
rval->Assign(rt->FieldOffset("stdout_file"), zeek::make_intrusive<zeek::StringVal>(*stdout_file));
if ( stderr_file )
rval->Assign(rt->FieldOffset("stderr_file"), zeek::make_intrusive<StringVal>(*stderr_file));
rval->Assign(rt->FieldOffset("stderr_file"), zeek::make_intrusive<zeek::StringVal>(*stderr_file));
if ( cpu_affinity )
rval->Assign(rt->FieldOffset("cpu_affinity"), val_mgr->Int(*cpu_affinity));
auto st = rt->GetFieldType<VectorType>("scripts");
auto scripts_val = zeek::make_intrusive<VectorVal>(std::move(st));
auto scripts_val = zeek::make_intrusive<zeek::VectorVal>(std::move(st));
for ( const auto& s : scripts )
scripts_val->Assign(scripts_val->Size(), zeek::make_intrusive<StringVal>(s));
scripts_val->Assign(scripts_val->Size(), zeek::make_intrusive<zeek::StringVal>(s));
rval->Assign(rt->FieldOffset("scripts"), std::move(scripts_val));
auto tt = rt->GetFieldType<TableType>("cluster");
auto cluster_val = zeek::make_intrusive<TableVal>(std::move(tt));
auto cluster_val = zeek::make_intrusive<zeek::TableVal>(std::move(tt));
rval->Assign(rt->FieldOffset("cluster"), cluster_val);
for ( const auto& e : cluster )
{
auto& name = e.first;
auto& ep = e.second;
auto key = zeek::make_intrusive<StringVal>(name);
auto key = zeek::make_intrusive<zeek::StringVal>(name);
const auto& ept = zeek::BifType::Record::Supervisor::ClusterEndpoint;
auto val = zeek::make_intrusive<RecordVal>(ept);
auto val = zeek::make_intrusive<zeek::RecordVal>(ept);
val->Assign(ept->FieldOffset("role"), zeek::BifType::Enum::Supervisor::ClusterRole->GetVal(ep.role));
val->Assign(ept->FieldOffset("host"), zeek::make_intrusive<AddrVal>(ep.host));
val->Assign(ept->FieldOffset("host"), zeek::make_intrusive<zeek::AddrVal>(ep.host));
val->Assign(ept->FieldOffset("p"), val_mgr->Port(ep.port, TRANSPORT_TCP));
if ( ep.interface )
val->Assign(ept->FieldOffset("interface"), zeek::make_intrusive<StringVal>(*ep.interface));
val->Assign(ept->FieldOffset("interface"), zeek::make_intrusive<zeek::StringVal>(*ep.interface));
cluster_val->Assign(std::move(key), std::move(val));
}
@ -1159,7 +1159,7 @@ RecordValPtr Supervisor::NodeConfig::ToRecord() const
RecordValPtr Supervisor::Node::ToRecord() const
{
const auto& rt = zeek::BifType::Record::Supervisor::NodeStatus;
auto rval = zeek::make_intrusive<RecordVal>(rt);
auto rval = zeek::make_intrusive<zeek::RecordVal>(rt);
rval->Assign(rt->FieldOffset("node"), config.ToRecord());
@ -1212,21 +1212,21 @@ bool Supervisor::SupervisedNode::InitCluster() const
{
const auto& node_name = e.first;
const auto& ep = e.second;
auto key = zeek::make_intrusive<StringVal>(node_name);
auto val = zeek::make_intrusive<RecordVal>(cluster_node_type);
auto key = zeek::make_intrusive<zeek::StringVal>(node_name);
auto val = zeek::make_intrusive<zeek::RecordVal>(cluster_node_type);
auto node_type = supervisor_role_to_cluster_node_type(ep.role);
val->Assign(cluster_node_type->FieldOffset("node_type"), std::move(node_type));
val->Assign(cluster_node_type->FieldOffset("ip"), zeek::make_intrusive<AddrVal>(ep.host));
val->Assign(cluster_node_type->FieldOffset("ip"), zeek::make_intrusive<zeek::AddrVal>(ep.host));
val->Assign(cluster_node_type->FieldOffset("p"), val_mgr->Port(ep.port, TRANSPORT_TCP));
if ( ep.interface )
val->Assign(cluster_node_type->FieldOffset("interface"),
zeek::make_intrusive<StringVal>(*ep.interface));
zeek::make_intrusive<zeek::StringVal>(*ep.interface));
if ( manager_name && ep.role != BifEnum::Supervisor::MANAGER )
val->Assign(cluster_node_type->FieldOffset("manager"),
zeek::make_intrusive<StringVal>(*manager_name));
zeek::make_intrusive<zeek::StringVal>(*manager_name));
cluster_nodes->Assign(std::move(key), std::move(val));
}
@ -1314,9 +1314,9 @@ void Supervisor::SupervisedNode::Init(zeek::Options* options) const
RecordValPtr Supervisor::Status(std::string_view node_name)
{
auto rval = zeek::make_intrusive<RecordVal>(zeek::BifType::Record::Supervisor::Status);
auto rval = zeek::make_intrusive<zeek::RecordVal>(zeek::BifType::Record::Supervisor::Status);
const auto& tt = zeek::BifType::Record::Supervisor::Status->GetFieldType("nodes");
auto node_table_val = zeek::make_intrusive<TableVal>(zeek::cast_intrusive<TableType>(tt));
auto node_table_val = zeek::make_intrusive<zeek::TableVal>(zeek::cast_intrusive<TableType>(tt));
rval->Assign(0, node_table_val);
if ( node_name.empty() )
@ -1325,7 +1325,7 @@ RecordValPtr Supervisor::Status(std::string_view node_name)
{
const auto& name = n.first;
const auto& node = n.second;
auto key = zeek::make_intrusive<StringVal>(name);
auto key = zeek::make_intrusive<zeek::StringVal>(name);
auto val = node.ToRecord();
node_table_val->Assign(std::move(key), std::move(val));
}
@ -1339,7 +1339,7 @@ RecordValPtr Supervisor::Status(std::string_view node_name)
const auto& name = it->first;
const auto& node = it->second;
auto key = zeek::make_intrusive<StringVal>(name);
auto key = zeek::make_intrusive<zeek::StringVal>(name);
auto val = node.ToRecord();
node_table_val->Assign(std::move(key), std::move(val));
}

10
src/supervisor/supervisor.bif
View file

@ -24,7 +24,7 @@ function Supervisor::__status%(node: string%): Supervisor::Status
if ( ! zeek::supervisor_mgr )
{
builtin_error("supervisor mode not enabled");
return zeek::make_intrusive<RecordVal>(zeek::BifType::Record::Supervisor::Status);
return zeek::make_intrusive<zeek::RecordVal>(zeek::BifType::Record::Supervisor::Status);
}
return zeek::supervisor_mgr->Status(node->CheckString());
@ -35,11 +35,11 @@ function Supervisor::__create%(node: Supervisor::NodeConfig%): string
if ( ! zeek::supervisor_mgr )
{
builtin_error("supervisor mode not enabled");
return zeek::make_intrusive<StringVal>("supervisor mode not enabled");
return zeek::make_intrusive<zeek::StringVal>("supervisor mode not enabled");
}
auto rval = zeek::supervisor_mgr->Create(node->AsRecordVal());
return zeek::make_intrusive<StringVal>(rval);
return zeek::make_intrusive<zeek::StringVal>(rval);
%}
function Supervisor::__destroy%(node: string%): bool
@ -85,8 +85,8 @@ function Supervisor::__node%(%): Supervisor::NodeConfig
{
builtin_error("not a supervised process");
const auto& rt = zeek::BifType::Record::Supervisor::NodeConfig;
auto rval = zeek::make_intrusive<RecordVal>(rt);
rval->Assign<StringVal>(rt->FieldOffset("name"), "<invalid>");
auto rval = zeek::make_intrusive<zeek::RecordVal>(rt);
rval->Assign<zeek::StringVal>(rt->FieldOffset("name"), "<invalid>");
return rval;
}