From 6f7b7c552d0152089012298e6fa5cc2257c7165d Mon Sep 17 00:00:00 2001
From: lly <lly@espressif.com>
Date: Mon, 2 Sep 2019 14:59:41 +0800
Subject: [PATCH] ble_mesh: fix not sending all segments through the Friend
 Queue

---
 .../bt/esp_ble_mesh/mesh_core/transport.c     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/components/bt/esp_ble_mesh/mesh_core/transport.c b/components/bt/esp_ble_mesh/mesh_core/transport.c
index cfbfd888c..552bc653f 100644
--- a/components/bt/esp_ble_mesh/mesh_core/transport.c
+++ b/components/bt/esp_ble_mesh/mesh_core/transport.c
@@ -391,8 +391,6 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
         net_buf_add_mem(seg, sdu->data, len);
         net_buf_simple_pull(sdu, len);
 
-        tx->seg[seg_o] = net_buf_ref(seg);
-
         if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
         if (IS_ENABLED(CONFIG_BLE_MESH_FRIEND)) {
             enum bt_mesh_friend_pdu_type type;
@@ -411,11 +409,13 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
                  * out through the Friend Queue.
                  */
                 net_buf_unref(seg);
-                return 0;
+                continue;
             }
         }
         }
 
+        tx->seg[seg_o] = net_buf_ref(seg);
+
         BT_DBG("Sending %u/%u", seg_o, tx->seg_n);
 
         err = bt_mesh_net_send(net_tx, seg,
@@ -428,6 +428,23 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
         }
     }
 
+    /* This can happen if segments only went into the Friend Queue */
+    if (IS_ENABLED(CONFIG_BLE_MESH_FRIEND) && !tx->seg[0]) {
+        seg_tx_reset(tx);
+        /* If there was a callback notify sending immediately since
+         * there's no other way to track this (at least currently)
+         * with the Friend Queue.
+         */
+        if (cb) {
+            if (cb->start) {
+                cb->start(0, 0, cb_data);
+            }
+            if (cb->end) {
+                cb->end(0, cb_data);
+            }
+        }
+    }
+
     if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
     if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
             bt_mesh_lpn_established()) {