Add signaling of succesful initialization of plugins to NetControl.

This does not really have many user-facing changes. The one big change
is that users now should initialize plugins in the

NetControl::init()

event instead of bro_init.

Once all plugins finished initializing and the NetControl framework
starts operations, the NetControl::init_done() event is raised.

Rules that are sent to NetControl before the plugins have finished
initializing are ignored - this is important when several plugins that
require external connections have to be initialized at the beginning.
Without this delay, rules could end up at the wrong plugin.

scripts/base/frameworks/netcontrol/plugins/acld.bro

@@ -67,6 +67,7 @@ export {
 	global acld_rule_error: event(id: count, r: Rule, msg: string);
 }
 
+global netcontrol_acld_peers: table[port, string] of PluginState;
 global netcontrol_acld_topics: set[string] = set();
 global netcontrol_acld_id: table[count] of PluginState = table();
 global netcontrol_acld_current_id: count = 0;
@@ -252,6 +253,16 @@ function acld_init(p: PluginState)
 	BrokerComm::subscribe_to_events(p$acld_config$acld_topic);
 	}
 
+event BrokerComm::outgoing_connection_established(peer_address: string, peer_port: port, peer_name: string)
+	{
+	if ( [peer_port, peer_address] !in netcontrol_acld_peers )
+		# ok, this one was none of ours...
+		return;
+
+	local p = netcontrol_acld_peers[peer_port, peer_address];
+	plugin_activated(p);
+	}
+
 global acld_plugin = Plugin(
 	$name=acld_name,
 	$can_expire = F,
@@ -267,8 +278,14 @@ function create_acld(config: AcldConfig) : PluginState
 	else
 		add netcontrol_acld_topics[config$acld_topic];
 
+	local host = cat(config$acld_host);
 	local p: PluginState = [$acld_config=config, $plugin=acld_plugin, $acld_id=netcontrol_acld_current_id];
 
+	if ( [config$acld_port, host] in netcontrol_acld_peers )
+		Reporter::warning(fmt("Peer %s:%s was added to NetControl acld plugin twice.", host, config$acld_port));
+	else
+		netcontrol_acld_peers[config$acld_port, host] = p;
+
 	netcontrol_acld_id[netcontrol_acld_current_id] = p;
 	++netcontrol_acld_current_id;
 

scripts/base/frameworks/netcontrol/plugins/broker.bro

@@ -32,6 +32,7 @@ export {
 	global broker_rule_timeout: event(id: count, r: Rule, i: FlowInfo);
 }
 
+global netcontrol_broker_peers: table[port, string] of PluginState;
 global netcontrol_broker_topics: set[string] = set();
 global netcontrol_broker_id: table[count] of PluginState = table();
 global netcontrol_broker_current_id: count = 0;
@@ -112,6 +113,15 @@ function broker_init(p: PluginState)
 	BrokerComm::subscribe_to_events(p$broker_topic);
 	}
 
+event BrokerComm::outgoing_connection_established(peer_address: string, peer_port: port, peer_name: string)
+	{
+	if ( [peer_port, peer_address] !in netcontrol_broker_peers )
+		return;
+
+	local p = netcontrol_broker_peers[peer_port, peer_address];
+	plugin_activated(p);
+	}
+
 global broker_plugin = Plugin(
 	$name=broker_name,
 	$can_expire = F,
@@ -141,6 +151,11 @@ function create_broker(host: addr, host_port: port, topic: string, can_expire: b
 
 	local p: PluginState = [$broker_host=host, $broker_port=host_port, $plugin=plugin, $broker_topic=topic, $broker_id=netcontrol_broker_current_id];
 
+	if ( [host_port, cat(host)] in netcontrol_broker_peers )
+		Reporter::warning(fmt("Peer %s:%s was added to NetControl broker plugin twice.", host, host_port));
+	else
+		netcontrol_broker_peers[host_port, cat(host)] = p;
+
 	netcontrol_broker_id[netcontrol_broker_current_id] = p;
 	++netcontrol_broker_current_id;
 

scripts/base/frameworks/netcontrol/plugins/debug.bro

@@ -31,6 +31,7 @@ function debug_log(p: PluginState, msg: string)
 function debug_init(p: PluginState)
 	{
 	debug_log(p, "init");
+	plugin_activated(p);
 	}
 
 function debug_done(p: PluginState)

scripts/base/frameworks/netcontrol/plugins/openflow.bro

@@ -67,6 +67,7 @@ global of_messages: table[count, OpenFlow::ofp_flow_mod_command] of OfTable &cre
 		};
 
 global of_flows: table[count] of OfTable &create_expire=openflow_flow_timeout;
+global of_instances: table[string] of PluginState;
 
 function openflow_name(p: PluginState) : string
 	{
@@ -391,10 +392,29 @@ event OpenFlow::flow_removed(name: string, match: OpenFlow::ofp_match, cookie: c
 	event NetControl::rule_timeout(r, FlowInfo($duration=double_to_interval(duration_sec+0.0), $packet_count=packet_count, $byte_count=byte_count), p);
 	}
 
+function openflow_init(p: PluginState)
+	{
+	local name = p$of_controller$state$_name;
+	if ( name in of_instances )
+		Reporter::error(fmt("OpenFlow instance %s added to NetControl twice.", name));
+
+	of_instances[name] = p;
+
+	# let's check, if our OpenFlow controller is already active. If not, we have to wait for it to become active.
+	if ( p$of_controller$state$_activated )
+		plugin_activated(p);
+	}
+
+event OpenFlow::controller_activated(name: string, controller: OpenFlow::Controller)
+	{
+	if ( name in of_instances )
+		plugin_activated(of_instances[name]);
+	}
+
 global openflow_plugin = Plugin(
 	$name=openflow_name,
 	$can_expire = T,
-#	$init = openflow_init,
+	$init = openflow_init,
 #	$done = openflow_done,
 	$add_rule = openflow_add_rule,
 	$remove_rule = openflow_remove_rule