Merge branch 'master' of https://github.com/dnthayer/zeek

* 'master' of https://github.com/dnthayer/zeek:
  Update tests and baselines due to renaming all scripts
  Rename all scripts to have ".zeek" file extension
  Update a few tests due to scripts with new file extension
  Add test cases to verify new file extension is recognized
  Fix the core/load-duplicates.bro test
  Update script search logic for new file extension
  Remove unnecessary ".bro" from @load directives

scripts/base/files/pe/main.zeek

@@ -1,6 +1,6 @@
 module PE;
 
-@load ./consts.bro
+@load ./consts
 
 export {
 	redef enum Log::ID += { LOG };

scripts/base/frameworks/cluster/main.zeek

@@ -1,6 +1,6 @@
 ##! A framework for establishing and controlling a cluster of Bro instances.
 ##! In order to use the cluster framework, a script named
-##! ``cluster-layout.bro`` must exist somewhere in Bro's script search path
+##! ``cluster-layout.zeek`` must exist somewhere in Bro's script search path
 ##! which has a cluster definition of the :bro:id:`Cluster::nodes` variable.
 ##! The ``CLUSTER_NODE`` environment variable or :bro:id:`Cluster::node`
 ##! must also be sent and the cluster framework loaded as a package like
@@ -192,7 +192,7 @@ export {
 	global worker_count: count = 0;
 
 	## The cluster layout definition.  This should be placed into a filter
-	## named cluster-layout.bro somewhere in the BROPATH.  It will be
+	## named cluster-layout.zeek somewhere in the BROPATH.  It will be
 	## automatically loaded if the CLUSTER_NODE environment variable is set.
 	## Note that BroControl handles all of this automatically.
 	## The table is typically indexed by node names/labels (e.g. "manager"
@@ -200,7 +200,7 @@ export {
 	const nodes: table[string] of Node = {} &redef;
 
 	## Indicates whether or not the manager will act as the logger and receive
-	## logs.  This value should be set in the cluster-layout.bro script (the
+	## logs.  This value should be set in the cluster-layout.zeek script (the
 	## value should be true only if no logger is specified in Cluster::nodes).
 	## Note that BroControl handles this automatically.
 	const manager_is_logger = T &redef;

scripts/base/frameworks/files/__load__.bro

@@ -1,2 +0,0 @@
-@load ./main.bro
-@load ./magic

scripts/base/frameworks/files/__load__.zeek

@@ -0,0 +1,2 @@
+@load ./main
+@load ./magic

scripts/base/frameworks/netcontrol/main.zeek

@@ -43,8 +43,8 @@ export {
 	# ### High-level API.
 	# ###
 
-	# ### Note - other high level primitives are in catch-and-release.bro, shunt.bro and
-	# ### drop.bro
+	# ### Note - other high level primitives are in catch-and-release.zeek,
+	# ### shunt.zeek and drop.zeek
 
 	## Allows all traffic involving a specific IP address to be forwarded.
 	##

scripts/base/frameworks/openflow/main.zeek

@@ -251,7 +251,7 @@ function controller_init_done(controller: Controller)
 	event OpenFlow::controller_activated(controller$state$_name, controller);
 	}
 
-# Functions that are called from cluster.bro and non-cluster.bro
+# Functions that are called from cluster.zeek and non-cluster.zeek
 
 function register_controller_impl(tpe: OpenFlow::Plugin, name: string, controller: Controller)
 	{

scripts/base/frameworks/reporter/main.zeek

@@ -9,7 +9,7 @@
 ##! Note that this framework deals with the handling of internally generated
 ##! reporter messages, for the interface
 ##! into actually creating reporter messages from the scripting layer, use
-##! the built-in functions in :doc:`/scripts/base/bif/reporter.bif.bro`.
+##! the built-in functions in :doc:`/scripts/base/bif/reporter.bif.zeek`.
 
 module Reporter;