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

Merge branch 'topic/amazingpp/irc-fuid-missing' of github.com:AmazingPP/zeek

Browse source 
* 'topic/amazingpp/irc-fuid-missing' of github.com:AmazingPP/zeek:
  Add irc_dcc_send_ack event and fix missing fields

I've moved IRC_Data back into the zeek::analyzer::file namespace, but
we did move the declaration from protocol/file/File.h to protocol/irc/IRC.h.
But, if someone actually customized IRC_Data and didn't include protocol/irc/IRC.h
for other reasons, I'll be surprised (and also just suggest to update the include).
This commit is contained in:
Arne Welzel 2023-04-24 17:55:53 +02:00
commit 1b69b4d26f
17 changed files with 209 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

10
testing/btest/scripts/base/frameworks/file-analysis/irc.zeek
View file

@ -6,17 +6,9 @@
redef test_file_analysis_source = "IRC_DATA";
global first: bool = T;
function myfile(f: fa_file): string
{
if ( first )
{
first = F;
return "thefile";
}
else
return "";
return "thefile";
}
redef test_get_file_name = myfile;

12
testing/btest/scripts/base/protocols/irc/basic.test
View file

@ -9,14 +9,12 @@
@load base/protocols/conn
@load base/protocols/irc
# dcc mime types are irrelevant to this test, so filter it out
event zeek_init()
{
Log::remove_default_filter(IRC::LOG);
Log::add_filter(IRC::LOG, [$name="remove-mime", $exclude=set("dcc_mime_type")]);
}
event irc_names_info(c: connection, is_orig: bool, c_type: string, channel: string, users: string_set)
{
print "irc_names_info", channel, users;
}
event irc_dcc_send_ack(c: connection, bytes_received: count)
{
print "irc_dcc_send_ack", bytes_received;
}