lib: bluetooth: ble_adv: fix allow list advertising without directed

With allow-list enabled, and directed and/or directed high duty
advertising disabled in Kconfig, the allow-list for use in fast and
slow advertising did not take effect when advertising was started with
mode directed or directed high duty.

This made it possible for non-paired/non-allow-listed devices to
connect after a paired/allow-listed device had disconnected and
advertising had been automatically restarted in the directed high
duty mode.

This fixes two internal checks in the ble_adv library that was
the source of the issue. These checks will now correctly
return the "capabilities" of the advertising mode to be
started so that the configuration will be correct.

Signed-off-by: Andreas Moltumyr <[email protected]>

Author: anhmolt

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -148,6 +148,8 @@ Libraries
      * The ``slave_conn_int`` member in the :c:struct:`ble_adv_data` structure to :c:member:`ble_adv_data.periph_conn_int`.
      * The ``CONFIG_BLE_ADV_USE_WHITELIST`` Kconfig option to :kconfig:option:`CONFIG_BLE_ADV_USE_ALLOW_LIST`.
 
+   * Fixed an issue with the allow list functionality that made it possible for non-allow-listed devices to connect if advertising was started in either directed or directed high duty mode, but the directed modes had been disabled with Kconfig options.
+
 * :ref:`lib_ble_conn_params` library:
 
    * Added:

lib/bluetooth/ble_adv/ble_adv.c

@@ -45,8 +45,13 @@ static bool adv_mode_is_directed(enum ble_adv_mode mode)
 {
 	switch (mode) {
 	case BLE_ADV_MODE_DIRECTED_HIGH_DUTY:
+		if (IS_ENABLED(CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY)) {
+			return true;
+		} __fallthrough;
 	case BLE_ADV_MODE_DIRECTED:
-		return true;
+		if (IS_ENABLED(CONFIG_BLE_ADV_DIRECTED_ADVERTISING)) {
+			return true;
+		} __fallthrough;
 	default:
 		return false;
 	}
@@ -55,6 +60,14 @@ static bool adv_mode_is_directed(enum ble_adv_mode mode)
 static bool adv_mode_has_allow_list(enum ble_adv_mode mode)
 {
 	switch (mode) {
+	case BLE_ADV_MODE_DIRECTED_HIGH_DUTY:
+		if (IS_ENABLED(CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY)) {
+			return false;
+		} __fallthrough;
+	case BLE_ADV_MODE_DIRECTED:
+		if (IS_ENABLED(CONFIG_BLE_ADV_DIRECTED_ADVERTISING)) {
+			return false;
+		} __fallthrough;
 	case BLE_ADV_MODE_FAST:
 	case BLE_ADV_MODE_SLOW:
 		return true;