From: Kush Agrawal <kush.agrawal@samsung.com>
Date: Mon, 11 Feb 2019 15:00:44 +0000 (+0530)
Subject: Modified logic for LE scanning
X-Git-Tag: submit/tizen_5.0/20190213.055525
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen_5.0%2F20190213.055525;p=platform%2Fupstream%2Fiotivity.git

Modified logic for LE scanning

Issue : If scan fails once and if we retry from above layer then scan is not started.
Cause : Scan was not started for device which is already added once in server list.

Fix : Changed logic by enabling scan for devices which are already added and in UNICAST_PENDING state

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/412
(cherry picked from 3106e414dbe8807c50b439cc19e6b94e86ab50ac)

Change-Id: I5c18ed79099e0f4245fd8b75a7191459bd0357ec
Signed-off-by: Kush Agrawal <kush.agrawal@samsung.com>
Signed-off-by: Abhishek Sansanwal <abhishek.s94@samsung.com>
---

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
index ad5765a..91bfa18 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
@@ -1404,7 +1404,10 @@ CAResult_t CAUpdateCharacteristicsToGattServer(const char *remoteAddress,
                 OIC_LOG(ERROR, TAG, "Could not add data to pending list");
                 return CA_STATUS_FAILED;
             }
+        }
 
+        if(serverInfo->status == LE_STATUS_UNICAST_PENDING)
+        {
             oc_mutex_lock(g_scanMutex);
             if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
             {
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c
index 0b79771..18b63e6 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c
@@ -1449,7 +1449,10 @@ CAResult_t CAUpdateCharacteristicsToGattServer(const char *remoteAddress,
                 OIC_LOG(ERROR, TAG, "Could not add data to pending list");
                 return CA_STATUS_FAILED;
             }
+        }
 
+        if(serverInfo->status == LE_STATUS_UNICAST_PENDING)
+        {
             oc_mutex_lock(g_scanMutex);
             if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
             {