diff --git a/NEWS b/NEWS index f9dba96980..d81d76a4d8 100644 --- a/NEWS +++ b/NEWS @@ -159,15 +159,15 @@ Deprecated Functionality - ``ID::ID_Val()`` is deprecated, use ``ID::GetVal()``. -- ``internal_type()`` is deprecated, use ``zeek::id::lookup_type()``. +- ``internal_type()`` is deprecated, use ``zeek::id::find_type()``. - ``internal_val()`` and ``internal_const_val()`` are deprecated, use - ``zeek::id::lookup_val()`` or ``zeek::id::lookup_const()``. + ``zeek::id::find_val()`` or ``zeek::id::find_const()``. -- ``internal_func()`` is deprecated, use ``zeek::id::lookup_func()``. +- ``internal_func()`` is deprecated, use ``zeek::id::find_func()``. - ``opt_internal_val()`` is deprecated, use ``lookup_ID()`` or - ``zeek::id::lookup_val()``. + ``zeek::id::find_val()``. - ``Val::Type()`` is deprecated, use ``Val::GetType``. diff --git a/aux/bifcl b/aux/bifcl index b155d04585..2c7ded074f 160000 --- a/aux/bifcl +++ b/aux/bifcl @@ -1 +1 @@ -Subproject commit b155d04585c61c8fdd0768e1f2a403b27447bb9d +Subproject commit 2c7ded074fdea124fcae7845d1f8e77879925270 diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index a69ebbe4ce..5b8746e249 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -452,7 +452,7 @@ void DNS_Mgr::InitSource() void DNS_Mgr::InitPostScript() { - dm_rec = zeek::id::lookup_type("dns_mapping")->AsRecordType(); + dm_rec = zeek::id::find_type("dns_mapping")->AsRecordType(); // Registering will call Init() iosource_mgr->Register(this, true); diff --git a/src/Discard.cc b/src/Discard.cc index 20a40b0590..6e5aee9826 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -16,12 +16,12 @@ Discarder::Discarder() { - check_ip = zeek::id::lookup_func("discarder_check_ip"); - check_tcp = zeek::id::lookup_func("discarder_check_tcp"); - check_udp = zeek::id::lookup_func("discarder_check_udp"); - check_icmp = zeek::id::lookup_func("discarder_check_icmp"); + check_ip = zeek::id::find_func("discarder_check_ip"); + check_tcp = zeek::id::find_func("discarder_check_tcp"); + check_udp = zeek::id::find_func("discarder_check_udp"); + check_icmp = zeek::id::find_func("discarder_check_icmp"); - discarder_maxlen = static_cast(zeek::id::lookup_val("discarder_maxlen")->AsCount()); + discarder_maxlen = static_cast(zeek::id::find_val("discarder_maxlen")->AsCount()); } Discarder::~Discarder() diff --git a/src/EventHandler.cc b/src/EventHandler.cc index f9c3e72d47..580d48be27 100644 --- a/src/EventHandler.cc +++ b/src/EventHandler.cc @@ -127,7 +127,7 @@ void EventHandler::NewEvent(const zeek::Args& vl) return; RecordType* args = FType()->Args(); - static auto call_argument_vector = zeek::id::lookup_type("call_argument_vector"); + static auto call_argument_vector = zeek::id::find_type("call_argument_vector"); auto vargs = make_intrusive(call_argument_vector); for ( int i = 0; i < args->NumFields(); i++ ) @@ -136,7 +136,7 @@ void EventHandler::NewEvent(const zeek::Args& vl) const auto& ftype = args->GetFieldType(i); auto fdefault = args->FieldDefault(i); - static auto call_argument = zeek::id::lookup_type("call_argument"); + static auto call_argument = zeek::id::find_type("call_argument"); auto rec = make_intrusive(call_argument); rec->Assign(0, make_intrusive(fname)); diff --git a/src/File.cc b/src/File.cc index 9fdafe2651..05c16d2efb 100644 --- a/src/File.cc +++ b/src/File.cc @@ -278,7 +278,7 @@ RecordVal* BroFile::Rotate() if ( f == stdin || f == stdout || f == stderr ) return nullptr; - static auto rotate_info = zeek::id::lookup_type("rotate_info"); + static auto rotate_info = zeek::id::find_type("rotate_info"); RecordVal* info = new RecordVal(rotate_info); FILE* newf = rotate_file(name, info); diff --git a/src/Func.cc b/src/Func.cc index 1ae7e0b8a7..aaa0f9d35a 100644 --- a/src/Func.cc +++ b/src/Func.cc @@ -748,21 +748,21 @@ void builtin_error(const char* msg, BroObj* arg) void init_builtin_funcs() { - ProcStats = zeek::id::lookup_type("ProcStats")->AsRecordType(); - NetStats = zeek::id::lookup_type("NetStats")->AsRecordType(); - MatcherStats = zeek::id::lookup_type("MatcherStats")->AsRecordType(); - ConnStats = zeek::id::lookup_type("ConnStats")->AsRecordType(); - ReassemblerStats = zeek::id::lookup_type("ReassemblerStats")->AsRecordType(); - DNSStats = zeek::id::lookup_type("DNSStats")->AsRecordType(); - GapStats = zeek::id::lookup_type("GapStats")->AsRecordType(); - EventStats = zeek::id::lookup_type("EventStats")->AsRecordType(); - TimerStats = zeek::id::lookup_type("TimerStats")->AsRecordType(); - FileAnalysisStats = zeek::id::lookup_type("FileAnalysisStats")->AsRecordType(); - ThreadStats = zeek::id::lookup_type("ThreadStats")->AsRecordType(); - BrokerStats = zeek::id::lookup_type("BrokerStats")->AsRecordType(); - ReporterStats = zeek::id::lookup_type("ReporterStats")->AsRecordType(); + ProcStats = zeek::id::find_type("ProcStats")->AsRecordType(); + NetStats = zeek::id::find_type("NetStats")->AsRecordType(); + MatcherStats = zeek::id::find_type("MatcherStats")->AsRecordType(); + ConnStats = zeek::id::find_type("ConnStats")->AsRecordType(); + ReassemblerStats = zeek::id::find_type("ReassemblerStats")->AsRecordType(); + DNSStats = zeek::id::find_type("DNSStats")->AsRecordType(); + GapStats = zeek::id::find_type("GapStats")->AsRecordType(); + EventStats = zeek::id::find_type("EventStats")->AsRecordType(); + TimerStats = zeek::id::find_type("TimerStats")->AsRecordType(); + FileAnalysisStats = zeek::id::find_type("FileAnalysisStats")->AsRecordType(); + ThreadStats = zeek::id::find_type("ThreadStats")->AsRecordType(); + BrokerStats = zeek::id::find_type("BrokerStats")->AsRecordType(); + ReporterStats = zeek::id::find_type("ReporterStats")->AsRecordType(); - var_sizes = zeek::id::lookup_type("var_sizes")->AsTableType(); + var_sizes = zeek::id::find_type("var_sizes")->AsTableType(); #include "zeek.bif.func_init" #include "stats.bif.func_init" diff --git a/src/ID.cc b/src/ID.cc index da0bc8e6ae..c72137d534 100644 --- a/src/ID.cc +++ b/src/ID.cc @@ -31,12 +31,12 @@ IntrusivePtr zeek::id::count_set; IntrusivePtr zeek::id::string_vec; IntrusivePtr zeek::id::index_vec; -const IntrusivePtr& zeek::id::lookup(std::string_view name) +const IntrusivePtr& zeek::id::find(std::string_view name) { return global_scope()->Find(name); } -const IntrusivePtr& zeek::id::lookup_type(std::string_view name) +const IntrusivePtr& zeek::id::find_type(std::string_view name) { auto id = global_scope()->Find(name); @@ -47,7 +47,7 @@ const IntrusivePtr& zeek::id::lookup_type(std::string_view name) return id->GetType(); } -const IntrusivePtr& zeek::id::lookup_val(std::string_view name) +const IntrusivePtr& zeek::id::find_val(std::string_view name) { auto id = global_scope()->Find(name); @@ -58,7 +58,7 @@ const IntrusivePtr& zeek::id::lookup_val(std::string_view name) return id->GetVal(); } -const IntrusivePtr& zeek::id::lookup_const(std::string_view name) +const IntrusivePtr& zeek::id::find_const(std::string_view name) { auto id = global_scope()->Find(name); @@ -73,9 +73,9 @@ const IntrusivePtr& zeek::id::lookup_const(std::string_view name) return id->GetVal(); } -IntrusivePtr zeek::id::lookup_func(std::string_view name) +IntrusivePtr zeek::id::find_func(std::string_view name) { - const auto& v = zeek::id::lookup_val(name); + const auto& v = zeek::id::find_val(name); if ( ! v ) return nullptr; @@ -89,17 +89,17 @@ IntrusivePtr zeek::id::lookup_func(std::string_view name) void zeek::id::detail::init() { - conn_id = lookup_type("conn_id"); - endpoint = lookup_type("endpoint"); - connection = lookup_type("connection"); - fa_file = lookup_type("fa_file"); - fa_metadata = lookup_type("fa_metadata"); - transport_proto = lookup_type("transport_proto"); - string_set = lookup_type("string_set"); - string_array = lookup_type("string_array"); - count_set = lookup_type("count_set"); - string_vec = lookup_type("string_vec"); - index_vec = lookup_type("index_vec"); + conn_id = zeek::id::find_type("conn_id"); + endpoint = zeek::id::find_type("endpoint"); + connection = zeek::id::find_type("connection"); + fa_file = zeek::id::find_type("fa_file"); + fa_metadata = zeek::id::find_type("fa_metadata"); + transport_proto = zeek::id::find_type("transport_proto"); + string_set = zeek::id::find_type("string_set"); + string_array = zeek::id::find_type("string_array"); + count_set = zeek::id::find_type("count_set"); + string_vec = zeek::id::find_type("string_vec"); + index_vec = zeek::id::find_type("index_vec"); } ID::ID(const char* arg_name, IDScope arg_scope, bool arg_is_export) diff --git a/src/ID.h b/src/ID.h index 065c144c89..631bff4179 100644 --- a/src/ID.h +++ b/src/ID.h @@ -166,7 +166,7 @@ namespace zeek { namespace id { * @return The identifier, which may reference a nil object if no such * name exists. */ -const IntrusivePtr& lookup(std::string_view name); +const IntrusivePtr& find(std::string_view name); /** * Lookup an ID by its name and return its type. A fatal occurs if the ID @@ -174,7 +174,7 @@ const IntrusivePtr& lookup(std::string_view name); * @param name The identifier name to lookup * @return The type of the identifier. */ -const IntrusivePtr& lookup_type(std::string_view name); +const IntrusivePtr& find_type(std::string_view name); /** * Lookup an ID by its name and return its type (as cast to @c T). @@ -183,8 +183,8 @@ const IntrusivePtr& lookup_type(std::string_view name); * @return The type of the identifier. */ template -IntrusivePtr lookup_type(std::string_view name) - { return cast_intrusive(lookup_type(name)); } +IntrusivePtr find_type(std::string_view name) + { return cast_intrusive(find_type(name)); } /** * Lookup an ID by its name and return its value. A fatal occurs if the ID @@ -192,7 +192,7 @@ IntrusivePtr lookup_type(std::string_view name) * @param name The identifier name to lookup * @return The current value of the identifier */ -const IntrusivePtr& lookup_val(std::string_view name); +const IntrusivePtr& find_val(std::string_view name); /** * Lookup an ID by its name and return its value (as cast to @c T). @@ -201,8 +201,8 @@ const IntrusivePtr& lookup_val(std::string_view name); * @return The current value of the identifier. */ template -IntrusivePtr lookup_val(std::string_view name) - { return cast_intrusive(lookup_val(name)); } +IntrusivePtr find_val(std::string_view name) + { return cast_intrusive(find_val(name)); } /** * Lookup an ID by its name and return its value. A fatal occurs if the ID @@ -210,7 +210,7 @@ IntrusivePtr lookup_val(std::string_view name) * @param name The identifier name to lookup * @return The current value of the identifier */ -const IntrusivePtr& lookup_const(std::string_view name); +const IntrusivePtr& find_const(std::string_view name); /** * Lookup an ID by its name and return its value (as cast to @c T). @@ -219,8 +219,8 @@ const IntrusivePtr& lookup_const(std::string_view name); * @return The current value of the identifier. */ template -IntrusivePtr lookup_const(std::string_view name) - { return cast_intrusive(lookup_const(name)); } +IntrusivePtr find_const(std::string_view name) + { return cast_intrusive(find_const(name)); } /** * Lookup an ID by its name and return the function it references. @@ -228,7 +228,7 @@ IntrusivePtr lookup_const(std::string_view name) * @param name The identifier name to lookup * @return The current function value the identifier references. */ -IntrusivePtr lookup_func(std::string_view name); +IntrusivePtr find_func(std::string_view name); extern IntrusivePtr conn_id; extern IntrusivePtr endpoint; diff --git a/src/IP.cc b/src/IP.cc index a451cf26d8..40e76b68d1 100644 --- a/src/IP.cc +++ b/src/IP.cc @@ -37,14 +37,14 @@ static RecordType* ip6_mob_be_type = nullptr; static inline RecordType* hdrType(RecordType*& type, const char* name) { if ( ! type ) - type = zeek::id::lookup_type(name)->AsRecordType(); + type = zeek::id::find_type(name)->AsRecordType(); return type; } static IntrusivePtr BuildOptionsVal(const u_char* data, int len) { - auto vv = make_intrusive(zeek::id::lookup_type("ip6_options")); + auto vv = make_intrusive(zeek::id::find_type("ip6_options")); while ( len > 0 ) { @@ -95,7 +95,7 @@ IntrusivePtr IPv6_Hdr::ToVal(IntrusivePtr chain) const rv->Assign(6, make_intrusive(IPAddr(ip6->ip6_dst))); if ( ! chain ) chain = make_intrusive( - zeek::id::lookup_type("ip6_ext_hdr_chain")); + zeek::id::find_type("ip6_ext_hdr_chain")); rv->Assign(7, std::move(chain)); } break; @@ -367,7 +367,7 @@ IntrusivePtr IP_Hdr::ToPktHdrVal() const static RecordType* pkt_hdr_type = nullptr; if ( ! pkt_hdr_type ) - pkt_hdr_type = zeek::id::lookup_type("pkt_hdr")->AsRecordType(); + pkt_hdr_type = zeek::id::find_type("pkt_hdr")->AsRecordType(); return ToPktHdrVal(make_intrusive(pkt_hdr_type), 0); } @@ -385,9 +385,9 @@ IntrusivePtr IP_Hdr::ToPktHdrVal(IntrusivePtr pkt_hdr, int if ( ! tcp_hdr_type ) { - tcp_hdr_type = zeek::id::lookup_type("tcp_hdr")->AsRecordType(); - udp_hdr_type = zeek::id::lookup_type("udp_hdr")->AsRecordType(); - icmp_hdr_type = zeek::id::lookup_type("icmp_hdr")->AsRecordType(); + tcp_hdr_type = zeek::id::find_type("tcp_hdr")->AsRecordType(); + udp_hdr_type = zeek::id::find_type("udp_hdr")->AsRecordType(); + icmp_hdr_type = zeek::id::find_type("icmp_hdr")->AsRecordType(); } if ( ip4 ) @@ -697,18 +697,18 @@ IntrusivePtr IPv6_Hdr_Chain::ToVal() const { if ( ! ip6_ext_hdr_type ) { - ip6_ext_hdr_type = zeek::id::lookup_type("ip6_ext_hdr")->AsRecordType(); - ip6_hopopts_type = zeek::id::lookup_type("ip6_hopopts")->AsRecordType(); - ip6_dstopts_type = zeek::id::lookup_type("ip6_dstopts")->AsRecordType(); - ip6_routing_type = zeek::id::lookup_type("ip6_routing")->AsRecordType(); - ip6_fragment_type = zeek::id::lookup_type("ip6_fragment")->AsRecordType(); - ip6_ah_type = zeek::id::lookup_type("ip6_ah")->AsRecordType(); - ip6_esp_type = zeek::id::lookup_type("ip6_esp")->AsRecordType(); - ip6_mob_type = zeek::id::lookup_type("ip6_mobility_hdr")->AsRecordType(); + ip6_ext_hdr_type = zeek::id::find_type("ip6_ext_hdr")->AsRecordType(); + ip6_hopopts_type = zeek::id::find_type("ip6_hopopts")->AsRecordType(); + ip6_dstopts_type = zeek::id::find_type("ip6_dstopts")->AsRecordType(); + ip6_routing_type = zeek::id::find_type("ip6_routing")->AsRecordType(); + ip6_fragment_type = zeek::id::find_type("ip6_fragment")->AsRecordType(); + ip6_ah_type = zeek::id::find_type("ip6_ah")->AsRecordType(); + ip6_esp_type = zeek::id::find_type("ip6_esp")->AsRecordType(); + ip6_mob_type = zeek::id::find_type("ip6_mobility_hdr")->AsRecordType(); } auto rval = make_intrusive( - zeek::id::lookup_type("ip6_ext_hdr_chain")); + zeek::id::find_type("ip6_ext_hdr_chain")); for ( size_t i = 1; i < chain.size(); ++i ) { diff --git a/src/NetVar.cc b/src/NetVar.cc index 3d39a08da6..535350b4eb 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -198,14 +198,14 @@ void init_event_handlers() void init_general_global_var() { - table_expire_interval = zeek::id::lookup_val("table_expire_interval")->AsInterval(); - table_expire_delay = zeek::id::lookup_val("table_expire_delay")->AsInterval(); - table_incremental_step = zeek::id::lookup_val("table_incremental_step")->AsCount(); - packet_filter_default = zeek::id::lookup_val("packet_filter_default")->AsBool(); - sig_max_group_size = zeek::id::lookup_val("sig_max_group_size")->AsCount(); - check_for_unused_event_handlers = zeek::id::lookup_val("check_for_unused_event_handlers")->AsBool(); - record_all_packets = zeek::id::lookup_val("record_all_packets")->AsBool(); - bits_per_uid = zeek::id::lookup_val("bits_per_uid")->AsCount(); + table_expire_interval = zeek::id::find_val("table_expire_interval")->AsInterval(); + table_expire_delay = zeek::id::find_val("table_expire_delay")->AsInterval(); + table_incremental_step = zeek::id::find_val("table_incremental_step")->AsCount(); + packet_filter_default = zeek::id::find_val("packet_filter_default")->AsBool(); + sig_max_group_size = zeek::id::find_val("sig_max_group_size")->AsCount(); + check_for_unused_event_handlers = zeek::id::find_val("check_for_unused_event_handlers")->AsBool(); + record_all_packets = zeek::id::find_val("record_all_packets")->AsBool(); + bits_per_uid = zeek::id::find_val("bits_per_uid")->AsCount(); } extern void zeek_legacy_netvar_init(); @@ -220,102 +220,102 @@ void init_net_var() zeek::id::detail::init(); zeek_legacy_netvar_init(); - ignore_checksums = zeek::id::lookup_val("ignore_checksums")->AsBool(); - partial_connection_ok = zeek::id::lookup_val("partial_connection_ok")->AsBool(); - tcp_SYN_ack_ok = zeek::id::lookup_val("tcp_SYN_ack_ok")->AsBool(); - tcp_match_undelivered = zeek::id::lookup_val("tcp_match_undelivered")->AsBool(); + ignore_checksums = zeek::id::find_val("ignore_checksums")->AsBool(); + partial_connection_ok = zeek::id::find_val("partial_connection_ok")->AsBool(); + tcp_SYN_ack_ok = zeek::id::find_val("tcp_SYN_ack_ok")->AsBool(); + tcp_match_undelivered = zeek::id::find_val("tcp_match_undelivered")->AsBool(); - encap_hdr_size = zeek::id::lookup_val("encap_hdr_size")->AsCount(); + encap_hdr_size = zeek::id::find_val("encap_hdr_size")->AsCount(); - frag_timeout = zeek::id::lookup_val("frag_timeout")->AsInterval(); + frag_timeout = zeek::id::find_val("frag_timeout")->AsInterval(); - tcp_SYN_timeout = zeek::id::lookup_val("tcp_SYN_timeout")->AsInterval(); - tcp_session_timer = zeek::id::lookup_val("tcp_session_timer")->AsInterval(); - tcp_connection_linger = zeek::id::lookup_val("tcp_connection_linger")->AsInterval(); - tcp_attempt_delay = zeek::id::lookup_val("tcp_attempt_delay")->AsInterval(); - tcp_close_delay = zeek::id::lookup_val("tcp_close_delay")->AsInterval(); - tcp_reset_delay = zeek::id::lookup_val("tcp_reset_delay")->AsInterval(); - tcp_partial_close_delay = zeek::id::lookup_val("tcp_partial_close_delay")->AsInterval(); + tcp_SYN_timeout = zeek::id::find_val("tcp_SYN_timeout")->AsInterval(); + tcp_session_timer = zeek::id::find_val("tcp_session_timer")->AsInterval(); + tcp_connection_linger = zeek::id::find_val("tcp_connection_linger")->AsInterval(); + tcp_attempt_delay = zeek::id::find_val("tcp_attempt_delay")->AsInterval(); + tcp_close_delay = zeek::id::find_val("tcp_close_delay")->AsInterval(); + tcp_reset_delay = zeek::id::find_val("tcp_reset_delay")->AsInterval(); + tcp_partial_close_delay = zeek::id::find_val("tcp_partial_close_delay")->AsInterval(); - tcp_max_initial_window = zeek::id::lookup_val("tcp_max_initial_window")->AsCount(); - tcp_max_above_hole_without_any_acks = zeek::id::lookup_val("tcp_max_above_hole_without_any_acks")->AsCount(); - tcp_excessive_data_without_further_acks = zeek::id::lookup_val("tcp_excessive_data_without_further_acks")->AsCount(); - tcp_max_old_segments = zeek::id::lookup_val("tcp_max_old_segments")->AsCount(); + tcp_max_initial_window = zeek::id::find_val("tcp_max_initial_window")->AsCount(); + tcp_max_above_hole_without_any_acks = zeek::id::find_val("tcp_max_above_hole_without_any_acks")->AsCount(); + tcp_excessive_data_without_further_acks = zeek::id::find_val("tcp_excessive_data_without_further_acks")->AsCount(); + tcp_max_old_segments = zeek::id::find_val("tcp_max_old_segments")->AsCount(); - non_analyzed_lifetime = zeek::id::lookup_val("non_analyzed_lifetime")->AsInterval(); - tcp_inactivity_timeout = zeek::id::lookup_val("tcp_inactivity_timeout")->AsInterval(); - udp_inactivity_timeout = zeek::id::lookup_val("udp_inactivity_timeout")->AsInterval(); - icmp_inactivity_timeout = zeek::id::lookup_val("icmp_inactivity_timeout")->AsInterval(); + non_analyzed_lifetime = zeek::id::find_val("non_analyzed_lifetime")->AsInterval(); + tcp_inactivity_timeout = zeek::id::find_val("tcp_inactivity_timeout")->AsInterval(); + udp_inactivity_timeout = zeek::id::find_val("udp_inactivity_timeout")->AsInterval(); + icmp_inactivity_timeout = zeek::id::find_val("icmp_inactivity_timeout")->AsInterval(); - tcp_storm_thresh = zeek::id::lookup_val("tcp_storm_thresh")->AsCount(); - tcp_storm_interarrival_thresh = zeek::id::lookup_val("tcp_storm_interarrival_thresh")->AsInterval(); + tcp_storm_thresh = zeek::id::find_val("tcp_storm_thresh")->AsCount(); + tcp_storm_interarrival_thresh = zeek::id::find_val("tcp_storm_interarrival_thresh")->AsInterval(); tcp_content_deliver_all_orig = - bool(zeek::id::lookup_val("tcp_content_deliver_all_orig")->AsBool()); + bool(zeek::id::find_val("tcp_content_deliver_all_orig")->AsBool()); tcp_content_deliver_all_resp = - bool(zeek::id::lookup_val("tcp_content_deliver_all_resp")->AsBool()); + bool(zeek::id::find_val("tcp_content_deliver_all_resp")->AsBool()); udp_content_deliver_all_orig = - bool(zeek::id::lookup_val("udp_content_deliver_all_orig")->AsBool()); + bool(zeek::id::find_val("udp_content_deliver_all_orig")->AsBool()); udp_content_deliver_all_resp = - bool(zeek::id::lookup_val("udp_content_deliver_all_resp")->AsBool()); + bool(zeek::id::find_val("udp_content_deliver_all_resp")->AsBool()); udp_content_delivery_ports_use_resp = - bool(zeek::id::lookup_val("udp_content_delivery_ports_use_resp")->AsBool()); + bool(zeek::id::find_val("udp_content_delivery_ports_use_resp")->AsBool()); - dns_session_timeout = zeek::id::lookup_val("dns_session_timeout")->AsInterval(); - rpc_timeout = zeek::id::lookup_val("rpc_timeout")->AsInterval(); + dns_session_timeout = zeek::id::find_val("dns_session_timeout")->AsInterval(); + rpc_timeout = zeek::id::find_val("rpc_timeout")->AsInterval(); - watchdog_interval = int(zeek::id::lookup_val("watchdog_interval")->AsInterval()); + watchdog_interval = int(zeek::id::find_val("watchdog_interval")->AsInterval()); - max_timer_expires = zeek::id::lookup_val("max_timer_expires")->AsCount(); + max_timer_expires = zeek::id::find_val("max_timer_expires")->AsCount(); - mime_segment_length = zeek::id::lookup_val("mime_segment_length")->AsCount(); - mime_segment_overlap_length = zeek::id::lookup_val("mime_segment_overlap_length")->AsCount(); + mime_segment_length = zeek::id::find_val("mime_segment_length")->AsCount(); + mime_segment_overlap_length = zeek::id::find_val("mime_segment_overlap_length")->AsCount(); - http_entity_data_delivery_size = zeek::id::lookup_val("http_entity_data_delivery_size")->AsCount(); - truncate_http_URI = zeek::id::lookup_val("truncate_http_URI")->AsInt(); + http_entity_data_delivery_size = zeek::id::find_val("http_entity_data_delivery_size")->AsCount(); + truncate_http_URI = zeek::id::find_val("truncate_http_URI")->AsInt(); - dns_skip_all_auth = zeek::id::lookup_val("dns_skip_all_auth")->AsBool(); - dns_skip_all_addl = zeek::id::lookup_val("dns_skip_all_addl")->AsBool(); - dns_max_queries = zeek::id::lookup_val("dns_max_queries")->AsCount(); + dns_skip_all_auth = zeek::id::find_val("dns_skip_all_auth")->AsBool(); + dns_skip_all_addl = zeek::id::find_val("dns_skip_all_addl")->AsBool(); + dns_max_queries = zeek::id::find_val("dns_max_queries")->AsCount(); stp_delta = 0.0; - if ( const auto& v = zeek::id::lookup_val("stp_delta") ) stp_delta = v->AsInterval(); + if ( const auto& v = zeek::id::find_val("stp_delta") ) stp_delta = v->AsInterval(); stp_idle_min = 0.0; - if ( const auto& v = zeek::id::lookup_val("stp_idle_min") ) stp_delta = v->AsInterval(); + if ( const auto& v = zeek::id::find_val("stp_idle_min") ) stp_delta = v->AsInterval(); orig_addr_anonymization = 0; - if ( const auto& id = zeek::id::lookup("orig_addr_anonymization") ) + if ( const auto& id = zeek::id::find("orig_addr_anonymization") ) if ( const auto& v = id->GetVal() ) orig_addr_anonymization = v->AsInt(); resp_addr_anonymization = 0; - if ( const auto& id = zeek::id::lookup("resp_addr_anonymization") ) + if ( const auto& id = zeek::id::find("resp_addr_anonymization") ) if ( const auto& v = id->GetVal() ) resp_addr_anonymization = v->AsInt(); other_addr_anonymization = 0; - if ( const auto& id = zeek::id::lookup("other_addr_anonymization") ) + if ( const auto& id = zeek::id::find("other_addr_anonymization") ) if ( const auto& v = id->GetVal() ) other_addr_anonymization = v->AsInt(); connection_status_update_interval = 0.0; - if ( const auto& id = zeek::id::lookup("connection_status_update_interval") ) + if ( const auto& id = zeek::id::find("connection_status_update_interval") ) if ( const auto& v = id->GetVal() ) connection_status_update_interval = v->AsInterval(); - expensive_profiling_multiple = zeek::id::lookup_val("expensive_profiling_multiple")->AsCount(); - profiling_interval = zeek::id::lookup_val("profiling_interval")->AsInterval(); - segment_profiling = zeek::id::lookup_val("segment_profiling")->AsBool(); + expensive_profiling_multiple = zeek::id::find_val("expensive_profiling_multiple")->AsCount(); + profiling_interval = zeek::id::find_val("profiling_interval")->AsInterval(); + segment_profiling = zeek::id::find_val("segment_profiling")->AsBool(); - pkt_profile_mode = zeek::id::lookup_val("pkt_profile_mode")->InternalInt(); - pkt_profile_freq = zeek::id::lookup_val("pkt_profile_freq")->AsDouble(); + pkt_profile_mode = zeek::id::find_val("pkt_profile_mode")->InternalInt(); + pkt_profile_freq = zeek::id::find_val("pkt_profile_freq")->AsDouble(); - load_sample_freq = zeek::id::lookup_val("load_sample_freq")->AsCount(); + load_sample_freq = zeek::id::find_val("load_sample_freq")->AsCount(); - dpd_reassemble_first_packets = zeek::id::lookup_val("dpd_reassemble_first_packets")->AsBool(); - dpd_buffer_size = zeek::id::lookup_val("dpd_buffer_size")->AsCount(); - dpd_match_only_beginning = zeek::id::lookup_val("dpd_match_only_beginning")->AsBool(); - dpd_late_match_stop = zeek::id::lookup_val("dpd_late_match_stop")->AsBool(); - dpd_ignore_ports = zeek::id::lookup_val("dpd_ignore_ports")->AsBool(); + dpd_reassemble_first_packets = zeek::id::find_val("dpd_reassemble_first_packets")->AsBool(); + dpd_buffer_size = zeek::id::find_val("dpd_buffer_size")->AsCount(); + dpd_match_only_beginning = zeek::id::find_val("dpd_match_only_beginning")->AsBool(); + dpd_late_match_stop = zeek::id::find_val("dpd_late_match_stop")->AsBool(); + dpd_ignore_ports = zeek::id::find_val("dpd_ignore_ports")->AsBool(); - timer_mgr_inactivity_timeout = zeek::id::lookup_val("timer_mgr_inactivity_timeout")->AsInterval(); + timer_mgr_inactivity_timeout = zeek::id::find_val("timer_mgr_inactivity_timeout")->AsInterval(); } diff --git a/src/Reporter.cc b/src/Reporter.cc index 77dec0c326..923d74615f 100644 --- a/src/Reporter.cc +++ b/src/Reporter.cc @@ -63,13 +63,13 @@ Reporter::~Reporter() void Reporter::InitOptions() { - info_to_stderr = zeek::id::lookup_val("Reporter::info_to_stderr")->AsBool(); - warnings_to_stderr = zeek::id::lookup_val("Reporter::warnings_to_stderr")->AsBool(); - errors_to_stderr = zeek::id::lookup_val("Reporter::errors_to_stderr")->AsBool(); - weird_sampling_rate = zeek::id::lookup_val("Weird::sampling_rate")->AsCount(); - weird_sampling_threshold = zeek::id::lookup_val("Weird::sampling_threshold")->AsCount(); - weird_sampling_duration = zeek::id::lookup_val("Weird::sampling_duration")->AsInterval(); - auto wl_val = zeek::id::lookup_val("Weird::sampling_whitelist")->AsTableVal(); + info_to_stderr = zeek::id::find_val("Reporter::info_to_stderr")->AsBool(); + warnings_to_stderr = zeek::id::find_val("Reporter::warnings_to_stderr")->AsBool(); + errors_to_stderr = zeek::id::find_val("Reporter::errors_to_stderr")->AsBool(); + weird_sampling_rate = zeek::id::find_val("Weird::sampling_rate")->AsCount(); + weird_sampling_threshold = zeek::id::find_val("Weird::sampling_threshold")->AsCount(); + weird_sampling_duration = zeek::id::find_val("Weird::sampling_duration")->AsInterval(); + auto wl_val = zeek::id::find_val("Weird::sampling_whitelist")->AsTableVal(); auto wl_table = wl_val->AsTable(); HashKey* k; diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc index 9cb335e8e0..86c5bbdb63 100644 --- a/src/RuleCondition.cc +++ b/src/RuleCondition.cc @@ -144,7 +144,7 @@ RuleConditionEval::RuleConditionEval(const char* func) if ( f->Yield()->Tag() != TYPE_BOOL ) rules_error("eval function type must yield a 'bool'", func); - static auto signature_state = zeek::id::lookup_type("signature_state"); + static auto signature_state = zeek::id::find_type("signature_state"); TypeList tl; tl.Append(signature_state); tl.Append(base_type(TYPE_STRING)); diff --git a/src/RuleMatcher.cc b/src/RuleMatcher.cc index 75baa10f9b..2e79ed185f 100644 --- a/src/RuleMatcher.cc +++ b/src/RuleMatcher.cc @@ -80,7 +80,7 @@ RuleHdrTest::RuleHdrTest(Prot arg_prot, Comp arg_comp, vector arg_v) Val* RuleMatcher::BuildRuleStateValue(const Rule* rule, const RuleEndpointState* state) const { - static auto signature_state = zeek::id::lookup_type("signature_state"); + static auto signature_state = zeek::id::find_type("signature_state"); RecordVal* val = new RecordVal(signature_state); val->Assign(0, make_intrusive(rule->ID())); val->Assign(1, state->GetAnalyzer()->ConnVal()); diff --git a/src/Sessions.cc b/src/Sessions.cc index 56a40d0964..f28f335968 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -81,7 +81,7 @@ NetSessions::NetSessions() dump_this_packet = false; num_packets_processed = 0; - static auto pkt_profile_file = zeek::id::lookup_val("pkt_profile_file"); + static auto pkt_profile_file = zeek::id::find_val("pkt_profile_file"); if ( pkt_profile_mode && pkt_profile_freq > 0 && pkt_profile_file ) pkt_profiler = new PacketProfiler(pkt_profile_mode, @@ -1219,7 +1219,7 @@ bool NetSessions::IsLikelyServerPort(uint32_t port, TransportProto proto) const if ( ! have_cache ) { - auto likely_server_ports = zeek::id::lookup_val("likely_server_ports"); + auto likely_server_ports = zeek::id::find_val("likely_server_ports"); auto lv = likely_server_ports->ToPureListVal(); for ( int i = 0; i < lv->Length(); i++ ) port_cache.insert(lv->Idx(i)->InternalUnsigned()); diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc index 3f10077f6d..6409fa2d1b 100644 --- a/src/SmithWaterman.cc +++ b/src/SmithWaterman.cc @@ -59,19 +59,19 @@ bool BroSubstring::DoesCover(const BroSubstring* bst) const VectorVal* BroSubstring::VecToPolicy(Vec* vec) { RecordType* sw_substring_type = - zeek::id::lookup_type("sw_substring")->AsRecordType(); + zeek::id::find_type("sw_substring")->AsRecordType(); if ( ! sw_substring_type ) return nullptr; RecordType* sw_align_type = - zeek::id::lookup_type("sw_align")->AsRecordType(); + zeek::id::find_type("sw_align")->AsRecordType(); if ( ! sw_align_type ) return nullptr; - auto sw_align_vec_type = zeek::id::lookup_type("sw_align_vec"); + auto sw_align_vec_type = zeek::id::find_type("sw_align_vec"); auto result = - make_intrusive(zeek::id::lookup_type("sw_substring_vec")); + make_intrusive(zeek::id::find_type("sw_substring_vec")); if ( vec ) { diff --git a/src/Stats.cc b/src/Stats.cc index 5f47644f74..2b2c187c73 100644 --- a/src/Stats.cc +++ b/src/Stats.cc @@ -342,7 +342,7 @@ SampleLogger::SampleLogger() static TableType* load_sample_info = nullptr; if ( ! load_sample_info ) - load_sample_info = zeek::id::lookup_type("load_sample_info")->AsTableType(); + load_sample_info = zeek::id::find_type("load_sample_info")->AsTableType(); load_samples = new TableVal({NewRef{}, load_sample_info}); } diff --git a/src/Stmt.cc b/src/Stmt.cc index 9dda3e1bdd..015378633a 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -201,7 +201,7 @@ static IntrusivePtr lookup_enum_val(const char* module_name, const char static void print_log(const std::vector>& vals) { auto plval = lookup_enum_val("Log", "PRINTLOG"); - auto record = make_intrusive(zeek::id::lookup_type("Log::PrintLogInfo")->AsRecordType()); + auto record = make_intrusive(zeek::id::find_type("Log::PrintLogInfo")->AsRecordType()); auto vec = make_intrusive(zeek::id::string_vec); for ( const auto& val : vals ) @@ -237,7 +237,7 @@ IntrusivePtr PrintStmt::DoExec(std::vector> vals, } static auto print_log_type = static_cast( - zeek::id::lookup_val("Log::print_to_log")->AsEnum()); + zeek::id::find_val("Log::print_to_log")->AsEnum()); switch ( print_log_type ) { case BifEnum::Log::REDIRECT_NONE: diff --git a/src/TunnelEncapsulation.h b/src/TunnelEncapsulation.h index 36933153d7..3b2a06db49 100644 --- a/src/TunnelEncapsulation.h +++ b/src/TunnelEncapsulation.h @@ -198,7 +198,7 @@ public: IntrusivePtr ToVal() const { auto vv = make_intrusive( - zeek::id::lookup_type("EncapsulatingConnVector")); + zeek::id::find_type("EncapsulatingConnVector")); if ( conns ) { diff --git a/src/Type.cc b/src/Type.cc index c7fd3cdbaa..17c2dad221 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -796,8 +796,8 @@ static string container_type_name(const BroType* ft) IntrusivePtr RecordType::GetRecordFieldsVal(const RecordVal* rv) const { - static auto record_field = zeek::id::lookup_type("record_field"); - static auto record_field_table = zeek::id::lookup_type("record_field_table"); + static auto record_field = zeek::id::find_type("record_field"); + static auto record_field_table = zeek::id::find_type("record_field_table"); auto rval = make_intrusive(record_field_table); for ( int i = 0; i < NumFields(); ++i ) diff --git a/src/Val.cc b/src/Val.cc index e721f42dc0..94ee1ebca7 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -411,7 +411,7 @@ bool Val::WouldOverflow(const BroType* from_type, const BroType* to_type, const IntrusivePtr Val::GetRecordFields() { - static auto record_field_table = zeek::id::lookup_type("record_field_table"); + static auto record_field_table = zeek::id::find_type("record_field_table"); auto t = GetType().get(); if ( t->Tag() != TYPE_RECORD && t->Tag() != TYPE_TYPE ) @@ -1931,7 +1931,7 @@ IntrusivePtr TableVal::LookupSubnets(const SubNetVal* search) if ( ! subnets ) reporter->InternalError("LookupSubnets called on wrong table type"); - auto result = make_intrusive(zeek::id::lookup_type("subnet_vec")); + auto result = make_intrusive(zeek::id::find_type("subnet_vec")); auto matches = subnets->FindAll(search); for ( auto element : matches ) diff --git a/src/Var.cc b/src/Var.cc index a58a1dbe4c..73f0944c5e 100644 --- a/src/Var.cc +++ b/src/Var.cc @@ -658,7 +658,7 @@ void end_func(IntrusivePtr body) Val* internal_val(const char* name) { - return zeek::id::lookup_val(name).get(); + return zeek::id::find_val(name).get(); } id_list gather_outer_ids(Scope* scope, Stmt* body) @@ -683,7 +683,7 @@ id_list gather_outer_ids(Scope* scope, Stmt* body) Val* internal_const_val(const char* name) { - return zeek::id::lookup_const(name).get(); + return zeek::id::find_const(name).get(); } Val* opt_internal_val(const char* name) @@ -761,12 +761,12 @@ ListVal* internal_list_val(const char* name) BroType* internal_type(const char* name) { - return zeek::id::lookup_type(name).get(); + return zeek::id::find_type(name).get(); } Func* internal_func(const char* name) { - const auto& v = zeek::id::lookup_val(name); + const auto& v = zeek::id::find_val(name); if ( v ) return v->AsFunc(); diff --git a/src/Var.h b/src/Var.h index 49a60e32e3..67d8928639 100644 --- a/src/Var.h +++ b/src/Var.h @@ -40,37 +40,37 @@ extern void end_func(IntrusivePtr body); // Gather all IDs referenced inside a body that aren't part of a given scope. extern id_list gather_outer_ids(Scope* scope, Stmt* body); -[[deprecated("Remove in v4.1. Use zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find_val().")]] extern Val* internal_val(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup_const().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find_const().")]] extern Val* internal_const_val(const char* name); // internal error if not const -[[deprecated("Remove in v4.1. Use zeek::id::lookup() or zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] extern Val* opt_internal_val(const char* name); // returns nil if not defined -[[deprecated("Remove in v4.1. Use zeek::id::lookup() or zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] extern double opt_internal_double(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup() or zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] extern bro_int_t opt_internal_int(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup() or zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] extern bro_uint_t opt_internal_unsigned(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup() or zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] extern StringVal* opt_internal_string(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup() or zeek::id::lookup_val().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find() or zeek::id::find_val().")]] extern TableVal* opt_internal_table(const char* name); // nil if not defined -[[deprecated("Remove in v4.1. Use zeek::id::lookup(), zeek::id::lookup_val(), and/or TableVal::ToPureListVal().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find(), zeek::id::find_val(), and/or TableVal::ToPureListVal().")]] extern ListVal* internal_list_val(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup_type().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find_type().")]] extern BroType* internal_type(const char* name); -[[deprecated("Remove in v4.1. Use zeek::id::lookup_func().")]] +[[deprecated("Remove in v4.1. Use zeek::id::find_func().")]] extern Func* internal_func(const char* name); [[deprecated("Remove in v4.1. Use event_registry->Register().")]] diff --git a/src/analyzer/Manager.cc b/src/analyzer/Manager.cc index 9e339280da..2925f012cb 100644 --- a/src/analyzer/Manager.cc +++ b/src/analyzer/Manager.cc @@ -438,8 +438,8 @@ bool Manager::BuildInitialAnalyzerTree(Connection* conn) if ( tcp_contents && ! reass ) { - static auto tcp_content_delivery_ports_orig = zeek::id::lookup_val("tcp_content_delivery_ports_orig"); - static auto tcp_content_delivery_ports_resp = zeek::id::lookup_val("tcp_content_delivery_ports_resp"); + static auto tcp_content_delivery_ports_orig = zeek::id::find_val("tcp_content_delivery_ports_orig"); + static auto tcp_content_delivery_ports_resp = zeek::id::find_val("tcp_content_delivery_ports_resp"); const auto& dport = val_mgr->Port(ntohs(conn->RespPort()), TRANSPORT_TCP); if ( ! reass ) @@ -462,7 +462,7 @@ bool Manager::BuildInitialAnalyzerTree(Connection* conn) uint16_t resp_port = ntohs(conn->RespPort()); if ( resp_port == 22 || resp_port == 23 || resp_port == 513 ) { - static auto stp_skip_src = zeek::id::lookup_val("stp_skip_src"); + static auto stp_skip_src = zeek::id::find_val("stp_skip_src"); AddrVal src(conn->OrigAddr()); if ( ! stp_skip_src->Lookup(&src) ) diff --git a/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc b/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc index 5c8f56b148..5f35156fef 100644 --- a/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc +++ b/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc @@ -27,15 +27,15 @@ BitTorrentTracker_Analyzer::BitTorrentTracker_Analyzer(Connection* c) if ( ! bt_tracker_headers ) { bt_tracker_headers = - zeek::id::lookup_type("bt_tracker_headers")->AsTableType(); + zeek::id::find_type("bt_tracker_headers")->AsTableType(); bittorrent_peer = - zeek::id::lookup_type("bittorrent_peer")->AsRecordType(); + zeek::id::find_type("bittorrent_peer")->AsRecordType(); bittorrent_peer_set = - zeek::id::lookup_type("bittorrent_peer_set")->AsTableType(); + zeek::id::find_type("bittorrent_peer_set")->AsTableType(); bittorrent_benc_value = - zeek::id::lookup_type("bittorrent_benc_value")->AsRecordType(); + zeek::id::find_type("bittorrent_benc_value")->AsRecordType(); bittorrent_benc_dir = - zeek::id::lookup_type("bittorrent_benc_dir")->AsTableType(); + zeek::id::find_type("bittorrent_benc_dir")->AsTableType(); } keep_alive = false; diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 12d6dc4f1b..d2283a31b1 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -91,8 +91,8 @@ void DNS_Interpreter::ParseMessage(const u_char* data, int len, int is_query) int skip_addl = dns_skip_all_addl; if ( msg.ancount > 0 ) { // We did an answer, so can potentially skip auth/addl. - static auto dns_skip_auth = zeek::id::lookup_val("dns_skip_auth"); - static auto dns_skip_addl = zeek::id::lookup_val("dns_skip_addl"); + static auto dns_skip_auth = zeek::id::find_val("dns_skip_auth"); + static auto dns_skip_addl = zeek::id::find_val("dns_skip_addl"); skip_auth = skip_auth || msg.nscount == 0 || dns_skip_auth->Lookup(&server); @@ -595,7 +595,7 @@ bool DNS_Interpreter::ParseRR_SOA(DNS_MsgInfo* msg, if ( dns_SOA_reply && ! msg->skip_event ) { - static auto dns_soa = zeek::id::lookup_type("dns_soa"); + static auto dns_soa = zeek::id::find_type("dns_soa"); auto r = make_intrusive(dns_soa); r->Assign(0, make_intrusive(new BroString(mname, mname_end - mname, true))); r->Assign(1, make_intrusive(new BroString(rname, rname_end - rname, true))); @@ -1439,7 +1439,7 @@ DNS_MsgInfo::DNS_MsgInfo(DNS_RawMsgHdr* hdr, int arg_is_query) IntrusivePtr DNS_MsgInfo::BuildHdrVal() { - static auto dns_msg = zeek::id::lookup_type("dns_msg"); + static auto dns_msg = zeek::id::find_type("dns_msg"); auto r = make_intrusive(dns_msg); r->Assign(0, val_mgr->Count(id)); @@ -1461,7 +1461,7 @@ IntrusivePtr DNS_MsgInfo::BuildHdrVal() IntrusivePtr DNS_MsgInfo::BuildAnswerVal() { - static auto dns_answer = zeek::id::lookup_type("dns_answer"); + static auto dns_answer = zeek::id::find_type("dns_answer"); auto r = make_intrusive(dns_answer); r->Assign(0, val_mgr->Count(int(answer_type))); @@ -1477,7 +1477,7 @@ IntrusivePtr DNS_MsgInfo::BuildEDNS_Val() { // We have to treat the additional record type in EDNS differently // than a regular resource record. - static auto dns_edns_additional = zeek::id::lookup_type("dns_edns_additional"); + static auto dns_edns_additional = zeek::id::find_type("dns_edns_additional"); auto r = make_intrusive(dns_edns_additional); r->Assign(0, val_mgr->Count(int(answer_type))); @@ -1511,7 +1511,7 @@ IntrusivePtr DNS_MsgInfo::BuildEDNS_Val() IntrusivePtr DNS_MsgInfo::BuildTSIG_Val(struct TSIG_DATA* tsig) { - static auto dns_tsig_additional = zeek::id::lookup_type("dns_tsig_additional"); + static auto dns_tsig_additional = zeek::id::find_type("dns_tsig_additional"); auto r = make_intrusive(dns_tsig_additional); double rtime = tsig->time_s + tsig->time_ms / 1000.0; @@ -1531,7 +1531,7 @@ IntrusivePtr DNS_MsgInfo::BuildTSIG_Val(struct TSIG_DATA* tsig) IntrusivePtr DNS_MsgInfo::BuildRRSIG_Val(RRSIG_DATA* rrsig) { - static auto dns_rrsig_rr = zeek::id::lookup_type("dns_rrsig_rr"); + static auto dns_rrsig_rr = zeek::id::find_type("dns_rrsig_rr"); auto r = make_intrusive(dns_rrsig_rr); r->Assign(0, query_name); @@ -1552,7 +1552,7 @@ IntrusivePtr DNS_MsgInfo::BuildRRSIG_Val(RRSIG_DATA* rrsig) IntrusivePtr DNS_MsgInfo::BuildDNSKEY_Val(DNSKEY_DATA* dnskey) { - static auto dns_dnskey_rr = zeek::id::lookup_type("dns_dnskey_rr"); + static auto dns_dnskey_rr = zeek::id::find_type("dns_dnskey_rr"); auto r = make_intrusive(dns_dnskey_rr); r->Assign(0, query_name); @@ -1568,7 +1568,7 @@ IntrusivePtr DNS_MsgInfo::BuildDNSKEY_Val(DNSKEY_DATA* dnskey) IntrusivePtr DNS_MsgInfo::BuildNSEC3_Val(NSEC3_DATA* nsec3) { - static auto dns_nsec3_rr = zeek::id::lookup_type("dns_nsec3_rr"); + static auto dns_nsec3_rr = zeek::id::find_type("dns_nsec3_rr"); auto r = make_intrusive(dns_nsec3_rr); r->Assign(0, query_name); @@ -1588,7 +1588,7 @@ IntrusivePtr DNS_MsgInfo::BuildNSEC3_Val(NSEC3_DATA* nsec3) IntrusivePtr DNS_MsgInfo::BuildDS_Val(DS_DATA* ds) { - static auto dns_ds_rr = zeek::id::lookup_type("dns_ds_rr"); + static auto dns_ds_rr = zeek::id::find_type("dns_ds_rr"); auto r = make_intrusive(dns_ds_rr); r->Assign(0, query_name); diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index 875f371a43..e2cc88b465 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -615,7 +615,7 @@ HTTP_Message::~HTTP_Message() IntrusivePtr HTTP_Message::BuildMessageStat(bool interrupted, const char* msg) { - static auto http_message_stat = zeek::id::lookup_type("http_message_stat"); + static auto http_message_stat = zeek::id::find_type("http_message_stat"); auto stat = make_intrusive(http_message_stat); int field = 0; stat->Assign(field++, make_intrusive(start_time, TYPE_TIME)); @@ -1152,7 +1152,7 @@ void HTTP_Analyzer::GenStats() { if ( http_stats ) { - static auto http_stats_rec = zeek::id::lookup_type("http_stats_rec"); + static auto http_stats_rec = zeek::id::find_type("http_stats_rec"); auto r = make_intrusive(http_stats_rec); r->Assign(0, val_mgr->Count(num_requests)); r->Assign(1, val_mgr->Count(num_replies)); diff --git a/src/analyzer/protocol/icmp/ICMP.cc b/src/analyzer/protocol/icmp/ICMP.cc index 947efce0db..efb6068bd2 100644 --- a/src/analyzer/protocol/icmp/ICMP.cc +++ b/src/analyzer/protocol/icmp/ICMP.cc @@ -225,7 +225,7 @@ ICMP_Analyzer::BuildICMPVal(const struct icmp* icmpp, int len, { if ( ! icmp_conn_val ) { - static auto icmp_conn = zeek::id::lookup_type("icmp_conn"); + static auto icmp_conn = zeek::id::find_type("icmp_conn"); icmp_conn_val = make_intrusive(icmp_conn); icmp_conn_val->Assign(0, make_intrusive(Conn()->OrigAddr())); @@ -351,7 +351,7 @@ IntrusivePtr ICMP_Analyzer::ExtractICMP4Context(int len, const u_char } } - static auto icmp_context = zeek::id::lookup_type("icmp_context"); + static auto icmp_context = zeek::id::find_type("icmp_context"); auto iprec = make_intrusive(icmp_context); auto id_val = make_intrusive(zeek::id::conn_id); @@ -411,7 +411,7 @@ IntrusivePtr ICMP_Analyzer::ExtractICMP6Context(int len, const u_char } } - static auto icmp_context = zeek::id::lookup_type("icmp_context"); + static auto icmp_context = zeek::id::find_type("icmp_context"); auto iprec = make_intrusive(icmp_context); auto id_val = make_intrusive(zeek::id::conn_id); @@ -729,13 +729,13 @@ IntrusivePtr ICMP_Analyzer::BuildNDOptionsVal(int caplen, const u_cha if ( ! icmp6_nd_option_type ) { - icmp6_nd_option_type = zeek::id::lookup_type("icmp6_nd_option")->AsRecordType(); + icmp6_nd_option_type = zeek::id::find_type("icmp6_nd_option")->AsRecordType(); icmp6_nd_prefix_info_type = - zeek::id::lookup_type("icmp6_nd_prefix_info")->AsRecordType(); + zeek::id::find_type("icmp6_nd_prefix_info")->AsRecordType(); } auto vv = make_intrusive( - zeek::id::lookup_type("icmp6_nd_options")); + zeek::id::find_type("icmp6_nd_options")); while ( caplen > 0 ) { diff --git a/src/analyzer/protocol/irc/IRC.cc b/src/analyzer/protocol/irc/IRC.cc index 1bab5d6c5d..ba73af3ec6 100644 --- a/src/analyzer/protocol/irc/IRC.cc +++ b/src/analyzer/protocol/irc/IRC.cc @@ -44,8 +44,8 @@ inline void IRC_Analyzer::SkipLeadingWhitespace(string& str) void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) { - static auto irc_join_list = zeek::id::lookup_type("irc_join_list"); - static auto irc_join_info = zeek::id::lookup_type("irc_join_info"); + static auto irc_join_list = zeek::id::find_type("irc_join_list"); + static auto irc_join_info = zeek::id::find_type("irc_join_info"); tcp::TCP_ApplicationAnalyzer::DeliverStream(length, line, orig); if ( starttls ) diff --git a/src/analyzer/protocol/krb/krb-padata.pac b/src/analyzer/protocol/krb/krb-padata.pac index 7f77d5db0d..a3c5d55741 100644 --- a/src/analyzer/protocol/krb/krb-padata.pac +++ b/src/analyzer/protocol/krb/krb-padata.pac @@ -13,7 +13,7 @@ VectorVal* proc_padata(const KRB_PA_Data_Sequence* data, const BroAnalyzer bro_a %code{ VectorVal* proc_padata(const KRB_PA_Data_Sequence* data, const BroAnalyzer bro_analyzer, bool is_error) { - auto vv = make_intrusive(zeek::id::lookup_type("KRB::Type_Value_Vector")); + auto vv = make_intrusive(zeek::id::find_type("KRB::Type_Value_Vector")); if ( ! data->data()->has_padata() ) return vv.release(); diff --git a/src/analyzer/protocol/krb/krb-types.pac b/src/analyzer/protocol/krb/krb-types.pac index e7163596b2..4a53fca79e 100644 --- a/src/analyzer/protocol/krb/krb-types.pac +++ b/src/analyzer/protocol/krb/krb-types.pac @@ -35,7 +35,7 @@ VectorVal* proc_cipher_list(const Array* list) VectorVal* proc_host_address_list(const BroAnalyzer a, const KRB_Host_Addresses* list) { - auto addrs = make_intrusive(zeek::id::lookup_type("KRB::Host_Address_Vector")); + auto addrs = make_intrusive(zeek::id::find_type("KRB::Host_Address_Vector")); for ( uint i = 0; i < list->addresses()->size(); ++i ) { @@ -94,7 +94,7 @@ RecordVal* proc_host_address(const BroAnalyzer a, const KRB_Host_Address* addr) IntrusivePtr proc_tickets(const KRB_Ticket_Sequence* list) { - auto tickets = make_intrusive(zeek::id::lookup_type("KRB::Ticket_Vector")); + auto tickets = make_intrusive(zeek::id::find_type("KRB::Ticket_Vector")); for ( uint i = 0; i < list->tickets()->size(); ++i ) { diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index 56fb7d1188..63d9c12541 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -45,13 +45,13 @@ Login_Analyzer::Login_Analyzer(const char* name, Connection* conn) if ( ! re_skip_authentication ) { - IntrusivePtr skip_authentication = zeek::id::lookup_val("skip_authentication")->AsTableVal()->ToPureListVal(); - IntrusivePtr direct_login_prompts = zeek::id::lookup_val("direct_login_prompts")->AsTableVal()->ToPureListVal(); - IntrusivePtr login_prompts = zeek::id::lookup_val("login_prompts")->AsTableVal()->ToPureListVal(); - IntrusivePtr login_non_failure_msgs = zeek::id::lookup_val("login_non_failure_msgs")->AsTableVal()->ToPureListVal(); - IntrusivePtr login_failure_msgs = zeek::id::lookup_val("login_failure_msgs")->AsTableVal()->ToPureListVal(); - IntrusivePtr login_success_msgs = zeek::id::lookup_val("login_success_msgs")->AsTableVal()->ToPureListVal(); - IntrusivePtr login_timeouts = zeek::id::lookup_val("login_timeouts")->AsTableVal()->ToPureListVal(); + IntrusivePtr skip_authentication = zeek::id::find_val("skip_authentication")->AsTableVal()->ToPureListVal(); + IntrusivePtr direct_login_prompts = zeek::id::find_val("direct_login_prompts")->AsTableVal()->ToPureListVal(); + IntrusivePtr login_prompts = zeek::id::find_val("login_prompts")->AsTableVal()->ToPureListVal(); + IntrusivePtr login_non_failure_msgs = zeek::id::find_val("login_non_failure_msgs")->AsTableVal()->ToPureListVal(); + IntrusivePtr login_failure_msgs = zeek::id::find_val("login_failure_msgs")->AsTableVal()->ToPureListVal(); + IntrusivePtr login_success_msgs = zeek::id::find_val("login_success_msgs")->AsTableVal()->ToPureListVal(); + IntrusivePtr login_timeouts = zeek::id::find_val("login_timeouts")->AsTableVal()->ToPureListVal(); #ifdef USE_PERFTOOLS_DEBUG HeapLeakChecker::Disabler disabler; diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index e181666488..95d23bbad9 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -1289,7 +1289,7 @@ void MIME_Entity::DebugPrintHeaders() IntrusivePtr MIME_Message::BuildHeaderVal(MIME_Header* h) { - static auto mime_header_rec = zeek::id::lookup_type("mime_header_rec"); + static auto mime_header_rec = zeek::id::find_type("mime_header_rec"); auto header_record = make_intrusive(mime_header_rec); header_record->Assign(0, new_string_val(h->get_name())); auto upper_hn = new_string_val(h->get_name()); @@ -1301,7 +1301,7 @@ IntrusivePtr MIME_Message::BuildHeaderVal(MIME_Header* h) IntrusivePtr MIME_Message::BuildHeaderTable(MIME_HeaderList& hlist) { - static auto mime_header_list = zeek::id::lookup_type("mime_header_list"); + static auto mime_header_list = zeek::id::find_type("mime_header_list"); auto t = make_intrusive(mime_header_list); for ( unsigned int i = 0; i < hlist.size(); ++i ) diff --git a/src/analyzer/protocol/mqtt/commands/publish.pac b/src/analyzer/protocol/mqtt/commands/publish.pac index ea8e60198e..d8211be638 100644 --- a/src/analyzer/protocol/mqtt/commands/publish.pac +++ b/src/analyzer/protocol/mqtt/commands/publish.pac @@ -31,7 +31,7 @@ refine flow MQTT_Flow += { reinterpret_cast(${msg.topic.str}.begin()))); auto len = ${msg.payload}.length(); - static auto max_payload_size = zeek::id::lookup("MQTT::max_payload_size"); + static auto max_payload_size = zeek::id::find("MQTT::max_payload_size"); auto max = max_payload_size->GetVal()->AsCount(); if ( len > static_cast(max) ) diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc index f185e4f67e..4c1c0ffb6c 100644 --- a/src/analyzer/protocol/rpc/Portmap.cc +++ b/src/analyzer/protocol/rpc/Portmap.cc @@ -138,7 +138,7 @@ bool PortmapperInterp::RPC_BuildReply(RPC_CallInfo* c, BifEnum::rpc_status statu event = success ? pm_request_dump : pm_attempt_dump; if ( success ) { - static auto pm_mappings = zeek::id::lookup_type("pm_mappings"); + static auto pm_mappings = zeek::id::find_type("pm_mappings"); TableVal* mappings = new TableVal(pm_mappings); uint32_t nmap = 0; @@ -194,7 +194,7 @@ bool PortmapperInterp::RPC_BuildReply(RPC_CallInfo* c, BifEnum::rpc_status statu Val* PortmapperInterp::ExtractMapping(const u_char*& buf, int& len) { - static auto pm_mapping = zeek::id::lookup_type("pm_mapping"); + static auto pm_mapping = zeek::id::find_type("pm_mapping"); RecordVal* mapping = new RecordVal(pm_mapping); mapping->Assign(0, val_mgr->Count(extract_XDR_uint32(buf, len))); @@ -215,7 +215,7 @@ Val* PortmapperInterp::ExtractMapping(const u_char*& buf, int& len) Val* PortmapperInterp::ExtractPortRequest(const u_char*& buf, int& len) { - static auto pm_port_request = zeek::id::lookup_type("pm_port_request"); + static auto pm_port_request = zeek::id::find_type("pm_port_request"); RecordVal* pr = new RecordVal(pm_port_request); pr->Assign(0, val_mgr->Count(extract_XDR_uint32(buf, len))); @@ -236,7 +236,7 @@ Val* PortmapperInterp::ExtractPortRequest(const u_char*& buf, int& len) Val* PortmapperInterp::ExtractCallItRequest(const u_char*& buf, int& len) { - static auto pm_callit_request = zeek::id::lookup_type("pm_callit_request"); + static auto pm_callit_request = zeek::id::find_type("pm_callit_request"); RecordVal* c = new RecordVal(pm_callit_request); c->Assign(0, val_mgr->Count(extract_XDR_uint32(buf, len))); diff --git a/src/analyzer/protocol/sip/sip-analyzer.pac b/src/analyzer/protocol/sip/sip-analyzer.pac index 39b465ab7a..91f4db8723 100644 --- a/src/analyzer/protocol/sip/sip-analyzer.pac +++ b/src/analyzer/protocol/sip/sip-analyzer.pac @@ -67,7 +67,7 @@ refine flow SIP_Flow += { function build_sip_headers_val(): BroVal %{ - static auto mime_header_list = zeek::id::lookup_type("mime_header_list"); + static auto mime_header_list = zeek::id::find_type("mime_header_list"); TableVal* t = new TableVal(mime_header_list); for ( unsigned int i = 0; i < headers.size(); ++i ) @@ -102,7 +102,7 @@ refine flow SIP_Flow += { function build_sip_header_val(name: const_bytestring, value: const_bytestring): BroVal %{ - static auto mime_header_rec = zeek::id::lookup_type("mime_header_rec"); + static auto mime_header_rec = zeek::id::find_type("mime_header_rec"); RecordVal* header_record = new RecordVal(mime_header_rec); IntrusivePtr name_val; diff --git a/src/analyzer/protocol/socks/socks-analyzer.pac b/src/analyzer/protocol/socks/socks-analyzer.pac index b347e42263..fe45150215 100644 --- a/src/analyzer/protocol/socks/socks-analyzer.pac +++ b/src/analyzer/protocol/socks/socks-analyzer.pac @@ -24,7 +24,7 @@ refine connection SOCKS_Conn += { %{ if ( socks_request ) { - static auto socks_address = zeek::id::lookup_type("SOCKS::Address"); + static auto socks_address = zeek::id::find_type("SOCKS::Address"); auto sa = make_intrusive(socks_address); sa->Assign(0, make_intrusive(htonl(${request.addr}))); @@ -49,7 +49,7 @@ refine connection SOCKS_Conn += { %{ if ( socks_reply ) { - static auto socks_address = zeek::id::lookup_type("SOCKS::Address"); + static auto socks_address = zeek::id::find_type("SOCKS::Address"); auto sa = make_intrusive(socks_address); sa->Assign(0, make_intrusive(htonl(${reply.addr}))); @@ -82,7 +82,7 @@ refine connection SOCKS_Conn += { return false; } - static auto socks_address = zeek::id::lookup_type("SOCKS::Address"); + static auto socks_address = zeek::id::find_type("SOCKS::Address"); auto sa = make_intrusive(socks_address); // This is dumb and there must be a better way (checking for presence of a field)... @@ -122,7 +122,7 @@ refine connection SOCKS_Conn += { function socks5_reply(reply: SOCKS5_Reply): bool %{ - static auto socks_address = zeek::id::lookup_type("SOCKS::Address"); + static auto socks_address = zeek::id::find_type("SOCKS::Address"); auto sa = make_intrusive(socks_address); // This is dumb and there must be a better way (checking for presence of a field)... diff --git a/src/analyzer/protocol/ssl/tls-handshake-analyzer.pac b/src/analyzer/protocol/ssl/tls-handshake-analyzer.pac index 6a8a97f7c8..ca7801c395 100644 --- a/src/analyzer/protocol/ssl/tls-handshake-analyzer.pac +++ b/src/analyzer/protocol/ssl/tls-handshake-analyzer.pac @@ -155,7 +155,7 @@ refine connection Handshake_Conn += { if ( ! ssl_extension_signature_algorithm ) return true; - auto slist = make_intrusive(zeek::id::lookup_type("signature_and_hashalgorithm_vec")); + auto slist = make_intrusive(zeek::id::find_type("signature_and_hashalgorithm_vec")); if ( supported_signature_algorithms ) { @@ -492,7 +492,7 @@ refine connection Handshake_Conn += { if ( ! ssl_extension_pre_shared_key_server_hello ) return true; - auto slist = make_intrusive(zeek::id::lookup_type("psk_identity_vec")); + auto slist = make_intrusive(zeek::id::find_type("psk_identity_vec")); if ( identities && identities->identities() ) { diff --git a/src/analyzer/protocol/tcp/TCP.cc b/src/analyzer/protocol/tcp/TCP.cc index 6233c3a0ad..3c30638692 100644 --- a/src/analyzer/protocol/tcp/TCP.cc +++ b/src/analyzer/protocol/tcp/TCP.cc @@ -107,7 +107,7 @@ static RecordVal* build_syn_packet_val(bool is_orig, const IP_Hdr* ip, options += opt_len; } - static auto SYN_packet = zeek::id::lookup_type("SYN_packet"); + static auto SYN_packet = zeek::id::find_type("SYN_packet"); RecordVal* v = new RecordVal(SYN_packet); v->Assign(0, val_mgr->Bool(is_orig)); @@ -2078,7 +2078,7 @@ bool TCPStats_Endpoint::DataSent(double /* t */, uint64_t seq, int len, int capl RecordVal* TCPStats_Endpoint::BuildStats() { - static auto endpoint_stats = zeek::id::lookup_type("endpoint_stats"); + static auto endpoint_stats = zeek::id::find_type("endpoint_stats"); RecordVal* stats = new RecordVal(endpoint_stats); stats->Assign(0, val_mgr->Count(num_pkts)); diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.cc b/src/analyzer/protocol/tcp/TCP_Reassembler.cc index 1b251cfa10..9ff61bf66a 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.cc +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.cc @@ -42,8 +42,8 @@ TCP_Reassembler::TCP_Reassembler(analyzer::Analyzer* arg_dst_analyzer, if ( ::tcp_contents ) { - static auto tcp_content_delivery_ports_orig = zeek::id::lookup_val("tcp_content_delivery_ports_orig"); - static auto tcp_content_delivery_ports_resp = zeek::id::lookup_val("tcp_content_delivery_ports_resp"); + static auto tcp_content_delivery_ports_orig = zeek::id::find_val("tcp_content_delivery_ports_orig"); + static auto tcp_content_delivery_ports_resp = zeek::id::find_val("tcp_content_delivery_ports_resp"); const auto& dst_port_val = val_mgr->Port(ntohs(tcp_analyzer->Conn()->RespPort()), TRANSPORT_TCP); const auto& ports = IsOrig() ? diff --git a/src/analyzer/protocol/teredo/Teredo.cc b/src/analyzer/protocol/teredo/Teredo.cc index d5e8790fe3..05bcdf2f35 100644 --- a/src/analyzer/protocol/teredo/Teredo.cc +++ b/src/analyzer/protocol/teredo/Teredo.cc @@ -104,9 +104,9 @@ IntrusivePtr TeredoEncapsulation::BuildVal(const IP_Hdr* inner) const if ( ! teredo_hdr_type ) { - teredo_hdr_type = zeek::id::lookup_type("teredo_hdr")->AsRecordType(); - teredo_auth_type = zeek::id::lookup_type("teredo_auth")->AsRecordType(); - teredo_origin_type = zeek::id::lookup_type("teredo_origin")->AsRecordType(); + teredo_hdr_type = zeek::id::find_type("teredo_hdr")->AsRecordType(); + teredo_auth_type = zeek::id::find_type("teredo_auth")->AsRecordType(); + teredo_origin_type = zeek::id::find_type("teredo_origin")->AsRecordType(); } auto teredo_hdr = make_intrusive(teredo_hdr_type); diff --git a/src/analyzer/protocol/udp/UDP.cc b/src/analyzer/protocol/udp/UDP.cc index 518050a1c7..a68cd531ab 100644 --- a/src/analyzer/protocol/udp/UDP.cc +++ b/src/analyzer/protocol/udp/UDP.cc @@ -134,9 +134,9 @@ void UDP_Analyzer::DeliverPacket(int len, const u_char* data, bool is_orig, if ( udp_contents ) { - static auto udp_content_ports = zeek::id::lookup_val("udp_content_ports"); - static auto udp_content_delivery_ports_orig = zeek::id::lookup_val("udp_content_delivery_ports_orig"); - static auto udp_content_delivery_ports_resp = zeek::id::lookup_val("udp_content_delivery_ports_resp"); + static auto udp_content_ports = zeek::id::find_val("udp_content_ports"); + static auto udp_content_delivery_ports_orig = zeek::id::find_val("udp_content_delivery_ports_orig"); + static auto udp_content_delivery_ports_resp = zeek::id::find_val("udp_content_delivery_ports_resp"); bool do_udp_contents = false; const auto& sport_val = val_mgr->Port(ntohs(up->uh_sport), TRANSPORT_UDP); const auto& dport_val = val_mgr->Port(ntohs(up->uh_dport), TRANSPORT_UDP); diff --git a/src/broker/Data.cc b/src/broker/Data.cc index b2fa59152d..6cce2f625c 100644 --- a/src/broker/Data.cc +++ b/src/broker/Data.cc @@ -1154,7 +1154,7 @@ IntrusivePtr bro_broker::DataVal::castTo(BroType* t) BroType* bro_broker::DataVal::ScriptDataType() { if ( ! script_data_type ) - script_data_type = zeek::id::lookup_type("Broker::Data").get(); + script_data_type = zeek::id::find_type("Broker::Data").get(); return script_data_type; } diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index ac90d2a342..c6939849a7 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -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::id::lookup_type("Log::ID")->AsEnumType(); - writer_id_type = zeek::id::lookup_type("Log::Writer")->AsEnumType(); + log_id_type = zeek::id::find_type("Log::ID")->AsEnumType(); + writer_id_type = zeek::id::find_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(zeek::id::lookup_type("Broker::Data")); + vector_of_data_type = make_intrusive(zeek::id::find_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::id::lookup_type("Broker::EndpointInfo")->AsRecordType(); + auto ei = zeek::id::find_type("Broker::EndpointInfo")->AsRecordType(); auto endpoint_info = make_intrusive(ei); if ( ctx ) { endpoint_info->Assign(0, make_intrusive(to_string(ctx->node))); - auto ni = zeek::id::lookup_type("Broker::NetworkInfo")->AsRecordType(); + auto ni = zeek::id::find_type("Broker::NetworkInfo")->AsRecordType(); auto network_info = make_intrusive(ni); if ( ctx->network ) diff --git a/src/broker/Store.cc b/src/broker/Store.cc index a996923d75..0e6bf5b4f6 100644 --- a/src/broker/Store.cc +++ b/src/broker/Store.cc @@ -15,7 +15,7 @@ EnumVal* query_status(bool success) if ( ! store_query_status ) { - store_query_status = zeek::id::lookup_type("Broker::QueryStatus")->AsEnumType(); + store_query_status = zeek::id::find_type("Broker::QueryStatus")->AsEnumType(); success_val = store_query_status->Lookup("Broker", "SUCCESS"); failure_val = store_query_status->Lookup("Broker", "FAILURE"); } diff --git a/src/broker/comm.bif b/src/broker/comm.bif index 77f29830af..796ba003c5 100644 --- a/src/broker/comm.bif +++ b/src/broker/comm.bif @@ -94,14 +94,14 @@ function Broker::__unpeer%(a: string, p: port%): bool function Broker::__peers%(%): PeerInfos %{ bro_broker::Manager::ScriptScopeGuard ssg; - auto rval = make_intrusive(zeek::id::lookup_type("Broker::PeerInfos")); + auto rval = make_intrusive(zeek::id::find_type("Broker::PeerInfos")); auto i = 0; for ( auto& p : broker_mgr->Peers() ) { - auto pi = zeek::id::lookup_type("Broker::PeerInfo")->AsRecordType(); - auto ei = zeek::id::lookup_type("Broker::EndpointInfo")->AsRecordType(); - auto ni = zeek::id::lookup_type("Broker::NetworkInfo")->AsRecordType(); + auto pi = zeek::id::find_type("Broker::PeerInfo")->AsRecordType(); + auto ei = zeek::id::find_type("Broker::EndpointInfo")->AsRecordType(); + auto ni = zeek::id::find_type("Broker::NetworkInfo")->AsRecordType(); auto peer_info = new RecordVal(pi); auto endpoint_info = new RecordVal(ei); auto network_info = new RecordVal(ni); diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc index 85934166aa..2975025a4a 100644 --- a/src/file_analysis/Manager.cc +++ b/src/file_analysis/Manager.cc @@ -431,7 +431,7 @@ string Manager::GetFileID(const analyzer::Tag& tag, Connection* c, bool is_orig) bool Manager::IsDisabled(const analyzer::Tag& tag) { if ( ! disabled ) - disabled = zeek::id::lookup_const("Files::disable")->AsTableVal(); + disabled = zeek::id::find_const("Files::disable")->AsTableVal(); auto index = val_mgr->Count(bool(tag)); auto yield = disabled->Lookup(index.get()); @@ -498,8 +498,8 @@ string Manager::DetectMIME(const u_char* data, uint64_t len) const IntrusivePtr file_analysis::GenMIMEMatchesVal(const RuleMatcher::MIME_Matches& m) { - static auto mime_matches = zeek::id::lookup_type("mime_matches"); - static auto mime_match = zeek::id::lookup_type("mime_match"); + static auto mime_matches = zeek::id::find_type("mime_matches"); + static auto mime_match = zeek::id::find_type("mime_match"); auto rval = make_intrusive(mime_matches); for ( RuleMatcher::MIME_Matches::const_iterator it = m.begin(); diff --git a/src/file_analysis/analyzer/entropy/Entropy.cc b/src/file_analysis/analyzer/entropy/Entropy.cc index c2a35b27cb..7eb2dc17ec 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.cc +++ b/src/file_analysis/analyzer/entropy/Entropy.cc @@ -60,7 +60,7 @@ void Entropy::Finalize() montepi = scc = ent = mean = chisq = 0.0; entropy->Get(&ent, &chisq, &mean, &montepi, &scc); - static auto entropy_test_result = zeek::id::lookup_type("entropy_test_result"); + static auto entropy_test_result = zeek::id::find_type("entropy_test_result"); auto ent_result = make_intrusive(entropy_test_result); ent_result->Assign(0, make_intrusive(ent, TYPE_DOUBLE)); ent_result->Assign(1, make_intrusive(chisq, TYPE_DOUBLE)); diff --git a/src/file_analysis/analyzer/x509/OCSP.cc b/src/file_analysis/analyzer/x509/OCSP.cc index 568837216e..5bd8a8a3c3 100644 --- a/src/file_analysis/analyzer/x509/OCSP.cc +++ b/src/file_analysis/analyzer/x509/OCSP.cc @@ -634,7 +634,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPONSE *resp) //ocsp_resp_record->Assign(7, make_intrusive(len, buf)); //BIO_reset(bio); - certs_vector = new VectorVal(zeek::id::lookup_type("x509_opaque_vector")); + certs_vector = new VectorVal(zeek::id::find_type("x509_opaque_vector")); vl.emplace_back(AdoptRef{}, certs_vector); #if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER) diff --git a/src/file_analysis/analyzer/x509/X509.cc b/src/file_analysis/analyzer/x509/X509.cc index a3c3e00136..9c5fe8a6d9 100644 --- a/src/file_analysis/analyzer/x509/X509.cc +++ b/src/file_analysis/analyzer/x509/X509.cc @@ -391,7 +391,7 @@ void file_analysis::X509::ParseSAN(X509_EXTENSION* ext) else if ( gen->type == GEN_IPADD ) { if ( ips == nullptr ) - ips = new VectorVal(zeek::id::lookup_type("addr_vec")); + ips = new VectorVal(zeek::id::find_type("addr_vec")); uint32_t* addr = (uint32_t*) gen->d.ip->data; diff --git a/src/file_analysis/analyzer/x509/functions.bif b/src/file_analysis/analyzer/x509/functions.bif index 5cf3fe0e1b..aba1042da7 100644 --- a/src/file_analysis/analyzer/x509/functions.bif +++ b/src/file_analysis/analyzer/x509/functions.bif @@ -556,7 +556,7 @@ function x509_verify%(certs: x509_opaque_vector, root_certs: table_string_of_str } int num_certs = sk_X509_num(chain); - chainVector = new VectorVal(zeek::id::lookup_type("x509_opaque_vector")); + chainVector = new VectorVal(zeek::id::find_type("x509_opaque_vector")); for ( int i = 0; i < num_certs; i++ ) { diff --git a/src/iosource/Packet.cc b/src/iosource/Packet.cc index 616de91fcc..45aaf02072 100644 --- a/src/iosource/Packet.cc +++ b/src/iosource/Packet.cc @@ -594,8 +594,8 @@ void Packet::ProcessLayer2() IntrusivePtr Packet::ToRawPktHdrVal() const { - static auto raw_pkt_hdr_type = zeek::id::lookup_type("raw_pkt_hdr"); - static auto l2_hdr_type = zeek::id::lookup_type("l2_hdr"); + static auto raw_pkt_hdr_type = zeek::id::find_type("raw_pkt_hdr"); + static auto l2_hdr_type = zeek::id::find_type("l2_hdr"); auto pkt_hdr = make_intrusive(raw_pkt_hdr_type); RecordVal* l2_hdr = new RecordVal(l2_hdr_type); diff --git a/src/legacy-netvar-init.cc b/src/legacy-netvar-init.cc index 926fff6ae9..f5f7ee52f0 100644 --- a/src/legacy-netvar-init.cc +++ b/src/legacy-netvar-init.cc @@ -12,69 +12,69 @@ void zeek_legacy_netvar_init() ::connection_type = zeek::id::connection.get(); ::fa_file_type = zeek::id::fa_file.get(); ::fa_metadata_type = zeek::id::fa_metadata.get(); - ::icmp_conn = zeek::id::lookup_type("icmp_conn")->AsRecordType(); - ::icmp_context = zeek::id::lookup_type("icmp_context")->AsRecordType(); - ::signature_state = zeek::id::lookup_type("signature_state")->AsRecordType(); - ::SYN_packet = zeek::id::lookup_type("SYN_packet")->AsRecordType(); - ::pcap_packet = zeek::id::lookup_type("pcap_packet")->AsRecordType(); - ::raw_pkt_hdr_type = zeek::id::lookup_type("raw_pkt_hdr")->AsRecordType(); - ::l2_hdr_type = zeek::id::lookup_type("l2_hdr")->AsRecordType(); + ::icmp_conn = zeek::id::find_type("icmp_conn")->AsRecordType(); + ::icmp_context = zeek::id::find_type("icmp_context")->AsRecordType(); + ::signature_state = zeek::id::find_type("signature_state")->AsRecordType(); + ::SYN_packet = zeek::id::find_type("SYN_packet")->AsRecordType(); + ::pcap_packet = zeek::id::find_type("pcap_packet")->AsRecordType(); + ::raw_pkt_hdr_type = zeek::id::find_type("raw_pkt_hdr")->AsRecordType(); + ::l2_hdr_type = zeek::id::find_type("l2_hdr")->AsRecordType(); ::transport_proto = zeek::id::transport_proto.get(); ::string_set = zeek::id::string_set.get(); ::string_array = zeek::id::string_array.get(); ::count_set = zeek::id::count_set.get(); ::string_vec = zeek::id::string_vec.get(); ::index_vec = zeek::id::index_vec.get(); - ::mime_matches = zeek::id::lookup_type("mime_matches")->AsVectorType(); - ::mime_match = zeek::id::lookup_type("mime_match")->AsRecordType(); - ::socks_address = zeek::id::lookup_type("SOCKS::Address")->AsRecordType(); - ::mime_header_rec = zeek::id::lookup_type("mime_header_rec")->AsRecordType(); - ::mime_header_list = zeek::id::lookup_type("mime_header_list")->AsTableType(); - ::http_stats_rec = zeek::id::lookup_type("http_stats_rec")->AsRecordType(); - ::http_message_stat = zeek::id::lookup_type("http_message_stat")->AsRecordType(); - ::pm_mapping = zeek::id::lookup_type("pm_mapping")->AsRecordType(); - ::pm_mappings = zeek::id::lookup_type("pm_mappings")->AsTableType(); - ::pm_port_request = zeek::id::lookup_type("pm_port_request")->AsRecordType(); - ::pm_callit_request = zeek::id::lookup_type("pm_callit_request")->AsRecordType(); - ::geo_location = zeek::id::lookup_type("geo_location")->AsRecordType(); - ::entropy_test_result = zeek::id::lookup_type("entropy_test_result")->AsRecordType(); - ::dns_msg = zeek::id::lookup_type("dns_msg")->AsRecordType(); - ::dns_answer = zeek::id::lookup_type("dns_answer")->AsRecordType(); - ::dns_soa = zeek::id::lookup_type("dns_soa")->AsRecordType(); - ::dns_edns_additional = zeek::id::lookup_type("dns_edns_additional")->AsRecordType(); - ::dns_tsig_additional = zeek::id::lookup_type("dns_tsig_additional")->AsRecordType(); - ::dns_rrsig_rr = zeek::id::lookup_type("dns_rrsig_rr")->AsRecordType(); - ::dns_dnskey_rr = zeek::id::lookup_type("dns_dnskey_rr")->AsRecordType(); - ::dns_nsec3_rr = zeek::id::lookup_type("dns_nsec3_rr")->AsRecordType(); - ::dns_ds_rr = zeek::id::lookup_type("dns_ds_rr")->AsRecordType(); - ::rotate_info = zeek::id::lookup_type("rotate_info")->AsRecordType(); - ::irc_join_list = zeek::id::lookup_type("irc_join_list")->AsTableType(); - ::irc_join_info = zeek::id::lookup_type("irc_join_info")->AsRecordType(); - ::script_id = zeek::id::lookup_type("script_id")->AsRecordType(); - ::id_table = zeek::id::lookup_type("id_table")->AsTableType(); - ::record_field = zeek::id::lookup_type("record_field")->AsRecordType(); - ::record_field_table = zeek::id::lookup_type("record_field_table")->AsTableType(); - ::call_argument = zeek::id::lookup_type("call_argument")->AsRecordType(); - ::call_argument_vector = zeek::id::lookup_type("call_argument_vector")->AsVectorType(); + ::mime_matches = zeek::id::find_type("mime_matches")->AsVectorType(); + ::mime_match = zeek::id::find_type("mime_match")->AsRecordType(); + ::socks_address = zeek::id::find_type("SOCKS::Address")->AsRecordType(); + ::mime_header_rec = zeek::id::find_type("mime_header_rec")->AsRecordType(); + ::mime_header_list = zeek::id::find_type("mime_header_list")->AsTableType(); + ::http_stats_rec = zeek::id::find_type("http_stats_rec")->AsRecordType(); + ::http_message_stat = zeek::id::find_type("http_message_stat")->AsRecordType(); + ::pm_mapping = zeek::id::find_type("pm_mapping")->AsRecordType(); + ::pm_mappings = zeek::id::find_type("pm_mappings")->AsTableType(); + ::pm_port_request = zeek::id::find_type("pm_port_request")->AsRecordType(); + ::pm_callit_request = zeek::id::find_type("pm_callit_request")->AsRecordType(); + ::geo_location = zeek::id::find_type("geo_location")->AsRecordType(); + ::entropy_test_result = zeek::id::find_type("entropy_test_result")->AsRecordType(); + ::dns_msg = zeek::id::find_type("dns_msg")->AsRecordType(); + ::dns_answer = zeek::id::find_type("dns_answer")->AsRecordType(); + ::dns_soa = zeek::id::find_type("dns_soa")->AsRecordType(); + ::dns_edns_additional = zeek::id::find_type("dns_edns_additional")->AsRecordType(); + ::dns_tsig_additional = zeek::id::find_type("dns_tsig_additional")->AsRecordType(); + ::dns_rrsig_rr = zeek::id::find_type("dns_rrsig_rr")->AsRecordType(); + ::dns_dnskey_rr = zeek::id::find_type("dns_dnskey_rr")->AsRecordType(); + ::dns_nsec3_rr = zeek::id::find_type("dns_nsec3_rr")->AsRecordType(); + ::dns_ds_rr = zeek::id::find_type("dns_ds_rr")->AsRecordType(); + ::rotate_info = zeek::id::find_type("rotate_info")->AsRecordType(); + ::irc_join_list = zeek::id::find_type("irc_join_list")->AsTableType(); + ::irc_join_info = zeek::id::find_type("irc_join_info")->AsRecordType(); + ::script_id = zeek::id::find_type("script_id")->AsRecordType(); + ::id_table = zeek::id::find_type("id_table")->AsTableType(); + ::record_field = zeek::id::find_type("record_field")->AsRecordType(); + ::record_field_table = zeek::id::find_type("record_field_table")->AsTableType(); + ::call_argument = zeek::id::find_type("call_argument")->AsRecordType(); + ::call_argument_vector = zeek::id::find_type("call_argument_vector")->AsVectorType(); - ::log_rotate_base_time = zeek::id::lookup_val("log_rotate_base_time")->AsStringVal(); - ::pkt_profile_file = zeek::id::lookup_val("pkt_profile_file").get(); - ::likely_server_ports = zeek::id::lookup_val("likely_server_ports")->AsTableVal(); - ::tcp_content_delivery_ports_orig = zeek::id::lookup_val("tcp_content_delivery_ports_orig")->AsTableVal(); - ::tcp_content_delivery_ports_resp = zeek::id::lookup_val("tcp_content_delivery_ports_resp")->AsTableVal(); - ::stp_skip_src = zeek::id::lookup_val("stp_skip_src")->AsTableVal(); - ::dns_skip_auth = zeek::id::lookup_val("dns_skip_auth")->AsTableVal(); - ::dns_skip_addl = zeek::id::lookup_val("dns_skip_addl")->AsTableVal(); - ::udp_content_ports = zeek::id::lookup_val("udp_content_ports")->AsTableVal(); - ::udp_content_delivery_ports_orig = zeek::id::lookup_val("udp_content_delivery_ports_orig")->AsTableVal(); - ::udp_content_delivery_ports_resp = zeek::id::lookup_val("udp_content_delivery_ports_resp")->AsTableVal(); - ::profiling_file = zeek::id::lookup_val("profiling_file").get(); - ::global_hash_seed = zeek::id::lookup_val("global_hash_seed")->AsStringVal(); - ::tcp_reassembler_ports_orig = zeek::id::lookup_val("tcp_reassembler_ports_orig")->AsTableVal(); - ::tcp_reassembler_ports_resp = zeek::id::lookup_val("tcp_reassembler_ports_resp")->AsTableVal(); - ::peer_description = zeek::id::lookup_val("peer_description")->AsStringVal(); - ::trace_output_file = zeek::id::lookup_val("trace_output_file")->AsStringVal(); - ::cmd_line_bpf_filter = zeek::id::lookup_val("cmd_line_bpf_filter")->AsStringVal(); + ::log_rotate_base_time = zeek::id::find_val("log_rotate_base_time")->AsStringVal(); + ::pkt_profile_file = zeek::id::find_val("pkt_profile_file").get(); + ::likely_server_ports = zeek::id::find_val("likely_server_ports")->AsTableVal(); + ::tcp_content_delivery_ports_orig = zeek::id::find_val("tcp_content_delivery_ports_orig")->AsTableVal(); + ::tcp_content_delivery_ports_resp = zeek::id::find_val("tcp_content_delivery_ports_resp")->AsTableVal(); + ::stp_skip_src = zeek::id::find_val("stp_skip_src")->AsTableVal(); + ::dns_skip_auth = zeek::id::find_val("dns_skip_auth")->AsTableVal(); + ::dns_skip_addl = zeek::id::find_val("dns_skip_addl")->AsTableVal(); + ::udp_content_ports = zeek::id::find_val("udp_content_ports")->AsTableVal(); + ::udp_content_delivery_ports_orig = zeek::id::find_val("udp_content_delivery_ports_orig")->AsTableVal(); + ::udp_content_delivery_ports_resp = zeek::id::find_val("udp_content_delivery_ports_resp")->AsTableVal(); + ::profiling_file = zeek::id::find_val("profiling_file").get(); + ::global_hash_seed = zeek::id::find_val("global_hash_seed")->AsStringVal(); + ::tcp_reassembler_ports_orig = zeek::id::find_val("tcp_reassembler_ports_orig")->AsTableVal(); + ::tcp_reassembler_ports_resp = zeek::id::find_val("tcp_reassembler_ports_resp")->AsTableVal(); + ::peer_description = zeek::id::find_val("peer_description")->AsStringVal(); + ::trace_output_file = zeek::id::find_val("trace_output_file")->AsStringVal(); + ::cmd_line_bpf_filter = zeek::id::find_val("cmd_line_bpf_filter")->AsStringVal(); auto anon_id = global_scope()->Lookup("preserve_orig_addr"); diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc index fae52407df..e351ee2fe3 100644 --- a/src/logging/Manager.cc +++ b/src/logging/Manager.cc @@ -313,7 +313,7 @@ bool Manager::CreateStream(EnumVal* id, RecordVal* sval) streams[idx]->event = event ? event_registry->Lookup(event->Name()) : nullptr; streams[idx]->columns = columns->Ref()->AsRecordType(); - streams[idx]->enable_remote = zeek::id::lookup_val("Log::enable_remote_logging")->AsBool(); + streams[idx]->enable_remote = zeek::id::find_val("Log::enable_remote_logging")->AsBool(); DBG_LOG(DBG_LOGGING, "Created new logging stream '%s', raising event %s", streams[idx]->name.c_str(), event ? streams[idx]->event->Name() : ""); @@ -1193,7 +1193,7 @@ WriterFrontend* Manager::CreateWriter(EnumVal* id, EnumVal* writer, WriterBacken // Still need to set the WriterInfo's rotation parameters, which we // computed above. - static auto log_rotate_base_time = zeek::id::lookup_val("log_rotate_base_time"); + static auto log_rotate_base_time = zeek::id::find_val("log_rotate_base_time"); static auto base_time = log_rotate_base_time->AsString()->CheckString(); winfo->info->rotation_interval = winfo->interval; @@ -1276,7 +1276,7 @@ bool Manager::WriteFromRemote(EnumVal* id, EnumVal* writer, const string& path, void Manager::SendAllWritersTo(const broker::endpoint_info& ei) { - auto et = zeek::id::lookup_type("Log::Writer")->AsEnumType(); + auto et = zeek::id::find_type("Log::Writer")->AsEnumType(); for ( vector::iterator s = streams.begin(); s != streams.end(); ++s ) { @@ -1453,7 +1453,7 @@ void Manager::InstallRotationTimer(WriterInfo* winfo) if ( ! winfo->open_time ) winfo->open_time = network_time; - static auto log_rotate_base_time = zeek::id::lookup_val("log_rotate_base_time"); + static auto log_rotate_base_time = zeek::id::find_val("log_rotate_base_time"); static auto base_time = log_rotate_base_time->AsString()->CheckString(); double base = parse_rotate_base_time(base_time); diff --git a/src/probabilistic/Hasher.cc b/src/probabilistic/Hasher.cc index 805e927a46..d1765c4fdf 100644 --- a/src/probabilistic/Hasher.cc +++ b/src/probabilistic/Hasher.cc @@ -23,7 +23,7 @@ Hasher::seed_t Hasher::MakeSeed(const void* data, size_t size) assert(sizeof(tmpseed) == 16); - static auto global_hash_seed = zeek::id::lookup_val("global_hash_seed"); + static auto global_hash_seed = zeek::id::find_val("global_hash_seed"); if ( data ) hash_update(ctx, data, size); diff --git a/src/stats.bif b/src/stats.bif index 8451a6ed21..314f0b3de2 100644 --- a/src/stats.bif +++ b/src/stats.bif @@ -470,7 +470,7 @@ function get_reporter_stats%(%): ReporterStats auto r = make_intrusive(ReporterStats); int n = 0; - auto weirds_by_type = make_intrusive(zeek::id::lookup_type("table_string_of_count")); + auto weirds_by_type = make_intrusive(zeek::id::find_type("table_string_of_count")); for ( auto& kv : reporter->GetWeirdsByType() ) { diff --git a/src/strings.bif b/src/strings.bif index 17e57a279b..1390534d25 100644 --- a/src/strings.bif +++ b/src/strings.bif @@ -204,7 +204,7 @@ static IntrusivePtr do_split_string(StringVal* str_val, int max_num_sep) { // string_vec is used early in the version script - do not use the NetVar. - auto rval = make_intrusive(zeek::id::lookup_type("string_vec")); + auto rval = make_intrusive(zeek::id::find_type("string_vec")); const u_char* s = str_val->Bytes(); int n = str_val->Len(); const u_char* end_of_s = s + n; diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index d995971d32..14cf82fe25 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -361,7 +361,7 @@ static std::vector get_script_signature_files() // Parse rule files defined on the script level. char* script_signature_files = - copy_string(zeek::id::lookup_val("signature_files")->AsString()->CheckString()); + copy_string(zeek::id::find_val("signature_files")->AsString()->CheckString()); char* tmp = script_signature_files; char* s; @@ -722,7 +722,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv, if ( ! options.pcap_file && ! options.interface ) { - const auto& interfaces_val = zeek::id::lookup_val("interfaces"); + const auto& interfaces_val = zeek::id::find_val("interfaces"); if ( interfaces_val ) { char* interfaces_str = @@ -780,7 +780,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv, if ( profiling_interval > 0 ) { - const auto& profiling_file = zeek::id::lookup_val("profiling_file"); + const auto& profiling_file = zeek::id::find_val("profiling_file"); profiling_logger = new ProfileLogger(profiling_file->AsFile(), profiling_interval); diff --git a/src/zeek.bif b/src/zeek.bif index a61ffd55a4..96c68189a9 100644 --- a/src/zeek.bif +++ b/src/zeek.bif @@ -1051,7 +1051,7 @@ function find_entropy%(data: string%): entropy_test_result e.Feed(data->Bytes(), data->Len()); e.Get(&ent, &chisq, &mean, &montepi, &scc); - static auto entropy_test_result = zeek::id::lookup_type("entropy_test_result"); + static auto entropy_test_result = zeek::id::find_type("entropy_test_result"); auto ent_result = make_intrusive(entropy_test_result); ent_result->Assign(0, make_intrusive(ent, TYPE_DOUBLE)); ent_result->Assign(1, make_intrusive(chisq, TYPE_DOUBLE)); @@ -1103,7 +1103,7 @@ function entropy_test_finish%(handle: opaque of entropy%): entropy_test_result montepi = scc = ent = mean = chisq = 0.0; static_cast(handle)->Get(&ent, &chisq, &mean, &montepi, &scc); - static auto entropy_test_result = zeek::id::lookup_type("entropy_test_result"); + static auto entropy_test_result = zeek::id::find_type("entropy_test_result"); auto ent_result = make_intrusive(entropy_test_result); ent_result->Assign(0, make_intrusive(ent, TYPE_DOUBLE)); ent_result->Assign(1, make_intrusive(chisq, TYPE_DOUBLE)); @@ -1826,7 +1826,7 @@ function record_type_to_vector%(rt: string%): string_vec %{ auto result = make_intrusive(zeek::id::string_vec); - RecordType* type = zeek::id::lookup_type(rt->CheckString())->AsRecordType(); + RecordType* type = zeek::id::find_type(rt->CheckString())->AsRecordType(); for ( int i = 0; i < type->NumFields(); ++i ) result->Assign(i+1, make_intrusive(type->FieldName(i))); @@ -1891,7 +1891,7 @@ function reading_traces%(%): bool ## .. zeek:see:: reading_live_traffic reading_traces function packet_source%(%): PacketSource %{ - auto ps_type = zeek::id::lookup_type("PacketSource")->AsRecordType(); + auto ps_type = zeek::id::find_type("PacketSource")->AsRecordType(); auto ps = iosource_mgr->GetPktSrc(); auto r = make_intrusive(ps_type); @@ -1941,14 +1941,14 @@ function global_sizes%(%): var_sizes ## .. zeek:see:: global_sizes function global_ids%(%): id_table %{ - static auto id_table = zeek::id::lookup_type("id_table"); + static auto id_table = zeek::id::find_type("id_table"); auto ids = make_intrusive(id_table); const auto& globals = global_scope()->Vars(); for ( const auto& global : globals ) { ID* id = global.second.get(); - static auto script_id = zeek::id::lookup_type("script_id"); + static auto script_id = zeek::id::find_type("script_id"); auto rec = make_intrusive(script_id); rec->Assign(0, make_intrusive(type_name(id->GetType()->Tag()))); rec->Assign(1, val_mgr->Bool(id->IsExport())); @@ -1994,7 +1994,7 @@ function lookup_ID%(id: string%) : any ## Returns: A table that describes the fields of a record. function record_fields%(rec: any%): record_field_table %{ - static auto record_field_table = zeek::id::lookup_type("record_field_table"); + static auto record_field_table = zeek::id::find_type("record_field_table"); if ( rec->GetType()->Tag() == TYPE_STRING ) { @@ -2189,7 +2189,7 @@ function is_v6_subnet%(s: subnet%): bool ## Returns: The vector of addresses contained in the routing header data. function routing0_data_to_addrs%(s: string%): addr_vec %{ - auto rval = make_intrusive(zeek::id::lookup_type("addr_vec")); + auto rval = make_intrusive(zeek::id::find_type("addr_vec")); int len = s->Len(); const u_char* bytes = s->Bytes(); @@ -3385,7 +3385,7 @@ function dump_current_packet%(file_name: string%) : bool ## .. zeek:see:: dump_current_packet dump_packet function get_current_packet%(%) : pcap_packet %{ - static auto pcap_packet = zeek::id::lookup_type("pcap_packet"); + static auto pcap_packet = zeek::id::find_type("pcap_packet"); const Packet* p; auto pkt = make_intrusive(pcap_packet); @@ -3427,7 +3427,7 @@ function get_current_packet_header%(%) : raw_pkt_hdr return p->ToRawPktHdrVal(); } - static auto raw_pkt_hdr_type = zeek::id::lookup_type("raw_pkt_hdr"); + static auto raw_pkt_hdr_type = zeek::id::find_type("raw_pkt_hdr"); auto hdr = make_intrusive(raw_pkt_hdr_type); return hdr; %} @@ -3998,7 +3998,7 @@ function mmdb_open_asn_db%(f: string%) : bool ## .. zeek:see:: lookup_asn function lookup_location%(a: addr%) : geo_location %{ - static auto geo_location = zeek::id::lookup_type("geo_location"); + static auto geo_location = zeek::id::find_type("geo_location"); auto location = make_intrusive(geo_location); #ifdef USE_GEOIP @@ -4630,7 +4630,7 @@ function rotate_file%(f: file%): rotate_info return info; // Record indicating error. - static auto rotate_info = zeek::id::lookup_type("rotate_info"); + static auto rotate_info = zeek::id::find_type("rotate_info"); info = make_intrusive(rotate_info); info->Assign(0, val_mgr->EmptyString()); info->Assign(1, val_mgr->EmptyString()); @@ -4650,7 +4650,7 @@ function rotate_file%(f: file%): rotate_info ## .. zeek:see:: rotate_file calc_next_rotate function rotate_file_by_name%(f: string%): rotate_info %{ - static auto rotate_info = zeek::id::lookup_type("rotate_info"); + static auto rotate_info = zeek::id::find_type("rotate_info"); auto info = make_intrusive(rotate_info); bool is_pkt_dumper = false; @@ -4705,7 +4705,7 @@ function rotate_file_by_name%(f: string%): rotate_info ## .. zeek:see:: rotate_file rotate_file_by_name function calc_next_rotate%(i: interval%) : interval %{ - static auto log_rotate_base_time = zeek::id::lookup_val("log_rotate_base_time"); + static auto log_rotate_base_time = zeek::id::find_val("log_rotate_base_time"); static auto base_time = log_rotate_base_time->AsString()->CheckString(); double base = parse_rotate_base_time(base_time);