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

updates reflecting review comments

Browse source
This commit is contained in:
Vern Paxson 2023-05-25 18:00:13 -07:00
parent 890010915a
commit e441ba394a
19 changed files with 68 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/protocols/ftp/main.zeek
View file

@ -216,7 +216,7 @@ function ftp_message(c: connection)
delete s$data_channel;
}
const have_cluster = Cluster::is_enabled();
const cluster_is_enabled = Cluster::is_enabled();
const should_publish =
Cluster::local_node_type() == Cluster::PROXY ||
Cluster::local_node_type() == Cluster::MANAGER;
@ -250,7 +250,7 @@ function add_expected_data_channel(s: Info, chan: ExpectedDataChannel)
Analyzer::schedule_analyzer(chan$orig_h, chan$resp_h, chan$resp_p,
Analyzer::ANALYZER_FTP_DATA,
5mins);
if ( have_cluster )
if ( cluster_is_enabled )
Broker::publish(ftp_relay_topic(), sync_add_expected_data, minimize_info(s), chan);
}
@ -466,7 +466,7 @@ hook finalize_ftp_data(c: connection)
if ( [c$id$resp_h, c$id$resp_p] in ftp_data_expected )
{
delete ftp_data_expected[c$id$resp_h, c$id$resp_p];
if ( have_cluster )
if ( cluster_is_enabled )
Broker::publish(ftp_relay_topic(), sync_remove_expected_data, c$id$resp_h, c$id$resp_p);
}
}

8
scripts/base/protocols/irc/dcc-send.zeek
View file

@ -44,7 +44,7 @@ function dcc_relay_topic(): string &is_used
return rval;
}
const have_cluster = Cluster::is_enabled();
const cluster_is_enabled = Cluster::is_enabled();
const should_publish =
Cluster::local_node_type() == Cluster::PROXY ||
Cluster::local_node_type() == Cluster::MANAGER;
@ -92,7 +92,7 @@ function log_dcc(f: fa_file)
delete dcc_expected_transfers[cid$resp_h, cid$resp_p];
if ( have_cluster )
if ( cluster_is_enabled )
Broker::publish(dcc_relay_topic(), dcc_transfer_remove,
cid$resp_h, cid$resp_p);
return;
@ -119,7 +119,7 @@ event irc_dcc_message(c: connection, is_orig: bool,
Analyzer::schedule_analyzer(0.0.0.0, address, p, Analyzer::ANALYZER_IRC_DATA, 5 min);
dcc_expected_transfers[address, p] = c$irc;
if ( have_cluster )
if ( cluster_is_enabled )
Broker::publish(dcc_relay_topic(), dcc_transfer_add, address, p, c$irc);
}
@ -139,7 +139,7 @@ hook finalize_irc_data(c: connection)
{
delete dcc_expected_transfers[c$id$resp_h, c$id$resp_p];
if ( have_cluster )
if ( cluster_is_enabled )
Broker::publish(dcc_relay_topic(), dcc_transfer_remove,
c$id$resp_h, c$id$resp_p);
}