Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix addr/string type confusion in Broker::peers()

Browse source 
Broker::NetworkInfo$address is of type string. The Broker::peers() BiF treated
it as an address, which caused ZVal's type validation to flag a
mismatch and abort.

Includes a small tweak to the broker.unpeer test that makes it invoke
Broker::peers(), which breaks in absence of the fix.
This commit is contained in:
Christian Kreibich 2021-08-18 15:16:58 -07:00
parent b28fc77054
commit fa38d81a7b
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/broker/comm.bif
View file

@ -117,12 +117,12 @@ function Broker::__peers%(%): PeerInfos
if ( n )
{
network_info->Assign(0, zeek::make_intrusive<zeek::AddrVal>(IPAddr(n->address)));
network_info->Assign(0, zeek::make_intrusive<zeek::StringVal>(n->address));
network_info->Assign(1, zeek::val_mgr->Port(n->port, TRANSPORT_TCP));
}
else
{
network_info->Assign(0, zeek::make_intrusive<zeek::AddrVal>("0.0.0.0"));
network_info->Assign(0, zeek::make_intrusive<zeek::StringVal>("0.0.0.0"));
network_info->Assign(1, zeek::val_mgr->Port(0, TRANSPORT_TCP));
}