bluetooth: id: sync advertising set start after rpa rotation

Synced the start of the advertising sets after each RPA rotation
in the Bluetooth identity module.

Signed-off-by: Kamil Piszczek <[email protected]>

Author: kapi-no

subsys/bluetooth/host/id.c

@@ -345,15 +345,38 @@ int bt_id_set_adv_private_addr(struct bt_le_ext_adv *adv)
 }
 #endif /* defined(CONFIG_BT_PRIVACY) */
 
-static void adv_update_rpa(struct bt_le_ext_adv *adv, void *data)
+#if defined(CONFIG_BT_EXT_ADV) && defined(CONFIG_BT_PRIVACY)
+static void adv_disable_rpa(struct bt_le_ext_adv *adv, void *data)
 {
+	uint8_t adv_index = bt_le_ext_adv_get_index(adv);
+	bool *adv_disabled = data;
+
+	adv_disabled[adv_index] = false;
+
+	/* Invalidate RPA only for non-limited advertising sets. */
+	if (atomic_test_bit(adv->flags, BT_ADV_LIMITED)) {
+		return;
+	}
+
+	/* Disable advertising sets to prepare them for RPA update. */
 	if (atomic_test_bit(adv->flags, BT_ADV_ENABLED) &&
-	    !atomic_test_bit(adv->flags, BT_ADV_LIMITED) &&
 	    !atomic_test_bit(adv->flags, BT_ADV_USE_IDENTITY)) {
-		int err;
-
 		bt_le_adv_set_enable_ext(adv, false, NULL);
 
+		adv_disabled[adv_index] = true;
+	}
+
+	atomic_clear_bit(adv->flags, BT_ADV_RPA_VALID);
+}
+
+static void adv_enable_rpa(struct bt_le_ext_adv *adv, void *data)
+{
+	uint8_t adv_index = bt_le_ext_adv_get_index(adv);
+	bool *adv_disabled = data;
+
+	if (adv_disabled[adv_index]) {
+		int err;
+
 		err = bt_id_set_adv_private_addr(adv);
 		if (err) {
 			BT_WARN("Failed to update advertiser RPA address (%d)",
@@ -363,6 +386,17 @@ static void adv_update_rpa(struct bt_le_ext_adv *adv, void *data)
 		bt_le_adv_set_enable_ext(adv, true, NULL);
 	}
 }
+#endif /* defined(CONFIG_BT_EXT_ADV) && defined(CONFIG_BT_PRIVACY) */
+
+static void adv_update_rpa_foreach(void)
+{
+#if defined(CONFIG_BT_EXT_ADV) && defined(CONFIG_BT_PRIVACY)
+	bool adv_disabled[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
+
+	bt_le_ext_adv_foreach(adv_disable_rpa, adv_disabled);
+	bt_le_ext_adv_foreach(adv_enable_rpa, adv_disabled);
+#endif
+}
 
 static void le_update_private_addr(void)
 {
@@ -374,7 +408,9 @@ static void le_update_private_addr(void)
 	if (IS_ENABLED(CONFIG_BT_BROADCASTER) &&
 	    IS_ENABLED(CONFIG_BT_EXT_ADV) &&
 	    BT_DEV_FEAT_LE_EXT_ADV(bt_dev.le.features)) {
-		bt_le_ext_adv_foreach(adv_update_rpa, NULL);
+		adv_update_rpa_foreach();
+	} else {
+		le_rpa_invalidate();
 	}
 
 #if defined(CONFIG_BT_OBSERVER)
@@ -439,7 +475,6 @@ static void le_force_rpa_timeout(void)
 
 	k_work_cancel_delayable_sync(&bt_dev.rpa_update, &sync);
 #endif
-	le_rpa_invalidate();
 	le_update_private_addr();
 }
 
@@ -461,8 +496,6 @@ static void rpa_timeout(struct k_work *work)
 		}
 	}
 
-	le_rpa_invalidate();
-
 	if (IS_ENABLED(CONFIG_BT_BROADCASTER)) {
 		bt_le_ext_adv_foreach(adv_is_private_enabled, &adv_enabled);
 	}
@@ -472,6 +505,7 @@ static void rpa_timeout(struct k_work *work)
 	      atomic_test_bit(bt_dev.flags, BT_DEV_INITIATING) ||
 	      (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING) &&
 	       atomic_test_bit(bt_dev.flags, BT_DEV_ACTIVE_SCAN)))) {
+		le_rpa_invalidate();
 		return;
 	}