Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 17:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Modification to the Communication framework API.

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

4
scripts/base/frameworks/cluster/__load__.bro
View file

@ -21,10 +21,10 @@ redef peer_description = Cluster::node;
# Don't load the listening script until we're a bit more sure that the
# cluster framework is actually being enabled.
@load frameworks/communication/listen-clear
@load frameworks/communication/listen
## Set the port that this node is supposed to listen on.
redef Communication::listen_port_clear = Cluster::nodes[Cluster::node]$p;
redef Communication::listen_port = Cluster::nodes[Cluster::node]$p;
@if ( Cluster::local_node_type() == Cluster::MANAGER )
@load ./nodes/manager

21
scripts/base/frameworks/communication/main.bro
View file

@ -8,12 +8,18 @@ module Communication;
export {
redef enum Log::ID += { LOG };
const default_port_ssl = 47756/tcp &redef;
const default_port_clear = 47757/tcp &redef;
## Which interface to listen on (0.0.0.0 for any interface).
const listen_interface = 0.0.0.0 &redef;
## Which port to listen on.
const listen_port = 47757/tcp &redef;
## This defines if a listening socket should use encryption.
const listen_encrypted = F &redef;
## Default compression level. Compression level is 0-9, with 0 = no
## compression.
global default_compression = 0 &redef;
global compression_level = 0 &redef;
type Info: record {
ts: time &log;
@ -77,11 +83,8 @@ export {
## Whether to use SSL-based communication.
ssl: bool &default = F;
## Take-over state from this host (activated by loading hand-over.bro)
hand_over: bool &default = F;
## Compression level is 0-9, with 0 = no compression.
compression: count &default = default_compression;
compression: count &default = compression_level;
## The remote peer.
peer: event_peer &optional;
@ -135,7 +138,7 @@ function do_script_log(p: event_peer, msg: string)
function connect_peer(peer: string)
{
local node = nodes[peer];
local p = node$ssl ? default_port_ssl : default_port_clear;
local p = listen_port;
if ( node?$p )
p = node$p;
@ -238,7 +241,7 @@ event remote_connection_established(p: event_peer)
}
if ( ! found )
set_compression_level(p, default_compression);
set_compression_level(p, compression_level);
}
complete_handshake(p);