Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix potential race in openflow broker plugin

Browse source 
Broker::subscribe() after Broker::peer() may result in losing messages,
always best to do the reverse order.

Also possibly improved chance of unstable unit test output order.
This commit is contained in:
Jon Siwek 2019-05-15 10:05:53 -07:00
parent 2bb529f5b7
commit a8c0cd7dee
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-301 | 2019-05-15 10:05:53 -0700
* Fix potential race in openflow broker plugin (Jon Siwek, Corelight)
2.6-300 | 2019-05-15 09:00:57 -0700 2.6-300 | 2019-05-15 09:00:57 -0700
* Fixes to DNS lookup, including ref-counting bugs, preventing starvation * Fixes to DNS lookup, including ref-counting bugs, preventing starvation

2
VERSION
View file

@ -1 +1 @@
2.6-300 2.6-301

2
scripts/base/frameworks/openflow/plugins/broker.zeek
View file

@ -61,8 +61,8 @@ function broker_flow_clear_fun(state: OpenFlow::ControllerState): bool
function broker_init(state: OpenFlow::ControllerState) function broker_init(state: OpenFlow::ControllerState)
{ {
Broker::peer(cat(state$broker_host), state$broker_port);
Broker::subscribe(state$broker_topic); # openflow success and failure events are directly sent back via the other plugin via broker. Broker::subscribe(state$broker_topic); # openflow success and failure events are directly sent back via the other plugin via broker.
Broker::peer(cat(state$broker_host), state$broker_port);
} }
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)

7
testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek
View file

@ -2,7 +2,7 @@
# @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out" # @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out"
# @TEST-EXEC: btest-bg-run send "zeek -b -r $TRACES/smtp.trace --pseudo-realtime ../send.zeek >send.out" # @TEST-EXEC: btest-bg-run send "zeek -b -r $TRACES/smtp.trace --pseudo-realtime ../send.zeek >send.out"
# @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-bg-wait 30
# @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff recv/recv.out
# @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/send.out
@ -33,7 +33,6 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
event OpenFlow::controller_activated(name: string, controller: OpenFlow::Controller) event OpenFlow::controller_activated(name: string, controller: OpenFlow::Controller)
{ {
continue_processing();
OpenFlow::flow_clear(of_controller); OpenFlow::flow_clear(of_controller);
OpenFlow::flow_mod(of_controller, [], [$cookie=OpenFlow::generate_cookie(1), $command=OpenFlow::OFPFC_ADD, $actions=[$out_ports=vector(3, 7)]]); OpenFlow::flow_mod(of_controller, [], [$cookie=OpenFlow::generate_cookie(1), $command=OpenFlow::OFPFC_ADD, $actions=[$out_ports=vector(3, 7)]]);
} }
@ -61,7 +60,9 @@ function got_message()
{ {
++msg_count; ++msg_count;
if ( msg_count == 6 ) if ( msg_count == 2 )
continue_processing();
else if ( msg_count == 6 )
terminate(); terminate();
} }