Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 15:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adjust for zeek namespace.

Browse source
This commit is contained in:
ronwellman 2020-07-06 15:34:01 -04:00
parent e7146c2a6b
commit b17ec6bf93
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/analyzer/protocol/dns/DNS.cc
View file

@ -720,7 +720,7 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
{ {
case TYPE_ECS: case TYPE_ECS:
{ {
struct EDNS_ECS opt; EDNS_ECS opt{};
uint16_t ecs_family = ExtractShort(data, option_len); uint16_t ecs_family = ExtractShort(data, option_len);
uint16_t source_scope = ExtractShort(data, option_len); uint16_t source_scope = ExtractShort(data, option_len);
opt.ecs_src_pfx_len = (source_scope >> 8) & 0xff; opt.ecs_src_pfx_len = (source_scope >> 8) & 0xff;
@ -732,7 +732,7 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
// padding with 0 bits to pad to the end of the last octet needed. // padding with 0 bits to pad to the end of the last octet needed.
if ( ecs_family == L3_IPV4 ) if ( ecs_family == L3_IPV4 )
{ {
opt.ecs_family = make_intrusive<StringVal>("v4"); opt.ecs_family = zeek::make_intrusive<zeek::StringVal>("v4");
uint32_t addr = 0; uint32_t addr = 0;
for (uint16_t shift_factor = 3; option_len > 0; option_len--) for (uint16_t shift_factor = 3; option_len > 0; option_len--)
{ {
@ -741,11 +741,11 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
shift_factor--; shift_factor--;
} }
addr = htonl(addr); addr = htonl(addr);
opt.ecs_addr = make_intrusive<AddrVal>(addr); opt.ecs_addr = zeek::make_intrusive<zeek::AddrVal>(addr);
} }
else if ( ecs_family == L3_IPV6 ) else if ( ecs_family == L3_IPV6 )
{ {
opt.ecs_family = make_intrusive<StringVal>("v6"); opt.ecs_family = zeek::make_intrusive<zeek::StringVal>("v6");
uint32_t addr[4] = { 0 }; uint32_t addr[4] = { 0 };
for (uint16_t i = 0, shift_factor = 15; option_len > 0; option_len--) for (uint16_t i = 0, shift_factor = 15; option_len > 0; option_len--)
{ {
@ -759,7 +759,7 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
{ {
addr[i] = htonl(addr[i]); addr[i] = htonl(addr[i]);
} }
opt.ecs_addr = make_intrusive<AddrVal>(addr); opt.ecs_addr = zeek::make_intrusive<zeek::AddrVal>(addr);
} }
else else
{ {
@ -1585,11 +1585,11 @@ zeek::RecordValPtr DNS_MsgInfo::BuildEDNS_Val()
zeek::RecordValPtr DNS_MsgInfo::BuildEDNS_ECS_Val(struct EDNS_ECS* opt) zeek::RecordValPtr DNS_MsgInfo::BuildEDNS_ECS_Val(struct EDNS_ECS* opt)
{ {
static auto dns_edns_ecs = zeek::id::find_type<zeek::RecordType>("dns_edns_ecs"); static auto dns_edns_ecs = zeek::id::find_type<zeek::RecordType>("dns_edns_ecs");
auto r = make_intrusive<RecordVal>(dns_edns_ecs); auto r = zeek::make_intrusive<zeek::RecordVal>(dns_edns_ecs);
r->Assign(0, opt->ecs_family); r->Assign(0, opt->ecs_family);
r->Assign(1, val_mgr->Count(opt->ecs_src_pfx_len)); r->Assign(1, zeek::val_mgr->Count(opt->ecs_src_pfx_len));
r->Assign(2, val_mgr->Count(opt->ecs_scp_pfx_len)); r->Assign(2, zeek::val_mgr->Count(opt->ecs_scp_pfx_len));
r->Assign(3, opt->ecs_addr); r->Assign(3, opt->ecs_addr);
return r; return r;

4
src/analyzer/protocol/dns/DNS.h
View file

@ -150,10 +150,10 @@ struct EDNS_ADDITIONAL { // size
}; };
struct EDNS_ECS { struct EDNS_ECS {
IntrusivePtr<StringVal> ecs_family; ///< EDNS client subnet address family zeek::StringValPtr ecs_family; ///< EDNS client subnet address family
uint16_t ecs_src_pfx_len; ///< EDNS client subnet source prefix length uint16_t ecs_src_pfx_len; ///< EDNS client subnet source prefix length
uint16_t ecs_scp_pfx_len; ///< EDNS client subnet scope prefix length uint16_t ecs_scp_pfx_len; ///< EDNS client subnet scope prefix length
IntrusivePtr<AddrVal> ecs_addr; ///< EDNS client subnet address zeek::IntrusivePtr<zeek::AddrVal> ecs_addr; ///< EDNS client subnet address
}; };
struct TSIG_DATA { struct TSIG_DATA {