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
..
files	Merge remote-tracking branch 'origin/topic/johanna/ocsp-sct-validate'	2017-07-30 08:49:41 -07:00
frameworks	problem: broctl can trigger intel reporter error	2017-09-28 09:34:38 -04:00
misc	Fix at_least in Version.bro.	2017-06-05 15:16:41 -07:00
protocols	Merge remote-tracking branch 'origin/topic/jazoff/fix-gridftp'	2017-09-21 09:15:57 -07:00
utils	Fix to_json() to not lose precision for values of type double	2017-02-02 13:03:05 -06:00
init-bare.bro	Merge remote-tracking branch 'origin/topic/johanna/ocsp-sct-validate'	2017-07-30 08:49:41 -07:00
init-default.bro	Make OCSP analyzer part of the X.509 analyzer	2017-02-10 17:02:15 -08:00