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

Deprecate TableVal::Lookup(), replace with Find()/FindOrDefault()

Browse source
This commit is contained in:
Jon Siwek 2020-05-20 18:00:50 -07:00
parent b85cfc6fe4
commit 85a0ddd62d
17 changed files with 105 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/file_analysis/File.cc
View file

@ -140,7 +140,7 @@ bool File::UpdateConnectionFields(Connection* conn, bool is_orig)
auto idx = get_conn_id_val(conn);
if ( conns->AsTableVal()->Lookup(idx.get()) )
if ( conns->AsTableVal()->FindOrDefault(idx) )
return false;
conns->AsTableVal()->Assign(std::move(idx), conn->ConnVal());

2
src/file_analysis/Manager.cc
View file

@ -434,7 +434,7 @@ bool Manager::IsDisabled(const analyzer::Tag& tag)
disabled = zeek::id::find_const("Files::disable")->AsTableVal();
auto index = val_mgr->Count(bool(tag));
auto yield = disabled->Lookup(index.get());
auto yield = disabled->FindOrDefault(index);
if ( ! yield )
return false;

9
src/file_analysis/analyzer/x509/X509.cc
View file

@ -51,7 +51,8 @@ bool file_analysis::X509::EndOfFile()
hash_final(ctx, buf);
std::string cert_sha256 = sha256_digest_print(buf);
auto index = make_intrusive<StringVal>(cert_sha256);
auto entry = certificate_cache->Lookup(index.get(), false);
const auto& entry = certificate_cache->Find(index);
if ( entry )
// in this case, the certificate is in the cache and we do not
// do any further processing here. However, if there is a callback, we execute it.
@ -61,8 +62,7 @@ bool file_analysis::X509::EndOfFile()
// yup, let's call the callback.
cache_hit_callback->Call(IntrusivePtr{NewRef{}, GetFile()->GetVal()},
std::move(entry),
make_intrusive<StringVal>(cert_sha256));
entry, make_intrusive<StringVal>(cert_sha256));
return false;
}
}
@ -250,7 +250,8 @@ X509_STORE* file_analysis::X509::GetRootStore(TableVal* root_certs)
for ( int i = 0; i < idxs->Length(); ++i )
{
const auto& key = idxs->Idx(i);
StringVal *sv = root_certs->Lookup(key.get())->AsStringVal();
auto val = root_certs->FindOrDefault(key);
StringVal* sv = val->AsStringVal();
assert(sv);
const uint8_t* data = sv->Bytes();
::X509* x = d2i_X509(NULL, &data, sv->Len());