Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/fix-irc-analyzer-event-types'

Browse source 
* origin/topic/timw/fix-irc-analyzer-event-types:
  Fix types passed to some of the IRC analyzer events
This commit is contained in:
Tim Wojtulewicz 2025-07-29 07:19:25 -07:00
commit 743b9e27cc
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.792 | 2025-07-29 07:19:25 -0700
* Fix types passed to some of the IRC analyzer events (Tim Wojtulewicz, Corelight)
8.0.0-dev.790 | 2025-07-29 07:18:39 -0700 8.0.0-dev.790 | 2025-07-29 07:18:39 -0700
* Fix build failure with std::ranges on Debian 11 (Tim Wojtulewicz, Corelight) * Fix build failure with std::ranges on Debian 11 (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.790 8.0.0-dev.792

12
src/analyzer/protocol/irc/IRC.cc
View file

@ -239,8 +239,8 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) {
// else ### // else ###
} }
EnqueueConnEvent(irc_network_info, ConnVal(), val_mgr->Bool(orig), val_mgr->Int(users), EnqueueConnEvent(irc_network_info, ConnVal(), val_mgr->Bool(orig), val_mgr->Count(users),
val_mgr->Int(services), val_mgr->Int(servers)); val_mgr->Count(services), val_mgr->Count(servers));
} break; } break;
// List of users in a channel (names command). // List of users in a channel (names command).
@ -302,8 +302,8 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) {
// else ### // else ###
} }
EnqueueConnEvent(irc_server_info, ConnVal(), val_mgr->Bool(orig), val_mgr->Int(users), EnqueueConnEvent(irc_server_info, ConnVal(), val_mgr->Bool(orig), val_mgr->Count(users),
val_mgr->Int(services), val_mgr->Int(servers)); val_mgr->Count(services), val_mgr->Count(servers));
} break; } break;
// Count of channels. // Count of channels.
@ -317,7 +317,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) {
if ( parts[i] == ":channels" ) if ( parts[i] == ":channels" )
channels = atoi(parts[i - 1].c_str()); channels = atoi(parts[i - 1].c_str());
EnqueueConnEvent(irc_channel_info, ConnVal(), val_mgr->Bool(orig), val_mgr->Int(channels)); EnqueueConnEvent(irc_channel_info, ConnVal(), val_mgr->Bool(orig), val_mgr->Count(channels));
} break; } break;
// RPL_GLOBALUSERS // RPL_GLOBALUSERS
@ -483,7 +483,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) {
make_intrusive<StringVal>(parts[3].c_str()), make_intrusive<StringVal>(parts[3].c_str()),
make_intrusive<StringVal>(parts[4].c_str()), make_intrusive<StringVal>(parts[4].c_str()),
make_intrusive<StringVal>(parts[5].c_str()), make_intrusive<StringVal>(parts[5].c_str()),
make_intrusive<StringVal>(parts[6].c_str()), val_mgr->Int(atoi(parts[7].c_str())), make_intrusive<StringVal>(parts[6].c_str()), val_mgr->Count(atoi(parts[7].c_str())),
make_intrusive<StringVal>(parts[8].c_str())); make_intrusive<StringVal>(parts[8].c_str()));
} break; } break;