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

Move various elements into ID.h and zeek::id namespace

Browse source 
* A handful of generic/useful/common global type pointers that used
  to be in NetVar.h

* Lookup functions that used to be Var.h
This commit is contained in:
Jon Siwek 2020-05-12 18:08:52 -07:00
parent 9210d443d3
commit a5762c12cc
84 changed files with 578 additions and 568 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/broker/Manager.cc
View file

@ -148,8 +148,8 @@ void Manager::InitPostScript()
default_log_topic_prefix =
get_option("Broker::default_log_topic_prefix")->AsString()->CheckString();
log_topic_func = get_option("Broker::log_topic")->AsFunc();
log_id_type = zeek::lookup_type("Log::ID")->AsEnumType();
writer_id_type = zeek::lookup_type("Log::Writer")->AsEnumType();
log_id_type = zeek::id::lookup_type("Log::ID")->AsEnumType();
writer_id_type = zeek::id::lookup_type("Log::Writer")->AsEnumType();
opaque_of_data_type = new OpaqueType("Broker::Data");
opaque_of_set_iterator = new OpaqueType("Broker::SetIterator");
@ -157,7 +157,7 @@ void Manager::InitPostScript()
opaque_of_vector_iterator = new OpaqueType("Broker::VectorIterator");
opaque_of_record_iterator = new OpaqueType("Broker::RecordIterator");
opaque_of_store_handle = new OpaqueType("Broker::Store");
vector_of_data_type = make_intrusive<VectorType>(zeek::lookup_type("Broker::Data"));
vector_of_data_type = make_intrusive<VectorType>(zeek::id::lookup_type("Broker::Data"));
// Register as a "dont-count" source first, we may change that later.
iosource_mgr->Register(this, true);
@ -1245,13 +1245,13 @@ void Manager::ProcessStatus(broker::status stat)
if ( ! event )
return;
auto ei = zeek::lookup_type("Broker::EndpointInfo")->AsRecordType();
auto ei = zeek::id::lookup_type("Broker::EndpointInfo")->AsRecordType();
auto endpoint_info = make_intrusive<RecordVal>(ei);
if ( ctx )
{
endpoint_info->Assign(0, make_intrusive<StringVal>(to_string(ctx->node)));
auto ni = zeek::lookup_type("Broker::NetworkInfo")->AsRecordType();
auto ni = zeek::id::lookup_type("Broker::NetworkInfo")->AsRecordType();
auto network_info = make_intrusive<RecordVal>(ni);
if ( ctx->network )