Modification to the Communication framework API.

- Simplified the communication API and made it easier to change
  to encrypted connections by not having separate variables to
  define encrypted and unencrypted ports.

- Now, to enable listening without configuring nodes just
  load the frameworks/communication/listen script.

- If encrypted listening is desired set the following:
	redef Communication::listen_encrypted=T;

- Accompanying test updates.
This commit is contained in:
Seth Hall 2011-10-07 13:29:26 -04:00
parent 250fb3c352
commit da9b8cc283
16 changed files with 38 additions and 64 deletions

View file

@ -1,20 +0,0 @@
##! Listen for other Bro instances to make unencrypted connections.
@load base/frameworks/communication
module Communication;
export {
## Which port to listen on for clear connections.
const listen_port_clear = Communication::default_port_clear &redef;
## Which IP address to bind to (0.0.0.0 for any interface).
const listen_if_clear = 0.0.0.0 &redef;
}
event bro_init() &priority=-10
{
enable_communication();
listen(listen_if_clear, listen_port_clear, F);
}

View file

@ -1,21 +0,0 @@
##! Listen for other Bro instances and encrypt the connection with SSL.
@load base/frameworks/communication
module Communication;
export {
## Which port to listen on for SSL encrypted connections.
const listen_port_ssl = Communication::default_port_ssl &redef;
## Which IP address to bind to for SSL encrypted connections
## (0.0.0.0 for any interface).
const listen_if_ssl = 0.0.0.0 &redef;
}
event bro_init() &priority=-10
{
enable_communication();
listen(listen_if_ssl, listen_port_ssl, T);
}

View file

@ -0,0 +1,12 @@
##! Loading this script will make the Bro instance listen for remote
##! Bro instances to connect.
@load base/frameworks/communication
module Communication;
event bro_init() &priority=-10
{
enable_communication();
listen(listen_interface, listen_port, listen_encrypted);
}

View file

@ -1,7 +1,7 @@
@load base/frameworks/control
# If an instance is a controllee, it implicitly needs to listen for remote
# connections.
@load frameworks/communication/listen-clear
@load frameworks/communication/listen
module Control;