[nrf fromtree] Bluetooth: Mesh: Disable prov bearers on link

Previously, PB-GATT unprovisioned advs would continue being sent if a
device is provisioned or in the process of being provisioned (an active
provisioning link) over PB-ADV.

This commit introduces the `link_cancel` callback for the `prov_bearer`
struct. When a provisioning link is established over a prov bearer, all
other (active) prov bearers will be suspended through this callback, and
re-enabled when the link is closed. An exception is made for PB-REMOTE,
which can utilize the other bearers.

The call to `bt_mesh_pb_gatt_srv_disable` in settings.c is removed. This
is called in `mesh_commit`, and is not needed as this is only used
during boot, at which point the Mesh provisioning service has not yet
been enabled/registered, meaning the function does nothing.

Signed-off-by: Håvard Reierstad <[email protected]>
(cherry picked from commit 200628e)
Signed-off-by: Pavel Vasilyev <[email protected]>

Author: HaavardRei

subsys/bluetooth/mesh/pb_adv.c

@@ -1071,6 +1071,12 @@ static int prov_link_accept(const struct prov_bearer_cb *cb, void *cb_data)
 	return 0;
 }
 
+static void prov_link_cancel(void)
+{
+	bt_mesh_beacon_disable();
+	bt_mesh_scan_disable();
+}
+
 static void prov_link_close(enum prov_bearer_link_status status)
 {
 	int err;
@@ -1109,6 +1115,7 @@ const struct prov_bearer bt_mesh_pb_adv = {
 	.type = BT_MESH_PROV_ADV,
 	.link_open = prov_link_open,
 	.link_accept = prov_link_accept,
+	.link_cancel = prov_link_cancel,
 	.link_close = prov_link_close,
 	.send = prov_send_adv,
 	.clear_tx = prov_clear_tx,

subsys/bluetooth/mesh/pb_gatt.c

@@ -198,6 +198,11 @@ static int link_accept(const struct prov_bearer_cb *cb, void *cb_data)
 
 	return 0;
 }
+
+static void link_cancel(void)
+{
+	(void)bt_mesh_pb_gatt_srv_disable();
+}
 #endif
 
 static void buf_send_end(struct bt_conn *conn, void *user_data)
@@ -246,6 +251,7 @@ const struct prov_bearer bt_mesh_pb_gatt = {
 #endif
 #if defined(CONFIG_BT_MESH_PB_GATT)
 	.link_accept = link_accept,
+	.link_cancel = link_cancel,
 #endif
 	.send = buf_send,
 	.clear_tx = clear_tx,

subsys/bluetooth/mesh/prov_bearer.h

@@ -76,6 +76,12 @@ struct prov_bearer {
 	 */
 	int (*link_accept)(const struct prov_bearer_cb *cb, void *cb_data);
 
+	/** @brief Disable link establishment as a provisionee.
+	 *
+	 *  Stops accepting link open messages and sending unprovisioned beacons.
+	 */
+	void (*link_cancel)(void);
+
 	/** @brief Send a packet on an established link.
 	 *
 	 *  @param buf     Payload buffer. Requires @ref

subsys/bluetooth/mesh/provisionee.c

@@ -468,12 +468,24 @@ static void prov_confirm(const uint8_t *data)
 	send_confirm();
 }
 
-static inline bool is_pb_gatt(void)
+static bool is_pb_gatt(void)
 {
 	return bt_mesh_prov_link.bearer &&
 	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_GATT;
 }
 
+static bool is_pb_adv(void)
+{
+	return bt_mesh_prov_link.bearer &&
+	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_ADV;
+}
+
+static bool is_pb_remote(void)
+{
+	return bt_mesh_prov_link.bearer &&
+	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_REMOTE;
+}
+
 static bool refresh_is_valid(const uint8_t *netkey, uint16_t net_idx,
 			     uint32_t iv_index)
 {
@@ -641,6 +653,8 @@ static void local_input_complete(void)
 	}
 }
 
+static bt_mesh_prov_bearer_t active_bearers;
+
 static void prov_link_closed(enum prov_bearer_link_status status)
 {
 	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) &&
@@ -657,6 +671,28 @@ static void prov_link_closed(enum prov_bearer_link_status status)
 	}
 
 	bt_mesh_prov_reset_state();
+
+	/* Restore provisioning bearers stopped in prov_link_opened. If the device was provisioned,
+	 * only re-enable the PB-Remote bearer.
+	 */
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && !is_pb_remote() &&
+	    (active_bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
+
+	if (bt_mesh_is_provisioned()) {
+		return;
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && !is_pb_gatt() &&
+	    (active_bearers & BT_MESH_PROV_GATT)) {
+		bt_mesh_pb_gatt.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && !is_pb_adv() &&
+	    (active_bearers & BT_MESH_PROV_ADV)) {
+		bt_mesh_pb_adv.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
 }
 
 static void prov_link_opened(void)
@@ -665,6 +701,22 @@ static void prov_link_opened(void)
 	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && bt_mesh_is_provisioned()) {
 		atomic_set_bit(bt_mesh_prov_link.flags, REPROVISION);
 	}
+
+	/* Stop other provisioning bearers for the duration of the prov link. */
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && is_pb_adv() &&
+	    (active_bearers & BT_MESH_PROV_GATT)) {
+		bt_mesh_pb_gatt.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && is_pb_gatt() &&
+	    (active_bearers & BT_MESH_PROV_ADV)) {
+		bt_mesh_pb_adv.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && !is_pb_remote() &&
+	    (active_bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_cancel();
+	}
 }
 
 static const struct bt_mesh_prov_role role_device = {
@@ -717,6 +769,7 @@ int bt_mesh_prov_enable(bt_mesh_prov_bearer_t bearers)
 
 role_init:
 	bt_mesh_prov_link.role = &role_device;
+	active_bearers |= bearers;
 
 	return 0;
 }
@@ -733,14 +786,20 @@ int bt_mesh_prov_disable(bt_mesh_prov_bearer_t bearers)
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) &&
 	    (bearers & BT_MESH_PROV_ADV)) {
-		bt_mesh_beacon_disable();
-		bt_mesh_scan_disable();
+		bt_mesh_pb_adv.link_cancel();
 	}
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) &&
 	    (bearers & BT_MESH_PROV_GATT)) {
-		(void)bt_mesh_pb_gatt_srv_disable();
+		bt_mesh_pb_gatt.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) &&
+	    (bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_cancel();
 	}
 
+	active_bearers &= ~bearers;
+
 	return 0;
 }

subsys/bluetooth/mesh/rpr_srv.c

@@ -1359,6 +1359,12 @@ static int node_refresh_link_accept(const struct prov_bearer_cb *cb,
 	return 0;
 }
 
+static void node_refresh_link_cancel(void)
+{
+	srv.refresh.cb = NULL;
+	srv.refresh.cb_data = NULL;
+}
+
 static void node_refresh_tx_complete(int err, void *cb_data)
 {
 	if (err) {
@@ -1408,6 +1414,7 @@ const struct prov_bearer pb_remote_srv = {
 	.type = BT_MESH_PROV_REMOTE,
 
 	.link_accept = node_refresh_link_accept,
+	.link_cancel = node_refresh_link_cancel,
 	.send = node_refresh_buf_send,
 	.clear_tx = node_refresh_clear_tx,
 };

subsys/bluetooth/mesh/settings.c

@@ -104,10 +104,6 @@ static int mesh_commit(void)
 		return 0;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
-		(void)bt_mesh_pb_gatt_srv_disable();
-	}
-
 	bt_mesh_net_settings_commit();
 	bt_mesh_model_settings_commit();