bluetooth: mesh: update le pair responder model with BT_APP_PASSKEY

BT_FIXED_PASSKEY is depracated so wee need to aling the le pair
responder model with the new Kconfig BT_APP_PASSKEY usage.

Depracate bt_mesh_le_pair_resp_passkey_invalidate, it not needed
anymore.

Adding bt_mesh_le_pair_resp_passkey_get to be able to retreive
the passkey set randomly or by app.

Signed-off-by: alperen sener <[email protected]>

Author: m-alperen-sener

include/bluetooth/mesh/vnd/le_pair_resp.h

@@ -23,6 +23,12 @@ extern "C" {
 #define BT_MESH_VENDOR_COMPANY_ID_LE_PAIR_RESP 0x0059
 #define BT_MESH_MODEL_ID_LE_PAIR_RESP   0x000E
 
+#if defined(CONFIG_BT_FIXED_PASSKEY)
+#define INVALID_PASSKEY BT_PASSKEY_INVALID
+#else
+#define INVALID_PASSKEY BT_PASSKEY_RAND
+#endif
+
 /** @def BT_MESH_MODEL_LE_PAIR_RESP
  *
  * @brief LE Pairing Responder model entry.
@@ -35,19 +41,31 @@ extern "C" {
 /* @brief Invalidate previously used passkey.
  *
  * A user must call this function when a pairing request completes regardless of the status.
+ *
+ * @deprecated Use bt_mesh_le_pair_resp_passkey_set(INVALID_PASSKEY) instead.
  */
-void bt_mesh_le_pair_resp_passkey_invalidate(void);
+__deprecated void bt_mesh_le_pair_resp_passkey_invalidate(void);
 
 /* @brief Set own passkey instead of using randomly generating passkeys.
  *
  * By default, passkeys will be randomly generated on every new request. This function allows to use
  * pre-defined passkey instead.
  *
- * @params passkey Passkey to use for the pairing, or @ref BT_PASSKEY_INVALID to use randomly
+ * @params passkey Passkey to use for the pairing, or @ref INVALID_PASSKEY to use randomly
  *		   generated passkey again.
  */
 void bt_mesh_le_pair_resp_passkey_set(uint32_t passkey);
 
+/** @brief Get own passkey.
+ *
+ * This function will return the passkey set by the @ref bt_mesh_le_pair_resp_passkey_set function or it will return
+ * a randomly generated passkey by the le pair responder reset message and the passkey is invalidated immediately.
+ * @ref INVALID_PASSKEY is returned otherwise.
+ *
+ * @return Own passkey, or INVALID_PASSKEY if the passkey is not set or randomly generated.
+ */
+const uint32_t bt_mesh_le_pair_resp_passkey_get(void);
+
 /** @cond INTERNAL_HIDDEN */
 
 extern const struct bt_mesh_model_op _bt_mesh_le_pair_resp_op[];

subsys/bluetooth/mesh/vnd/Kconfig

@@ -88,7 +88,7 @@ config BT_MESH_LE_PAIR_RESP
 	bool "LE Pairing Responder model"
 	select BT_MESH_VENDOR_MODELS
 	select EXPERIMENTAL
-	depends on BT_FIXED_PASSKEY
+	depends on BT_FIXED_PASSKEY || BT_APP_PASSKEY
 	depends on BT_SMP_SC_ONLY
 	help
 	  Enable the LE Pairing Responder model. The LE Pairing Responder model is used to generate

subsys/bluetooth/mesh/vnd/le_pair_resp.c

@@ -24,32 +24,38 @@ LOG_MODULE_REGISTER(bt_mesh_le_pair_resp);
 #define STATUS_PASSKEY_SET 0x00
 #define STATUS_PASSKEY_NOT_SET 0x01
 
-static uint32_t predefined_passkey = BT_PASSKEY_INVALID;
+static uint32_t predefined_passkey = INVALID_PASSKEY;
 
 static int handle_reset(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 			struct net_buf_simple *buf)
 {
 	uint32_t passkey;
 	uint8_t status = STATUS_PASSKEY_SET;
-	int err;
 
 	if (buf->len != 0) {
 		return -EINVAL;
 	}
 
 	BT_MESH_MODEL_BUF_DEFINE(rsp, BT_MESH_LE_PAIR_OP, 5);
 
-	if (predefined_passkey != BT_PASSKEY_INVALID) {
+	if (predefined_passkey != INVALID_PASSKEY) {
 		passkey = predefined_passkey;
 	} else {
 		passkey = sys_rand32_get() % 1000000;
+#if !defined(CONFIG_BT_FIXED_PASSKEY)
+		/* Overwrite the predefined passkey with the randomly generated passkey.
+		So the le pair responder can use the randomly generated passkey for the next pairing request.*/
+		predefined_passkey = passkey;
+#endif
 	}
 
-	err = bt_passkey_set(passkey);
+#if defined(CONFIG_BT_FIXED_PASSKEY)
+	int err = bt_passkey_set(passkey);
 	if (err) {
 		LOG_ERR("Unable to set passkey (err: %d)", err);
 		status = STATUS_PASSKEY_NOT_SET;
 	}
+#endif /* CONFIG_BT_FIXED_PASSKEY */
 
 	bt_mesh_model_msg_init(&rsp, BT_MESH_LE_PAIR_OP);
 	net_buf_simple_add_u8(&rsp, BT_MESH_LE_PAIR_OP_STATUS);
@@ -86,7 +92,7 @@ const struct bt_mesh_model_op _bt_mesh_le_pair_resp_op[] = {
 
 static int bt_mesh_le_pair_resp_init(const struct bt_mesh_model *model)
 {
-	bt_mesh_le_pair_resp_passkey_invalidate();
+	bt_mesh_le_pair_resp_passkey_set(INVALID_PASSKEY);
 
 	return 0;
 }
@@ -95,7 +101,7 @@ static void bt_mesh_le_pair_resp_reset(const struct bt_mesh_model *model)
 {
 	int err;
 
-	bt_mesh_le_pair_resp_passkey_invalidate();
+	bt_mesh_le_pair_resp_passkey_set(INVALID_PASSKEY);
 
 	for (uint8_t id = 0; id < CONFIG_BT_ID_MAX; id++) {
 		err = bt_unpair(id, NULL);
@@ -112,10 +118,22 @@ const struct bt_mesh_model_cb _bt_mesh_le_pair_resp_cb = {
 
 void bt_mesh_le_pair_resp_passkey_invalidate(void)
 {
-	(void)bt_passkey_set(BT_PASSKEY_INVALID);
+#if defined(CONFIG_BT_FIXED_PASSKEY)
+	(void)bt_passkey_set(INVALID_PASSKEY);
+#endif /* CONFIG_BT_FIXED_PASSKEY */
+#if defined(CONFIG_BT_APP_PASSKEY)
+	predefined_passkey = INVALID_PASSKEY;
+#endif /* CONFIG_BT_APP_PASSKEY */
 }
 
 void bt_mesh_le_pair_resp_passkey_set(uint32_t passkey)
 {
 	predefined_passkey = passkey;
 }
+
+const uint32_t bt_mesh_le_pair_resp_passkey_get(void)
+{
+	uint32_t passkey = predefined_passkey;
+	predefined_passkey = INVALID_PASSKEY;
+	return passkey;
+}