Justin Azoff fa88646eec problem: broctl can trigger intel reporter error ... a broctl print triggers this error Reporter::ERROR no such index (Cluster::nodes[Intel::p$descr]) /usr/local/bro/share/bro/base/frameworks/intel/./cluster.bro, line 39 when broctl connects p$descr is empty. It should probably be set to 'control' somewhere inside broctl, but that would only fix broctl, not other clients. diff --git a/aux/bro-aux b/aux/bro-aux index 02f710a43..43f4b90bb 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 02f710a436dfe285bae0d48d7f7bc498783e11a8 +Subproject commit 43f4b90bbaf87dae1a1073e7bf13301e58866011 diff --git a/aux/broctl b/aux/broctl index e960be2c1..d3e6cdfba 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit e960be2c192a02f1244ebca3ec31ca57d64e23dc +Subproject commit d3e6cdfba496879bd55542c668ea959f524bd723 diff --git a/aux/btest b/aux/btest index 2810ccee2..e638fc65a 160000 --- a/aux/btest +++ b/aux/btest @@ -1 +1 @@ -Subproject commit 2810ccee25f6f20be5cd241155f12d02a79d592a +Subproject commit e638fc65aa12bd136594451b8c185a7a01ef3e9a diff --git a/scripts/base/frameworks/intel/cluster.bro b/scripts/base/frameworks/intel/cluster.bro index 820a5497a..e75bdd057 100644 --- a/scripts/base/frameworks/intel/cluster.bro +++ b/scripts/base/frameworks/intel/cluster.bro @@ -32,7 +32,7 @@ event remote_connection_handshake_done(p: event_peer) { # When a worker connects, send it the complete minimal data store. # It will be kept up to date after this by the cluster_new_item event. - if ( Cluster::nodes[p$descr]$node_type == Cluster::WORKER ) + if ( p$descr in Cluster::nodes && Cluster::nodes[p$descr]$node_type == Cluster::WORKER ) { send_id(p, "Intel::min_data_store"); }		2017-09-28 09:34:38 -04:00
..
analyzer	Add README files for most Bro frameworks	2013-10-11 00:19:37 -05:00
broker	Fix minor typos in documentation	2016-11-14 09:50:19 -06:00
cluster	Add a test for starting a cluster with a logger node	2016-07-15 15:23:49 -05:00
communication	Allow logging filters to inherit default path from stream.	2015-03-19 14:49:55 -05:00
control	Add README files for most Bro frameworks	2013-10-11 00:19:37 -05:00
dpd	Add an argument to "disable_analyzer" to not do a reporter message by default.	2016-08-09 10:22:31 -04:00
files	Tiny mime-type fix from Dan Caselden.	2017-02-14 07:21:00 -08:00
input	Minor documentation fixes.	2017-03-09 12:18:35 -05:00
intel	problem: broctl can trigger intel reporter error	2017-09-28 09:34:38 -04:00
logging	Fix ascii writer to not discard a ".gz" file extension	2017-08-25 15:39:12 -05:00
netcontrol	NetControl: small rule_error changes	2017-04-07 10:26:34 -07:00
notice	Lessen cluster node of notice suppression.	2017-05-03 13:28:16 -07:00
openflow	Fix various typos in the openflow framework docs	2016-11-09 14:29:03 -06:00
packet-filter	Fix a number of documentation building errors	2016-06-27 12:41:40 -07:00
reporter	Merge remote-tracking branch 'origin/topic/johanna/bit-1181'	2016-07-26 14:52:27 -07:00
signatures	Log::write in signature framework was missing ts	2015-03-25 12:01:09 -07:00
software	Several fixes and improvements for software version parsing.	2017-07-13 02:22:03 -04:00
sumstats	Track outstanding_global_views updates by uid	2016-07-29 12:54:20 -04:00
tunnels	Allow logging filters to inherit default path from stream.	2015-03-19 14:49:55 -05:00