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

Deprecate global type pointers in NetVar.h

Browse source 
There's analogous IntrusivePtrs in zeek::vars
This commit is contained in:
Jon Siwek 2020-05-11 19:22:49 -07:00
parent 4351a26710
commit c0986f0739
51 changed files with 451 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
if ( parts.size() > 0 && parts[0][0] == ':' )
parts[0] = parts[0].substr(1);
auto set = make_intrusive<TableVal>(IntrusivePtr{NewRef{}, string_set});
auto set = make_intrusive<TableVal>(zeek::vars::string_set);
for ( unsigned int i = 0; i < parts.size(); ++i )
{
@ -464,7 +464,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
if ( parts.size() > 0 && parts[0][0] == ':' )
parts[0] = parts[0].substr(1);
auto set = make_intrusive<TableVal>(IntrusivePtr{NewRef{}, string_set});
auto set = make_intrusive<TableVal>(zeek::vars::string_set);
for ( unsigned int i = 0; i < parts.size(); ++i )
{
@ -836,7 +836,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
nickname = prefix.substr(0, pos);
}
auto list = make_intrusive<TableVal>(IntrusivePtr{NewRef{}, irc_join_list});
auto list = make_intrusive<TableVal>(zeek::vars::irc_join_list);
vector<string> channels = SplitWords(parts[0], ',');
vector<string> passwords;
@ -847,7 +847,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
string empty_string = "";
for ( unsigned int i = 0; i < channels.size(); ++i )
{
RecordVal* info = new RecordVal(irc_join_info);
RecordVal* info = new RecordVal(zeek::vars::irc_join_info);
info->Assign(0, make_intrusive<StringVal>(nickname.c_str()));
info->Assign(1, make_intrusive<StringVal>(channels[i].c_str()));
if ( i < passwords.size() )
@ -881,13 +881,13 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
parts[1] = parts[1].substr(1);
vector<string> users = SplitWords(parts[1], ',');
auto list = make_intrusive<TableVal>(IntrusivePtr{NewRef{}, irc_join_list});
auto list = make_intrusive<TableVal>(zeek::vars::irc_join_list);
string empty_string = "";
for ( unsigned int i = 0; i < users.size(); ++i )
{
auto info = make_intrusive<RecordVal>(irc_join_info);
auto info = make_intrusive<RecordVal>(zeek::vars::irc_join_info);
string nick = users[i];
string mode = "none";
@ -951,7 +951,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
nick = nick.substr(0, pos);
vector<string> channelList = SplitWords(channels, ',');
auto set = make_intrusive<TableVal>(IntrusivePtr{NewRef{}, string_set});
auto set = make_intrusive<TableVal>(zeek::vars::string_set);
for ( unsigned int i = 0; i < channelList.size(); ++i )
{