Merge remote-tracking branch 'origin/topic/neverlord/caf-0.18'

* origin/topic/neverlord/caf-0.18:
  Upgrade to latest Broker changes for CAF 0.18

CHANGES

@@ -1,4 +1,10 @@
 
+3.2.0-dev.550 | 2020-05-19 10:50:42 -0700
+
+  * Upgrade to latest Broker changes for CAF 0.18 (Dominik Charousset, Corelight)
+
+  * Include pcap.h instead of pcap/dlt.h in packet-fuzzer (Tim Wojtulewicz, Corelight)
+
 3.2.0-dev.547 | 2020-05-18 10:47:54 -0700
 
   * add packet fuzzer (Justin Azoff)

VERSION

@@ -1 +1 @@
-3.2.0-dev.547
+3.2.0-dev.550

aux/broker

@@ -1 +1 @@
-Subproject commit 74d168964369f8b5c51238520d6ad35173791110
+Subproject commit 5d5e4f02ef3db2415c0272beaaa795ee3799272d

src/broker/Store.cc

@@ -85,13 +85,13 @@ broker::backend to_backend_type(BifEnum::Broker::BackendType type)
 	{
 	switch ( type ) {
 	case BifEnum::Broker::MEMORY:
-		return broker::memory;
+		return broker::backend::memory;
 
 	case BifEnum::Broker::SQLITE:
-		return broker::sqlite;
+		return broker::backend::sqlite;
 
 	case BifEnum::Broker::ROCKSDB:
-		return broker::rocksdb;
+		return broker::backend::rocksdb;
 	}
 
 	throw std::runtime_error("unknown broker backend");
@@ -101,14 +101,14 @@ broker::backend_options to_backend_options(broker::backend backend,
                                            RecordVal* options)
 	{
 	switch ( backend ) {
-	case broker::sqlite:
+	case broker::backend::sqlite:
 		{
 		auto path = options->Lookup(0)->AsRecordVal()
 			->Lookup(0)->AsStringVal()->CheckString();
 		return {{"path", path}};
 		}
 
-	case broker::rocksdb:
+	case broker::backend::rocksdb:
 		{
 		auto path = options->Lookup(1)->AsRecordVal()
 			->Lookup(0)->AsStringVal()->CheckString();