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

Merge remote-tracking branch 'origin/topic/timw/internal-type-symbols'

Browse source 
* origin/topic/timw/internal-type-symbols:
  Move implementation of internal_{type,var,etc} methods back into global namespace.
This commit is contained in:
Jon Siwek 2020-11-23 21:50:19 -08:00
commit f70a7cb4d3
3 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,4 +1,13 @@
3.3.0-dev.561 | 2020-11-23 21:50:19 -0800
* Move implementation of internal_{type,var,etc} methods back into global namespace.
(Tim Wojtulewicz, Corelight)
This fixes an unknown symbol error if using those methods. They're defined
as extern in the global namespace in Var.h, but Var.cc had their
implementations defined in the zeek::detail namespace.
3.3.0-dev.559 | 2020-11-23 21:39:29 -0800 3.3.0-dev.559 | 2020-11-23 21:39:29 -0800
* Simplify Debian/Ubuntu CI dependencies and setup (Dominik Charousset, Corelight) * Simplify Debian/Ubuntu CI dependencies and setup (Dominik Charousset, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.559 3.3.0-dev.561

60
src/Var.cc
View file

@ -731,11 +731,6 @@ void end_func(StmtPtr body)
ingredients.release(); ingredients.release();
} }
Val* internal_val(const char* name)
{
return id::find_val(name).get();
}
IDPList gather_outer_ids(Scope* scope, Stmt* body) IDPList gather_outer_ids(Scope* scope, Stmt* body)
{ {
OuterIDBindingFinder cb(scope); OuterIDBindingFinder cb(scope);
@ -756,20 +751,27 @@ IDPList gather_outer_ids(Scope* scope, Stmt* body)
return idl; return idl;
} }
Val* internal_const_val(const char* name) } // namespace zeek::detail
zeek::Val* internal_val(const char* name)
{ {
return id::find_const(name).get(); return zeek::id::find_val(name).get();
} }
Val* opt_internal_val(const char* name) zeek::Val* internal_const_val(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); return zeek::id::find_const(name).get();
}
zeek::Val* opt_internal_val(const char* name)
{
const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
return id ? id->GetVal().get() : nullptr; return id ? id->GetVal().get() : nullptr;
} }
double opt_internal_double(const char* name) double opt_internal_double(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
if ( ! id ) return 0.0; if ( ! id ) return 0.0;
const auto& v = id->GetVal(); const auto& v = id->GetVal();
return v ? v->InternalDouble() : 0.0; return v ? v->InternalDouble() : 0.0;
@ -777,7 +779,7 @@ double opt_internal_double(const char* name)
bro_int_t opt_internal_int(const char* name) bro_int_t opt_internal_int(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
if ( ! id ) return 0; if ( ! id ) return 0;
const auto& v = id->GetVal(); const auto& v = id->GetVal();
return v ? v->InternalInt() : 0; return v ? v->InternalInt() : 0;
@ -785,63 +787,63 @@ bro_int_t opt_internal_int(const char* name)
bro_uint_t opt_internal_unsigned(const char* name) bro_uint_t opt_internal_unsigned(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
if ( ! id ) return 0; if ( ! id ) return 0;
const auto& v = id->GetVal(); const auto& v = id->GetVal();
return v ? v->InternalUnsigned() : 0; return v ? v->InternalUnsigned() : 0;
} }
StringVal* opt_internal_string(const char* name) zeek::StringVal* opt_internal_string(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
if ( ! id ) return nullptr; if ( ! id ) return nullptr;
const auto& v = id->GetVal(); const auto& v = id->GetVal();
return v ? v->AsStringVal() : nullptr; return v ? v->AsStringVal() : nullptr;
} }
TableVal* opt_internal_table(const char* name) zeek::TableVal* opt_internal_table(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
if ( ! id ) return nullptr; if ( ! id ) return nullptr;
const auto& v = id->GetVal(); const auto& v = id->GetVal();
return v ? v->AsTableVal() : nullptr; return v ? v->AsTableVal() : nullptr;
} }
ListVal* internal_list_val(const char* name) zeek::ListVal* internal_list_val(const char* name)
{ {
const auto& id = lookup_ID(name, GLOBAL_MODULE_NAME); const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
if ( ! id ) if ( ! id )
return nullptr; return nullptr;
Val* v = id->GetVal().get(); zeek::Val* v = id->GetVal().get();
if ( v ) if ( v )
{ {
if ( v->GetType()->Tag() == TYPE_LIST ) if ( v->GetType()->Tag() == zeek::TYPE_LIST )
return (ListVal*) v; return (zeek::ListVal*) v;
else if ( v->GetType()->IsSet() ) else if ( v->GetType()->IsSet() )
{ {
TableVal* tv = v->AsTableVal(); zeek::TableVal* tv = v->AsTableVal();
auto lv = tv->ToPureListVal(); auto lv = tv->ToPureListVal();
return lv.release(); return lv.release();
} }
else else
reporter->InternalError("internal variable %s is not a list", name); zeek::reporter->InternalError("internal variable %s is not a list", name);
} }
return nullptr; return nullptr;
} }
Type* internal_type(const char* name) zeek::Type* internal_type(const char* name)
{ {
return id::find_type(name).get(); return zeek::id::find_type(name).get();
} }
Func* internal_func(const char* name) zeek::Func* internal_func(const char* name)
{ {
const auto& v = id::find_val(name); const auto& v = zeek::id::find_val(name);
if ( v ) if ( v )
return v->AsFunc(); return v->AsFunc();
@ -849,9 +851,7 @@ Func* internal_func(const char* name)
return nullptr; return nullptr;
} }
EventHandlerPtr internal_handler(const char* name) zeek::EventHandlerPtr internal_handler(const char* name)
{ {
return event_registry->Register(name); return event_registry->Register(name);
} }
} // namespace zeek::detail