Remove packet_analysis/Defines.h

- Replace uses of identifier_t with uint32_t
- Replace repeated usage of tuple type for Analysis results with type alias
This commit is contained in:
Tim Wojtulewicz 2020-07-16 13:52:04 -07:00
parent b46e600775
commit c2500d03d6
42 changed files with 66 additions and 80 deletions

View file

@ -10,7 +10,7 @@ Bar::Bar()
{
}
std::tuple<zeek::packet_analysis::AnalyzerResult, zeek::packet_analysis::identifier_t> Bar::Analyze(Packet* packet)
zeek::packet_analysis::AnalysisResultTuple Bar::Analyze(Packet* packet)
{
auto& pdata = packet->cur_pos;
auto end_of_data = packet->GetEndOfData();
@ -31,5 +31,5 @@ std::tuple<zeek::packet_analysis::AnalyzerResult, zeek::packet_analysis::identif
val_mgr->Count(ssap),
val_mgr->Count(control));
return std::make_tuple(AnalyzerResult::Terminate, 0);
return { AnalyzerResult::Terminate, 0 };
}

View file

@ -10,7 +10,7 @@ public:
Bar();
~Bar() override = default;
std::tuple<AnalyzerResult, identifier_t> Analyze(Packet* packet) override;
AnalysisResultTuple Analyze(Packet* packet) override;
static AnalyzerPtr Instantiate()
{