From: Veeraj Khokale <veeraj.sk@samsung.com>
Date: Tue, 3 Apr 2018 10:58:55 +0000 (+0530)
Subject: Unset gatt callback in network monitor
X-Git-Tag: accepted/tizen/unified/20180420.081822~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F175027%2F1;p=platform%2Fupstream%2Fiotivity.git

Unset gatt callback in network monitor

Gatt connection state changed callback is set in the
network monitor (calenwmonitor.c) but is unset in the
gatt client (caleclient.c). Move this to network
monitor instead

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/278
(cherry picked from commit 961ff08710e7acd99277a335f7d9eeca2f68c16e)

Change-Id: I386499c475a241bca840610df823f84d1a74ee0d
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: Amit KS <amit.s12@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 a829960..b0f374c 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
@@ -811,8 +811,6 @@ void CALEGattUnSetCallbacks()
 {
     OIC_LOG(DEBUG, TAG, "IN");
 
-    bt_gatt_unset_connection_state_changed_cb();
-
     int numOfServersConnected = CAGetRegisteredServiceCount();
     LEServerInfo *leServerInfo = NULL;
 
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
index 5775877..9f2a527 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
@@ -202,8 +202,14 @@ CAResult_t CAStartLEAdapter()
 
 CAResult_t CAStopLEAdapter()
 {
+    int ret = bt_gatt_unset_connection_state_changed_cb();
+    if (BT_ERROR_NONE != ret)
+    {
+        OIC_LOG(DEBUG, TAG, "bt_gatt_unset_connection_state_changed_cb failed");
+        return CA_STATUS_FAILED;
+    }
 
-    int ret = bt_adapter_unset_state_changed_cb();
+    ret = bt_adapter_unset_state_changed_cb();
     if (BT_ERROR_NONE != ret)
     {
         OIC_LOG(DEBUG, TAG, "bt_adapter_unset_state_changed_cb failed");