component/ble_mesh: Check if gatt proxy is enabled when DST is all proxies

diff --git a/components/bt/ble_mesh/mesh_core/access.c b/components/bt/ble_mesh/mesh_core/access.c
index 5003a199aa35eb0d571cde539079ab769ec53b96..ca64b05106cec4616b4ce74580ed921b138e10db 100644 (file)
--- a/components/bt/ble_mesh/mesh_core/access.c
+++ b/components/bt/ble_mesh/mesh_core/access.c
@@ -307,6 +307,10 @@ static void mod_publish(struct k_work *work)
 
     pub->period_start = k_uptime_get_32();
 
+    /* Callback the model publish update event to the application layer.
+     * In the event, users can update the context of the publish message
+     * which will be published in the next period.
+     */
     err = pub->update(pub->mod);
     if (err) {
         BT_ERR("Failed to update publication message");
@@ -598,8 +602,7 @@ bool bt_mesh_fixed_group_match(u16_t addr)
     case BT_MESH_ADDR_ALL_NODES:
         return true;
     case BT_MESH_ADDR_PROXIES:
-        /* TODO: Proxy not yet supported */
-        return false;
+        return (bt_mesh_gatt_proxy_get() == BT_MESH_GATT_PROXY_ENABLED);
     case BT_MESH_ADDR_FRIENDS:
         return (bt_mesh_friend_get() == BT_MESH_FRIEND_ENABLED);
     case BT_MESH_ADDR_RELAYS:

diff --git a/components/bt/ble_mesh/mesh_models/bt_mesh_client_common.c b/components/bt/ble_mesh/mesh_models/bt_mesh_client_common.c
index 1c0978048cbcb90f5eae56d3a62f428874c16768..aecc17e4647b3dc1b6194641cbf4cd93fcca2ed8 100644 (file)
--- a/components/bt/ble_mesh/mesh_models/bt_mesh_client_common.c
+++ b/components/bt/ble_mesh/mesh_models/bt_mesh_client_common.c
@@ -189,12 +189,13 @@ int bt_mesh_client_send_msg(struct bt_mesh_model *model,
     }
 
     if (bt_mesh_client_check_node_in_list(&internal->queue, ctx->addr)) {
+        BT_ERR("%s, Busy sending message to DST 0x%04x", __func__, ctx->addr);
         err = -EBUSY;
     } else {
         /* Don't forget to free the node in the timeout (timer_handler) function. */
         node = (bt_mesh_client_node_t *)osi_calloc(sizeof(bt_mesh_client_node_t));
         if (!node) {
-            BT_ERR("%s: allocate memory fail", __func__);
+            BT_ERR("%s: Failed to allocate memory", __func__);
             return -ENOMEM;
         }
         memcpy(&node->ctx, ctx, sizeof(struct bt_mesh_msg_ctx));