Remove RemoteSerializer and related code/types.

Also removes broccoli from the source tree.

scripts/base/frameworks/cluster/nodes/logger.zeek

@@ -24,6 +24,3 @@ redef Log::default_mail_alarms_interval = 24 hrs;
 
 ## Use the cluster's archive logging script.
 redef Log::default_rotation_postprocessor_cmd = "archive-log";
-
-## We're processing essentially *only* remote events.
-redef max_remote_events_processed = 10000;

scripts/base/frameworks/cluster/nodes/manager.zeek

@@ -21,6 +21,3 @@ redef Log::default_rotation_interval = 24 hrs;
 
 ## Use the cluster's delete-log script.
 redef Log::default_rotation_postprocessor_cmd = "delete-log";
-
-## We're processing essentially *only* remote events.
-redef max_remote_events_processed = 10000;

scripts/base/frameworks/cluster/nodes/proxy.zeek

@@ -5,10 +5,6 @@
 
 @prefixes += cluster-proxy
 
-## The proxy only syncs state; does not forward events.
-redef forward_remote_events = F;
-redef forward_remote_state_changes = T;
-
 ## Don't do any local logging.
 redef Log::enable_local_logging = F;
 

scripts/base/frameworks/packet-filter/cluster.zeek

@@ -4,11 +4,11 @@
 
 module PacketFilter;
 
-event remote_connection_handshake_done(p: event_peer) &priority=3
+event Cluster::hello(name: string, id: string) &priority=-3
 	{
-	if ( Cluster::local_node_type() == Cluster::WORKER && 
-	     p$descr in Cluster::nodes && 
-	     Cluster::nodes[p$descr]$node_type == Cluster::MANAGER )
+	if ( Cluster::local_node_type() == Cluster::WORKER &&
+	     name in Cluster::nodes &&
+	     Cluster::nodes[name]$node_type == Cluster::MANAGER )
 		{
 		# This ensures that a packet filter is installed and logged
 		# after the manager connects to us.

scripts/base/init-bare.zeek

@@ -775,32 +775,6 @@ type IPAddrAnonymizationClass: enum {
 	OTHER_ADDR,
 };
 
-## A locally unique ID identifying a communication peer. The ID is returned by
-## :zeek:id:`connect`.
-##
-## .. zeek:see:: connect
-type peer_id: count;
-
-## A communication peer.
-##
-## .. zeek:see:: finished_send_state remote_capture_filter
-##    remote_connection_closed remote_connection_error
-##    remote_connection_established remote_connection_handshake_done
-##    remote_event_registered remote_log_peer remote_pong
-##    send_state
-##
-## .. todo::The type's name is too narrow these days, should rename.
-type event_peer: record {
-	id: peer_id;	##< Locally unique ID of peer (returned by :zeek:id:`connect`).
-	host: addr;	##< The IP address of the peer.
-	## Either the port we connected to at the peer; or our port the peer
-	## connected to if the session is remotely initiated.
-	p: port;
-	is_local: bool;		##< True if this record describes the local process.
-	descr: string;		##< The peer's :zeek:see:`peer_description`.
-	class: string &optional;	##< The self-assigned *class* of the peer.
-};
-
 ## Deprecated.
 ##
 ## .. zeek:see:: rotate_file rotate_file_by_name rotate_interval
@@ -1970,10 +1944,6 @@ const watchdog_interval = 10 sec &redef;
 ## "process all expired timers with each new packet".
 const max_timer_expires = 300 &redef;
 
-## With a similar trade-off, this gives the number of remote events
-## to process in a batch before interleaving other activity.
-const max_remote_events_processed = 10 &redef;
-
 # These need to match the definitions in Login.h.
 #
 # .. zeek:see:: get_login_state
@@ -4740,71 +4710,14 @@ const packet_filter_default = F &redef;
 ## Maximum size of regular expression groups for signature matching.
 const sig_max_group_size = 50 &redef;
 
-## Deprecated. No longer functional.
-const enable_syslog = F &redef;
-
 ## Description transmitted to remote communication peers for identification.
 const peer_description = "bro" &redef;
 
-## If true, broadcast events received from one peer to all other peers.
-##
-## .. zeek:see:: forward_remote_state_changes
-##
-## .. note:: This option is only temporary and will disappear once we get a
-##    more sophisticated script-level communication framework.
-const forward_remote_events = F &redef;
-
-## If true, broadcast state updates received from one peer to all other peers.
-##
-## .. zeek:see:: forward_remote_events
-##
-## .. note:: This option is only temporary and will disappear once we get a
-##    more sophisticated script-level communication framework.
-const forward_remote_state_changes = F &redef;
-
 ## The number of IO chunks allowed to be buffered between the child
 ## and parent process of remote communication before Bro starts dropping
 ## connections to remote peers in an attempt to catch up.
 const chunked_io_buffer_soft_cap = 800000 &redef;
 
-## Place-holder constant indicating "no peer".
-const PEER_ID_NONE = 0;
-
-# Signature payload pattern types.
-# todo:: use enum to help autodoc
-# todo:: Still used?
-#const SIG_PATTERN_PAYLOAD = 0;
-#const SIG_PATTERN_HTTP = 1;
-#const SIG_PATTERN_FTP = 2;
-#const SIG_PATTERN_FINGER = 3;
-
-# Deprecated.
-# todo::Should use the new logging framework directly.
-const REMOTE_LOG_INFO = 1;	##< Deprecated.
-const REMOTE_LOG_ERROR = 2;	##< Deprecated.
-
-# Source of logging messages from the communication framework.
-# todo:: these should go into an enum to make them autodoc'able.
-const REMOTE_SRC_CHILD = 1;	##< Message from the child process.
-const REMOTE_SRC_PARENT = 2;	##< Message from the parent process.
-const REMOTE_SRC_SCRIPT = 3;	##< Message from a policy script.
-
-## Synchronize trace processing at a regular basis in pseudo-realtime mode.
-##
-## .. zeek:see:: remote_trace_sync_peers
-const remote_trace_sync_interval = 0 secs &redef;
-
-## Number of peers across which to synchronize trace processing in
-## pseudo-realtime mode.
-##
-## .. zeek:see:: remote_trace_sync_interval
-const remote_trace_sync_peers = 0 &redef;
-
-## Whether for :zeek:attr:`&synchronized` state to send the old value as a
-## consistency check.
-const remote_check_sync_consistency = F &redef;
-
-## Reassemble the beginning of all TCP connections before doing
 ## signature matching. Enabling this provides more accurate matching at the
 ## expense of CPU cycles.
 ##