Reintroduce info when overriding packet analyzer mappings.

In #2464 the warning when overriding a packet analyzer mapping was
removed. While a warning seems indeed excessive, some info would still
be nice to have.
This commit is contained in:
Jan Grashoefer 2023-03-30 16:19:39 +02:00
parent 136d54a68e
commit bfa466f2eb
3 changed files with 24 additions and 0 deletions

View file

@ -52,6 +52,10 @@ void Dispatcher::Register(uint32_t identifier, AnalyzerPtr analyzer)
} }
int64_t index = identifier - lowest_identifier; int64_t index = identifier - lowest_identifier;
if ( table[index] != nullptr )
reporter->Info("Overwriting packet analyzer mapping %#8" PRIx64 " => %s with %s",
index + lowest_identifier, table[index]->GetAnalyzerName(),
analyzer->GetAnalyzerName());
table[index] = std::move(analyzer); table[index] = std::move(analyzer);
} }

View file

@ -0,0 +1,11 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
#separator \x09
#set_separator ,
#empty_field (empty)
#unset_field -
#path reporter
#open XXXX-XX-XX-XX-XX-XX
#fields ts level message location
#types time enum string string
XXXXXXXXXX.XXXXXX Reporter::INFO Overwriting packet analyzer mapping 0x800 => IP with SKIP (empty)
#close XXXX-XX-XX-XX-XX-XX

View file

@ -0,0 +1,9 @@
# @TEST-EXEC: zeek -b %INPUT
# @TEST-EXEC: btest-diff reporter.log
redef PacketAnalyzer::SKIP::skip_bytes: count = 0;
event zeek_init()
{
PacketAnalyzer::register_packet_analyzer(PacketAnalyzer::ANALYZER_ETHERNET, 0x0800, PacketAnalyzer::ANALYZER_SKIP);
}