Move IntrusivePtr and utility methods to the zeek namespace

This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:40:00 -04:00
parent 4668378d91
commit 9364e6a5b7
255 changed files with 3761 additions and 3730 deletions

View file

@ -592,12 +592,12 @@ void Packet::ProcessLayer2()
hdr_size = (pdata - data);
}
IntrusivePtr<RecordVal> Packet::ToRawPktHdrVal() const
zeek::IntrusivePtr<RecordVal> Packet::ToRawPktHdrVal() const
{
static auto raw_pkt_hdr_type = zeek::id::find_type<zeek::RecordType>("raw_pkt_hdr");
static auto l2_hdr_type = zeek::id::find_type<zeek::RecordType>("l2_hdr");
auto pkt_hdr = make_intrusive<RecordVal>(raw_pkt_hdr_type);
auto l2_hdr = make_intrusive<RecordVal>(l2_hdr_type);
auto pkt_hdr = zeek::make_intrusive<RecordVal>(raw_pkt_hdr_type);
auto l2_hdr = zeek::make_intrusive<RecordVal>(l2_hdr_type);
bool is_ethernet = link_type == DLT_EN10MB;
@ -674,12 +674,12 @@ RecordVal* Packet::BuildPktHdrVal() const
return ToRawPktHdrVal().release();
}
IntrusivePtr<Val> Packet::FmtEUI48(const u_char* mac) const
zeek::IntrusivePtr<Val> Packet::FmtEUI48(const u_char* mac) const
{
char buf[20];
snprintf(buf, sizeof buf, "%02x:%02x:%02x:%02x:%02x:%02x",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
return make_intrusive<StringVal>(buf);
return zeek::make_intrusive<StringVal>(buf);
}
void Packet::Describe(ODesc* d) const