Merge remote-tracking branch 'origin/topic/seth/zeek_init'

* origin/topic/seth/zeek_init:
  Some more testing fixes.
  Update docs and tests for bro_(init|done) -> zeek_(init|done)
  Implement the zeek_init handler.
This commit is contained in:
Jon Siwek 2019-04-19 11:16:35 -07:00
commit a994be9eeb
628 changed files with 868 additions and 1082 deletions

View file

@ -15,7 +15,7 @@ redef exit_only_after_terminate = T;
global of_controller: OpenFlow::Controller;
event bro_init()
event zeek_init()
{
suspend_processing();
of_controller = OpenFlow::broker_new("broker1", 127.0.0.1, to_port(getenv("BROKER_PORT")), "bro/openflow", 42);
@ -80,7 +80,7 @@ event die()
terminate();
}
event bro_init()
event zeek_init()
{
Broker::subscribe("bro/openflow");
Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));

View file

@ -8,7 +8,7 @@ global of_controller: OpenFlow::Controller;
global cookie_id: count = 42;
event bro_init()
event zeek_init()
{
of_controller = OpenFlow::log_new(42);

View file

@ -22,7 +22,7 @@ redef Log::default_rotation_interval = 0secs;
global of_controller: OpenFlow::Controller;
@if ( Cluster::local_node_type() == Cluster::WORKER )
event bro_init()
event zeek_init()
{
suspend_processing();
}
@ -33,7 +33,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
}
@endif
event bro_init()
event zeek_init()
{
of_controller = OpenFlow::log_new(42);
}

View file

@ -6,7 +6,7 @@
global of_controller: OpenFlow::Controller;
event bro_init()
event zeek_init()
{
of_controller = OpenFlow::ryu_new(127.0.0.1, 8080, 42);
of_controller$state$ryu_debug=T;