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

Edit pass over changes before merge.

Browse source
This commit is contained in:
Robin Sommer 2019-07-18 23:07:34 +00:00
parent 004347b853
commit 1bf0cd29fd
14 changed files with 312 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/broker/Manager.cc
View file

@ -1042,20 +1042,20 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
vl.append(val);
else
{
const char* expected_name = type_name(expected_type->Tag());
auto expected_name = type_name(expected_type->Tag());
reporter->Warning("failed to convert remote event '%s' arg #%d,"
" got %s, expected %s",
name.data(), i, got_type,
expected_name);
// If we got a vector and expected a function this is possibly because of a mismatch
// between anonymous-function bodies.
if ( (strcmp( expected_name, "func") == 0) && (strcmp("vector", got_type) == 0) )
{
// If we got a vector and expected a function this is
// possibly because of a mismatch between
// anonymous-function bodies.
if ( strcmp(expected_name, "func") == 0 && strcmp("vector", got_type) == 0 )
reporter->Warning("when sending functions the receiver must have access to a"
" version of that function.\nFor anonymous functions, that function must have the same body.");
}
" version of that function.\nFor anonymous functions, that function must have the same body.");
break;
}
}