diff --git a/CHANGES b/CHANGES index 733c4ed9dc..4906cd28b7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,11 @@ +2.6-193 | 2019-03-27 10:53:01 -0700 + + * Update now-broken Broker API usages (Jon Siwek, Corelight) + + Related to https://github.com/zeek/broker/pull/38, see Broker's NEWS file + for C++ code migration hints. + 2.6-192 | 2019-03-25 17:49:18 -0700 * Deprecate str_shell_escape, add safe_shell_quote replacement (Jon Siwek, Corelight) diff --git a/NEWS b/NEWS index 09763cdd0e..2fe8d2a569 100644 --- a/NEWS +++ b/NEWS @@ -100,6 +100,9 @@ Changed Functionality To revert back to compiling only a static library, there's the ``--enable-static-binpac`` configure option. +- The Broker C++ API has some breaking changes, see it's own NEWS file for + details on how to migrate old code. + Removed Functionality --------------------- diff --git a/VERSION b/VERSION index e7ef7ca154..a77d525cfc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-192 +2.6-193 diff --git a/aux/broctl b/aux/broctl index 963a4e1501..afc0260abf 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 963a4e1501ef28370f3dd3e2a5c79b3515e10a7a +Subproject commit afc0260abf663f4b44d535d66d378fde7b0d5206 diff --git a/aux/broker b/aux/broker index 24867d5972..7dab576984 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 24867d59728c56e295b1489f308161d0095ce487 +Subproject commit 7dab576984dee1f58fe5ceb81f36b63128d58860 diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 38ab4cd60d..d31198ced7 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -918,8 +918,8 @@ void Manager::Process() { had_input = true; - auto& topic = message.first; - auto& msg = message.second; + auto& topic = broker::get_topic(message); + auto& msg = broker::get_data(message); try {