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

Use type aliases for IntrusivePtr definitions

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:46:34 -04:00
parent f6a251cdac
commit ec9eff0bd5
180 changed files with 2026 additions and 1893 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/file_analysis/analyzer/unified2/Unified2.cc
View file

@ -5,7 +5,7 @@
using namespace file_analysis;
Unified2::Unified2(zeek::IntrusivePtr<RecordVal> args, File* file)
Unified2::Unified2(RecordValPtr args, File* file)
: file_analysis::Analyzer(file_mgr->GetComponentTag("UNIFIED2"), std::move(args), file)
{
interp = new binpac::Unified2::Unified2_Analyzer(this);
@ -16,7 +16,7 @@ Unified2::~Unified2()
delete interp;
}
file_analysis::Analyzer* Unified2::Instantiate(zeek::IntrusivePtr<RecordVal> args, File* file)
file_analysis::Analyzer* Unified2::Instantiate(RecordValPtr args, File* file)
{
return new Unified2(std::move(args), file);
}

5
src/file_analysis/analyzer/unified2/Unified2.h
View file

@ -20,11 +20,10 @@ public:
bool DeliverStream(const u_char* data, uint64_t len) override;
static file_analysis::Analyzer* Instantiate(zeek::IntrusivePtr<RecordVal> args,
File* file);
static file_analysis::Analyzer* Instantiate(RecordValPtr args, File* file);
protected:
Unified2(zeek::IntrusivePtr<RecordVal> args, File* file);
Unified2(RecordValPtr args, File* file);
private:
binpac::Unified2::Unified2_Analyzer* interp;

8
src/file_analysis/analyzer/unified2/unified2-analyzer.pac
View file

@ -8,7 +8,7 @@
%}
%code{
zeek::IntrusivePtr<AddrVal> binpac::Unified2::Flow::unified2_addr_to_bro_addr(std::vector<uint32_t>* a)
AddrValPtr binpac::Unified2::Flow::unified2_addr_to_bro_addr(std::vector<uint32_t>* a)
{
if ( a->size() == 1 )
{
@ -26,7 +26,7 @@ zeek::IntrusivePtr<AddrVal> binpac::Unified2::Flow::unified2_addr_to_bro_addr(st
}
}
zeek::IntrusivePtr<Val> binpac::Unified2::Flow::to_port(uint16_t n, uint8_t p)
ValPtr binpac::Unified2::Flow::to_port(uint16_t n, uint8_t p)
{
TransportProto proto = TRANSPORT_UNKNOWN;
switch ( p ) {
@ -42,8 +42,8 @@ zeek::IntrusivePtr<Val> binpac::Unified2::Flow::to_port(uint16_t n, uint8_t p)
refine flow Flow += {
%member{
zeek::IntrusivePtr<AddrVal> unified2_addr_to_bro_addr(std::vector<uint32_t>* a);
zeek::IntrusivePtr<Val> to_port(uint16_t n, uint8_t p);
AddrValPtr unified2_addr_to_bro_addr(std::vector<uint32_t>* a);
ValPtr to_port(uint16_t n, uint8_t p);
%}
%init{