Remove unused source file in tizen bt_le_adapter 49/223449/1 accepted/tizen/unified/20200204.125838 submit/tizen/20200203.002206 submit/tizen/20200218.000626
authorDoHyun Pyun <dh79.pyun@samsung.com>
Thu, 30 Jan 2020 01:47:54 +0000 (10:47 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Thu, 30 Jan 2020 01:47:54 +0000 (10:47 +0900)
Change-Id: I8cf29c80bf61adcfba26c8a2acaa9a63f21b4460
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient_vd.c [deleted file]

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
deleted file mode 100644 (file)
index 9b9bcce..0000000
+++ /dev/null
@@ -1,1665 +0,0 @@
-/* ****************************************************************
-*
-* Copyright 2014 Samsung Electronics All Rights Reserved.
-*
-*
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-******************************************************************/
-
-#include "caleclient.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <pthread.h>
-#include <gio/gio.h>
-
-#include "octhread.h"
-#include "uarraylist.h"
-#include "caqueueingthread.h"
-#include "caadapterutils.h"
-#include "cagattservice.h"
-#include "oic_string.h"
-#include "oic_malloc.h"
-
-/**
- * Logging tag for module name.
- */
-#define TAG "OIC_CA_LE_CLIENT"
-
-#define MICROSECS_PER_SEC 1000000
-#define WAIT_TIME_WRITE_CHARACTERISTIC 10 * MICROSECS_PER_SEC
-
-//For custom uuid ble server
-#define CA_GATT_CUSTOM_UUID "4209"
-#define CA_GATT_CUSTOM_UUID2 "4204"
-#define CUSTOM_UUID_LEN 4
-
-static const int samsung_code = 117;
-
-uint64_t const TIMEOUT = 30 * MICROSECS_PER_SEC;
-
-/**
- * Flag to check if scanning is in progress
- */
-static bool g_isScanningInProgress = false;
-
-/**
- * Mutex to synchronize access to g_isScanningInProgress
- */
-static oc_mutex g_isScanningInProgressMutex = NULL;
-
-/**
- * Flag to check if connection is in progress
- */
-static bool g_isConnectionInProgress = false;
-
-/**
- * Mutex to synchronize access to g_isConnectionInProgress
- */
-static oc_mutex g_isConnectionInProgressMutex = NULL;
-
-/**
- * Flag to check if multicast is already in progress.
- */
-static bool g_isMulticastInProgress = false;
-
-/**
- * Flag to check if unicast scan is in progress
- */
-static bool g_isUnicastScanInProgress = false;
-
-/**
- * Mutex to synchronize access to g_isMulticastInProgress
- * and g_isUnicastScanInProgress
- */
-static oc_mutex g_scanMutex = NULL;
-
-/**
- * Pending multicast data list to be sent.
- */
-static u_arraylist_t *g_multicastDataList = NULL;
-
-/**
- * Mutex to synchronize the access to Pending multicast data list.
- */
-static oc_mutex g_multicastDataListMutex = NULL;
-
-/**
- * Condition to start the timer for scanning.
- */
-static oc_cond g_startTimerCond = NULL;
-
-/**
- * Condition for scanning Time interval.
- */
-static oc_cond g_scanningTimeCond = NULL;
-
-/**
- * This contains the list of OIC services a client connect tot.
- */
-static LEServerInfoList *g_LEServerList = NULL;
-
-/**
- * Mutex to synchronize access to BleServiceList.
- */
-static oc_mutex g_LEServerListMutex = NULL;
-
-/**
- * Boolean variable to keep the state of the GATT Client.
- */
-static bool g_isLEGattClientStarted = false;
-
-/**
- * Mutex to synchronize access to the requestResponse callback to be called
- * when the data needs to be sent from GATTClient.
- */
-static oc_mutex g_LEReqRespClientCbMutex = NULL;
-
-/**
- * Mutex to synchronize access to the requestResponse callback to be called
- * when the data needs to be sent from GATTClient.
- */
-static oc_mutex g_LEClientConnectMutex = NULL;
-
-/**
- * Mutex to synchronize the calls to be done to the platform from GATTClient
- * interfaces from different threads.
- */
-static oc_mutex g_LEClientStateMutex = NULL;
-
-/**
- * Mutex to synchronize the task to be pushed to thread pool.
- */
-static oc_mutex g_LEClientThreadPoolMutex = NULL;
-
-/**
- * Mutex to synchronize the task to write characteristic one packet after another.
- */
-static oc_mutex g_threadWriteCharacteristicMutex = NULL;
-
-/**
- * Condition for Writing characteristic.
- */
-static oc_cond g_threadWriteCharacteristicCond = NULL;
-
-/**
- * Mutex to synchronize the task for MTU Changed.
- */
-static oc_mutex g_threadMTUChangedMutex = NULL;
-
-/**
- * Condition for MTU Changed.
- */
-static oc_cond g_threadMTUChangedCond = NULL;
-
-/**
- * Flag to check status of write characteristic.
- */
-static bool g_isSignalSetFlag = false;
-
-/**
- * Maintains the callback to be notified on receival of network packets from other
- *           BLE devices
- */
-static CABLEDataReceivedCallback g_LEClientDataReceivedCallback = NULL;
-
-/**
- * callback to update the error to le adapter
- */
-static CABLEErrorHandleCallback g_clientErrorCallback;
-
-/**
- * gmainLoop to manage the threads to receive the callback from the platfrom.
- */
-static GMainLoop *g_eventLoop = NULL;
-
-/**
- * Reference to threadpool
- */
-static ca_thread_pool_t g_LEClientThreadPool = NULL;
-
-void CALEGattCharacteristicChangedCb(bt_gatt_h characteristic,
-                                     char *value,
-                                     int valueLen, void *userData)
-{
-    (void)characteristic;
-
-    OIC_LOG(DEBUG, TAG, "IN");
-    OIC_LOG_V(DEBUG, TAG, "Changed characteristic value length [%d]", valueLen);
-
-    oc_mutex_lock(g_LEReqRespClientCbMutex);
-    if (NULL == g_LEClientDataReceivedCallback)
-    {
-        OIC_LOG(ERROR, TAG, "Request response callback is not set");
-        oc_mutex_unlock(g_LEReqRespClientCbMutex);
-        return;
-    }
-
-    uint32_t sentLength = 0;
-    g_LEClientDataReceivedCallback(userData, (uint8_t *)value, valueLen, &sentLength);
-
-    OIC_LOG_V(DEBUG, TAG, "Recv data Length is %d", sentLength);
-
-    oc_mutex_unlock(g_LEReqRespClientCbMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-void CALEGattClientMTUChangedCb(bt_gatt_client_h client_handle, const bt_gatt_client_att_mtu_info_s *mtu_info, void *user_data)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-    oc_mutex_lock(g_threadMTUChangedMutex);
-    OIC_LOG(DEBUG, TAG, "MTU changed signal");
-    oc_cond_signal(g_threadMTUChangedCond);
-    oc_mutex_unlock(g_threadMTUChangedMutex);
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-
-void CALEGattCharacteristicWriteCb(int result, bt_gatt_h reqHandle, void *userData)
-{
-    (void)reqHandle;
-    (void)userData;
-
-    OIC_LOG(DEBUG, TAG, "IN ");
-
-    if (BT_ERROR_NONE != result)
-    {
-        CALogSendStateInfo(CA_ADAPTER_GATT_BTLE, "", 0, -1,
-                           false, "writeChar failure");
-
-        OIC_LOG(ERROR, TAG, "Write failed Need Retry ");
-        //Need to Implement retry mechanism
-    }
-    else
-    {
-        oc_mutex_lock(g_threadWriteCharacteristicMutex);
-        OIC_LOG(DEBUG, TAG, "g_isSignalSetFlag is set true and signal");
-        g_isSignalSetFlag = true;
-        oc_cond_signal(g_threadWriteCharacteristicCond);
-        oc_mutex_unlock(g_threadWriteCharacteristicMutex);
-
-        CALogSendStateInfo(CA_ADAPTER_GATT_BTLE, "", 0, -1,
-                           true, "writeChar success");
-    }
-
-    OIC_LOG(DEBUG, TAG, "OUT ");
-}
-
-CAResult_t CALEGattInitiateConnection(const char *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    oc_mutex_lock(g_isConnectionInProgressMutex);
-    if (g_isConnectionInProgress)
-    {
-        oc_mutex_unlock(g_isConnectionInProgressMutex);
-        OIC_LOG(DEBUG, TAG, "Connection already in progress, cannot initiate new connection");
-        return CA_STATUS_FAILED;
-    }
-    g_isConnectionInProgress = true;
-    oc_mutex_unlock(g_isConnectionInProgressMutex);
-
-    // Pause the scanning
-    CALEGattStopDeviceScanning();
-
-    OIC_LOG_V(DEBUG, TAG,
-              "Trying to do Gatt connection to [%s]", remoteAddress);
-
-    oc_mutex_lock(g_LEClientThreadPoolMutex);
-    if (NULL == g_LEClientThreadPool)
-    {
-        oc_mutex_unlock(g_LEClientThreadPoolMutex);
-        OIC_LOG(ERROR, TAG, "g_LEClientThreadPool is NULL");
-        return CA_STATUS_FAILED;
-    }
-
-    char *addr = OICStrdup(remoteAddress);
-    if (NULL == addr)
-    {
-        oc_mutex_unlock(g_LEClientThreadPoolMutex);
-        OIC_LOG(ERROR, TAG, "OICStrdup failed");
-        return CA_STATUS_FAILED;
-    }
-
-    CAResult_t res = ca_thread_pool_add_task(g_LEClientThreadPool, CAGattConnectThread, addr, NULL);
-    oc_mutex_unlock(g_LEClientThreadPoolMutex);
-    if (CA_STATUS_OK != res)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "ca_thread_pool_add_task failed with ret [%d]", res);
-        OICFree(addr);
-        return CA_STATUS_FAILED;
-    }
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-void CALEGattConnectionStateChanged(bool connected, const char *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN ");
-
-    VERIFY_NON_NULL_VOID(remoteAddress, TAG, "remote address is NULL");
-
-    if (!connected)
-    {
-        OIC_LOG_V(DEBUG, TAG, "DisConnected from [%s] ", remoteAddress);
-        oc_mutex_lock(g_LEServerListMutex);
-        CARemoveLEServerInfoFromList(&g_LEServerList, remoteAddress);
-        oc_mutex_unlock(g_LEServerListMutex);
-    }
-    else
-    {
-        OIC_LOG_V(DEBUG, TAG, "Connected to [%s] ", remoteAddress);
-
-        oc_mutex_lock(g_isConnectionInProgressMutex);
-        g_isConnectionInProgress = false;
-        oc_mutex_unlock(g_isConnectionInProgressMutex);
-
-
-        // TODO:Disabling scanning for now.Need to check.
-        /*oc_mutex_lock(g_scanMutex);
-        if (g_isMulticastInProgress || g_isUnicastScanInProgress)
-        {
-            CAResult_t ret = CALEGattStartDeviceScanning();
-            if (CA_STATUS_OK != ret)
-            {
-                OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning Failed");
-            }
-        }
-        oc_mutex_unlock(g_scanMutex);
-*/
-        LEServerInfo *serverInfo = NULL;
-        oc_mutex_lock(g_LEServerListMutex);
-        if (CA_STATUS_OK != CAGetLEServerInfo(g_LEServerList, remoteAddress, &serverInfo))
-        {
-            oc_mutex_unlock(g_LEServerListMutex);
-            OIC_LOG_V(ERROR, TAG, "Could not get server info for [%s]", remoteAddress);
-            return;
-        }
-
-        serverInfo->status = LE_STATUS_CONNECTED;
-        oc_mutex_unlock(g_LEServerListMutex);
-
-        oc_mutex_lock(g_LEClientThreadPoolMutex);
-        if (NULL == g_LEClientThreadPool)
-        {
-            oc_mutex_unlock(g_LEClientThreadPoolMutex);
-            OIC_LOG(ERROR, TAG, "g_LEClientThreadPool is NULL");
-            return;
-        }
-
-        char *addr = OICStrdup(remoteAddress);
-        if (NULL == addr)
-        {
-            oc_mutex_unlock(g_LEClientThreadPoolMutex);
-            OIC_LOG(ERROR, TAG, "addr is NULL");
-            return;
-        }
-
-        CAResult_t ret = ca_thread_pool_add_task(g_LEClientThreadPool, CADiscoverLEServicesThread,
-                                                 addr, NULL);
-        oc_mutex_unlock(g_LEClientThreadPoolMutex);
-        if (CA_STATUS_OK != ret)
-        {
-            OIC_LOG_V(ERROR, TAG, "ca_thread_pool_add_task failed with ret [%d]", ret);
-            OICFree(addr);
-        }
-    }
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-static bool CALEIsHaveServiceImpl(bt_adapter_le_device_scan_result_info_s *scanInfo,
-                                  const char *service_uuid,
-                                  bt_adapter_le_packet_type_e pkt_type)
-{
-    bool ret = false;
-    char **uuids = NULL;
-    int count = 0;
-    int result = 0;
-
-    result = bt_adapter_le_get_scan_result_service_uuids(scanInfo,
-             pkt_type, &uuids, &count);
-    if (result == BT_ERROR_NONE && NULL != uuids)
-    {
-        for (int i = 0; i < count; i++)
-        {
-            if (0 == strcasecmp(uuids[i], service_uuid))
-            {
-                OIC_LOG_V(DEBUG, TAG, "Service[%s] Found in %s",
-                          uuids[i], scanInfo->remote_address);
-                ret = true;
-            }
-            OICFree(uuids[i]);
-        }
-        OICFree(uuids);
-    }
-
-    if(ret == false){
-        char *man_data = NULL;
-        int man_data_len;
-        int man_id;
-        result = bt_adapter_le_get_scan_result_manufacturer_data(scanInfo,
-        pkt_type, &man_id, &man_data, &man_data_len);
-
-        if (result == BT_ERROR_NONE && NULL != man_data)
-        {
-            int pos =0;
-            char *compare_man_data = OICCalloc(1, (man_data_len*2)+1);
-            if (!compare_man_data)
-            {
-                OIC_LOG(ERROR, TAG, "Memory allocation failed for compare_man_data");
-                OICFree(man_data);
-                return false;
-            }
-
-            for(int i=0;i<man_data_len;i++){
-                pos += snprintf(compare_man_data+pos, 2, "%.2x", man_data[i]);
-            }
-
-            if (man_id == samsung_code && 0 == strncasecmp(compare_man_data, service_uuid, CUSTOM_UUID_LEN))
-            {
-                OIC_LOG_V(DEBUG, TAG, "Manufacture Data[%s] Found in %s",
-                                       compare_man_data, scanInfo->remote_address);
-                ret = true;
-            }
-            OICFree(compare_man_data);
-            OICFree(man_data);
-        }
-    }
-    return ret;
-}
-
-static bool CALEIsHaveService(bt_adapter_le_device_scan_result_info_s *scanInfo,
-                              const char *service_uuid)
-{
-    return
-        // For arduino servers, scan response will give the UUIDs advertised.
-        CALEIsHaveServiceImpl(scanInfo, service_uuid,
-                              BT_ADAPTER_LE_PACKET_SCAN_RESPONSE) ||
-        // For android/tizen servers, advertising packet will give the UUIDs.
-        CALEIsHaveServiceImpl(scanInfo, service_uuid,
-                              BT_ADAPTER_LE_PACKET_ADVERTISING);
-}
-
-void CALEAdapterScanResultCb(int result, bt_adapter_le_device_scan_result_info_s *scanInfo,
-                             void *userData)
-{
-    (void)userData;
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL_VOID(scanInfo, TAG, "scanInfo");
-    VERIFY_NON_NULL_VOID(scanInfo->remote_address, TAG, "scanInfo->remote_address");
-
-    OIC_LOG_V(DEBUG, TAG, "Remote Address [%s]", scanInfo->remote_address);
-    OIC_LOG_V(DEBUG, TAG, "Scan Result [%d]", result);
-    OIC_LOG_V(DEBUG, TAG,
-              " Adv data len [%d] Scan data len[%d]RSSI [%d] Addr_type [%d] ",
-              scanInfo->adv_data_len, scanInfo->scan_data_len, scanInfo->rssi,
-              scanInfo->address_type);
-
-    // Check if scanning was stopped (since this callback is
-    // being triggered even after stopping the scan)
-    oc_mutex_lock(g_isScanningInProgressMutex);
-    if (!g_isScanningInProgress)
-    {
-        oc_mutex_unlock(g_isScanningInProgressMutex);
-        OIC_LOG(DEBUG, TAG, "Scanning not in progress, so ignoring callback");
-        return;
-    }
-    oc_mutex_unlock(g_isScanningInProgressMutex);
-
-    if (CALEIsHaveService(scanInfo, CA_GATT_SERVICE_UUID) ||
-        CALEIsHaveService(scanInfo, CA_GATT_CUSTOM_UUID)||
-        CALEIsHaveService(scanInfo, CA_GATT_CUSTOM_UUID2))
-    {
-        OIC_LOG_V(DEBUG, TAG, "Device [%s] supports OIC or custom service", scanInfo->remote_address);
-
-        LEServerInfo *serverInfo = NULL;
-        oc_mutex_lock(g_LEServerListMutex);
-        CAResult_t ret = CAGetLEServerInfo(g_LEServerList, scanInfo->remote_address, &serverInfo);
-        if (CA_STATUS_OK != ret)
-        {
-            OIC_LOG_V(DEBUG, TAG,
-                      "Newly discovered device with address [%s] ", scanInfo->remote_address);
-
-            char *addr = OICStrdup(scanInfo->remote_address);
-            if (NULL == addr)
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG(ERROR, TAG, "Device address is NULL");
-                return;
-            }
-            serverInfo = (LEServerInfo *)OICCalloc(1, sizeof(LEServerInfo));
-            if (NULL == serverInfo)
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG(ERROR, TAG, "Calloc failed");
-                OICFree(addr);
-                return;
-            }
-            serverInfo->remoteAddress = addr;
-            serverInfo->status = LE_STATUS_DISCOVERED;
-
-            if (CA_STATUS_OK != CAAddLEServerInfoToList(&g_LEServerList, serverInfo))
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG_V(ERROR, TAG, "Could not add [%s] to server list", scanInfo->remote_address);
-                CAFreeLEServerInfo(serverInfo);
-                return;
-            }
-        }else {
-            OIC_LOG_V(DEBUG, TAG,
-                      "Device Present with address [%s] ", scanInfo->remote_address);
-
-            if(serverInfo->status == LE_STATUS_UNICAST_PENDING){
-                bt_gatt_client_h clientHandle = NULL;
-                int32_t ret = bt_gatt_client_create(serverInfo->remoteAddress, &clientHandle);
-                if (BT_ERROR_NONE != ret || NULL == clientHandle)
-                {
-                    OIC_LOG_V(ERROR, TAG,
-                              "bt_gatt_client_create Failed with ret value [%s] ", CALEGetErrorMsg(ret));
-                    CALEGattDisConnect(serverInfo->remoteAddress);
-                    oc_mutex_unlock(g_LEServerListMutex);
-                    return ;
-                }
-                serverInfo->clientHandle = clientHandle;
-
-                serverInfo->status = LE_STATUS_CONNECTION_INITIATED;
-                if (CA_STATUS_OK != CALEGattInitiateConnection(serverInfo->remoteAddress))
-                {
-                    OIC_LOG_V(ERROR, TAG, "Could not initiate connection to [%s]", serverInfo->remoteAddress);
-                    serverInfo->status = LE_STATUS_DISCOVERED;
-                    CADestroyLEDataList(&serverInfo->pendingDataList);
-                    oc_mutex_unlock(g_LEServerListMutex);
-                    return ;
-                 }
-             }
-         }
-    }
-    oc_mutex_unlock(g_LEServerListMutex);
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-void CASetLEClientThreadPoolHandle(ca_thread_pool_t handle)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    oc_mutex_lock(g_LEClientThreadPoolMutex);
-    g_LEClientThreadPool = handle;
-    oc_mutex_unlock(g_LEClientThreadPoolMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-void CASetLEReqRespClientCallback(CABLEDataReceivedCallback callback)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    oc_mutex_lock(g_LEReqRespClientCbMutex);
-
-    g_LEClientDataReceivedCallback = callback;
-
-    oc_mutex_unlock(g_LEReqRespClientCbMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-void CASetBLEClientErrorHandleCallback(CABLEErrorHandleCallback callback)
-{
-    g_clientErrorCallback = callback;
-}
-
-CAResult_t CAStartLEGattClient()
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    oc_mutex_lock(g_LEClientStateMutex);
-    if (true  == g_isLEGattClientStarted)
-    {
-        OIC_LOG(ERROR, TAG, "Gatt Client is already running!!");
-        oc_mutex_unlock(g_LEClientStateMutex);
-        return CA_STATUS_FAILED;
-    }
-
-    CAResult_t  result = CALEGattSetCallbacks();
-    if (CA_STATUS_OK != result)
-    {
-        OIC_LOG(ERROR, TAG, "CABleGattSetCallbacks Failed");
-        oc_mutex_unlock(g_LEClientStateMutex);
-        CATerminateLEGattClient();
-        return CA_STATUS_FAILED;
-    }
-
-    g_isLEGattClientStarted = true;
-    oc_mutex_unlock(g_LEClientStateMutex);
-
-    oc_mutex_lock(g_LEClientThreadPoolMutex);
-    if (NULL == g_LEClientThreadPool)
-    {
-        OIC_LOG(ERROR, TAG, "gBleServerThreadPool is NULL");
-        CATerminateGattClientMutexVariables();
-        oc_mutex_unlock(g_LEClientThreadPoolMutex);
-        return CA_STATUS_FAILED;
-    }
-
-    result = ca_thread_pool_add_task(g_LEClientThreadPool, CAStartTimerThread,
-                                     NULL, NULL);
-    if (CA_STATUS_OK != result)
-    {
-        OIC_LOG(ERROR, TAG, "ca_thread_pool_add_task failed");
-        CATerminateGattClientMutexVariables();
-        oc_mutex_unlock(g_LEClientThreadPoolMutex);
-        return CA_STATUS_FAILED;
-    }
-
-    result= ca_thread_pool_add_task(g_LEClientThreadPool, CALEClientScanThread,
-                                    NULL, NULL);
-    if (CA_STATUS_OK != result)
-    {
-        OIC_LOG(ERROR, TAG, "ca_thread_pool_add_task failed");
-        CATerminateGattClientMutexVariables();
-        oc_mutex_unlock(g_LEClientThreadPoolMutex);
-        return CA_STATUS_FAILED;
-    }
-    oc_mutex_unlock(g_LEClientThreadPoolMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-void CALEClientScanThread()
-{
-    oc_mutex_lock(g_scanMutex);
-    if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
-    {
-        CAResult_t result = CALEGattStartDeviceScanning();
-        if (CA_STATUS_OK != result)
-        {
-            oc_mutex_unlock(g_scanMutex);
-            OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning failed");
-            return ;
-        }
-        g_isUnicastScanInProgress = true;
-        // Start Timer
-        oc_cond_signal(g_startTimerCond);
-    }
-    else
-    {
-        g_isUnicastScanInProgress = true;
-        // Reset Timer
-        oc_cond_signal(g_scanningTimeCond);
-    }
-    oc_mutex_unlock(g_scanMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return ;
-}
-
-void CAStartTimerThread(void *data)
-{
-    (void)data;
-
-    OIC_LOG(DEBUG, TAG, "IN");
-    while (g_isLEGattClientStarted)
-    {
-        oc_mutex_lock(g_scanMutex);
-        if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
-        {
-            OIC_LOG(DEBUG, TAG, "waiting....");
-            oc_cond_wait(g_startTimerCond, g_scanMutex);
-            OIC_LOG(DEBUG, TAG, "Wake up");
-        }
-
-        // Timed conditional wait for stopping the scan.
-        OCWaitResult_t ret = oc_cond_wait_for(g_scanningTimeCond, g_scanMutex,
-                                              TIMEOUT);
-        if (OC_WAIT_TIMEDOUT == ret)
-        {
-            OIC_LOG(DEBUG, TAG, "Scan is timed Out");
-            // Call stop scan.
-            CALEGattStopDeviceScanning();
-
-            if (g_isMulticastInProgress)
-            {
-                oc_mutex_lock(g_multicastDataListMutex);
-                // Clear the data list and device list.
-                u_arraylist_destroy(g_multicastDataList);
-                g_multicastDataList = NULL;
-                oc_mutex_unlock(g_multicastDataListMutex);
-                g_isMulticastInProgress = false;
-            }
-            g_isUnicastScanInProgress = false;
-        }
-        oc_mutex_unlock(g_scanMutex);
-    }
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-void CAStopLEGattClient()
-{
-    OIC_LOG(DEBUG,  TAG, "IN");
-
-    oc_mutex_lock(g_LEClientStateMutex);
-
-    if (false == g_isLEGattClientStarted)
-    {
-        OIC_LOG(ERROR, TAG, "Gatt Client is not running to stop");
-        oc_mutex_unlock(g_LEClientStateMutex);
-        return;
-    }
-
-    CALEGattUnSetCallbacks();
-
-    CALEGattStopDeviceScanning();
-
-    g_isLEGattClientStarted = false;
-
-    // Signal the conditions waiting in Start timer.
-    oc_cond_signal(g_startTimerCond);
-    oc_cond_signal(g_scanningTimeCond);
-
-    // Destroy the multicast data list and device list if not empty.
-    if (NULL != g_multicastDataList)
-    {
-        oc_mutex_lock(g_multicastDataListMutex);
-        u_arraylist_destroy(g_multicastDataList);
-        g_multicastDataList = NULL;
-        oc_mutex_unlock(g_multicastDataListMutex);
-    }
-
-    oc_mutex_lock(g_LEServerListMutex);
-    CAFreeLEServerList(g_LEServerList);
-    g_LEServerList = NULL;
-    oc_mutex_unlock(g_LEServerListMutex);
-
-    oc_mutex_lock(g_threadWriteCharacteristicMutex);
-    oc_cond_signal(g_threadWriteCharacteristicCond);
-    oc_mutex_unlock(g_threadWriteCharacteristicMutex);
-
-    GMainContext  *context_event_loop = NULL;
-    // Required for waking up the thread which is running in gmain loop
-    if (NULL != g_eventLoop)
-    {
-        context_event_loop = g_main_loop_get_context(g_eventLoop);
-    }
-    if (context_event_loop)
-    {
-        OIC_LOG_V(DEBUG,  TAG, "g_eventLoop context %p", (void *)context_event_loop);
-        g_main_context_wakeup(context_event_loop);
-
-        // Kill g main loops and kill threads.
-        g_main_loop_quit(g_eventLoop);
-    }
-    else
-    {
-        OIC_LOG(ERROR, TAG, "g_eventLoop context is NULL");
-    }
-
-    oc_mutex_unlock(g_LEClientStateMutex);
-
-    OIC_LOG(DEBUG,  TAG, "OUT");
-}
-
-CAResult_t CAInitializeLEGattClient()
-{
-    OIC_LOG(DEBUG, TAG, "Initialize GATT Client");
-    CAResult_t res = CAInitGattClientMutexVariables();
-    if (CA_STATUS_OK != res)
-    {
-        OIC_LOG(ERROR, TAG, "CAInitGattClientMutexVariables failed!");
-        CATerminateGattClientMutexVariables();
-        return CA_STATUS_FAILED;
-    }
-    return res;
-}
-
-void CATerminateLEGattClient()
-{
-    OIC_LOG(DEBUG,  TAG, "IN");
-
-    CATerminateGattClientMutexVariables();
-
-    OIC_LOG(DEBUG,  TAG, "OUT");
-}
-
-CAResult_t CAInitGattClientMutexVariables()
-{
-    OIC_LOG(DEBUG,  TAG, "IN");
-    if (NULL == g_LEClientStateMutex)
-    {
-        g_LEClientStateMutex = oc_mutex_new();
-        if (NULL == g_LEClientStateMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_LEServerListMutex)
-    {
-        g_LEServerListMutex = oc_mutex_new();
-        if (NULL == g_LEServerListMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_LEReqRespClientCbMutex)
-    {
-        g_LEReqRespClientCbMutex = oc_mutex_new();
-        if (NULL == g_LEReqRespClientCbMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_LEClientThreadPoolMutex)
-    {
-        g_LEClientThreadPoolMutex = oc_mutex_new();
-        if (NULL == g_LEClientThreadPoolMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_LEClientConnectMutex)
-    {
-        g_LEClientConnectMutex = oc_mutex_new();
-        if (NULL == g_LEClientConnectMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_isScanningInProgressMutex)
-    {
-        g_isScanningInProgressMutex = oc_mutex_new();
-        if (NULL == g_isScanningInProgressMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_isConnectionInProgressMutex)
-    {
-        g_isConnectionInProgressMutex = oc_mutex_new();
-        if (NULL == g_isConnectionInProgressMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_multicastDataListMutex)
-    {
-        g_multicastDataListMutex = oc_mutex_new();
-        if (NULL == g_multicastDataListMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_scanMutex)
-    {
-        g_scanMutex = oc_mutex_new();
-        if (NULL == g_scanMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_threadWriteCharacteristicMutex)
-    {
-        g_threadWriteCharacteristicMutex = oc_mutex_new();
-        if (NULL == g_threadWriteCharacteristicMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_threadMTUChangedMutex)
-    {
-        g_threadMTUChangedMutex = oc_mutex_new();
-        if (NULL == g_threadMTUChangedMutex)
-        {
-            OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_startTimerCond)
-    {
-        g_startTimerCond = oc_cond_new();
-        if (NULL == g_startTimerCond)
-        {
-            OIC_LOG(ERROR, TAG, "oc_cond_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_scanningTimeCond)
-    {
-        g_scanningTimeCond = oc_cond_new();
-        if (NULL == g_scanningTimeCond)
-        {
-            OIC_LOG(ERROR, TAG, "oc_cond_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_threadWriteCharacteristicCond)
-    {
-        g_threadWriteCharacteristicCond = oc_cond_new();
-        if (NULL == g_threadWriteCharacteristicCond)
-        {
-            OIC_LOG(ERROR, TAG, "oc_cond_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-    if (NULL == g_threadMTUChangedCond)
-    {
-        g_threadMTUChangedCond = oc_cond_new();
-        if (NULL == g_threadMTUChangedCond)
-        {
-            OIC_LOG(ERROR, TAG, "oc_cond_new failed");
-            return CA_STATUS_FAILED;
-        }
-    }
-
-
-    OIC_LOG(DEBUG,  TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-void CATerminateGattClientMutexVariables()
-{
-    OIC_LOG(DEBUG,  TAG, "IN");
-
-    oc_mutex_free(g_LEClientStateMutex);
-    g_LEClientStateMutex = NULL;
-
-    oc_mutex_free(g_LEServerListMutex);
-    g_LEServerListMutex = NULL;
-
-    oc_mutex_free(g_LEReqRespClientCbMutex);
-    g_LEReqRespClientCbMutex = NULL;
-
-    oc_mutex_free(g_LEClientConnectMutex);
-    g_LEClientConnectMutex = NULL;
-
-    oc_mutex_free(g_LEClientThreadPoolMutex);
-    g_LEClientThreadPoolMutex = NULL;
-
-    oc_mutex_free(g_isScanningInProgressMutex);
-    g_isScanningInProgressMutex = NULL;
-
-    oc_mutex_free(g_isConnectionInProgressMutex);
-    g_isConnectionInProgressMutex = NULL;
-
-    oc_mutex_free(g_multicastDataListMutex);
-    g_multicastDataListMutex = NULL;
-
-    oc_mutex_free(g_scanMutex);
-    g_scanMutex = NULL;
-
-    oc_mutex_free(g_threadWriteCharacteristicMutex);
-    g_threadWriteCharacteristicMutex = NULL;
-
-    oc_mutex_free(g_threadMTUChangedMutex);
-    g_threadMTUChangedMutex = NULL;
-
-    oc_cond_free(g_startTimerCond);
-    g_startTimerCond = NULL;
-
-    oc_cond_free(g_scanningTimeCond);
-    g_scanningTimeCond = NULL;
-
-    oc_cond_free(g_threadWriteCharacteristicCond);
-    g_threadWriteCharacteristicCond = NULL;
-    g_isSignalSetFlag = false;
-
-    oc_cond_free(g_threadMTUChangedCond);
-    g_threadMTUChangedCond = NULL;
-
-    OIC_LOG(DEBUG,  TAG, "OUT");
-}
-
-CAResult_t CALEGattSetCallbacks()
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-void CALEGattUnSetCallbacks()
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    bt_gatt_unset_connection_state_changed_cb();
-
-    oc_mutex_lock(g_LEServerListMutex);
-    LEServerInfoList *curNode = g_LEServerList;
-    while (curNode)
-    {
-        LEServerInfo *serverInfo = curNode->serverInfo;
-        if (serverInfo->status >= LE_STATUS_SERVICES_DISCOVERED)
-        {
-            bt_gatt_client_unset_characteristic_value_changed_cb(serverInfo->readChar);
-        }
-        curNode = curNode->next;
-    }
-    oc_mutex_unlock(g_LEServerListMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-CAResult_t CALEGattStartDeviceScanning()
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    oc_mutex_lock(g_isScanningInProgressMutex);
-    if (!g_isScanningInProgress)
-    {
-        int ret = bt_adapter_le_start_scan(CALEAdapterScanResultCb, NULL);
-        if (BT_ERROR_NONE != ret)
-        {
-            oc_mutex_unlock(g_isScanningInProgressMutex);
-            OIC_LOG_V(ERROR, TAG, "bt_adapter_le_start_scan failed[%s]",
-                      CALEGetErrorMsg(ret));
-            return CA_STATUS_FAILED;
-        }
-        g_isScanningInProgress = true;
-    }
-    else
-    {
-        OIC_LOG(DEBUG, TAG, "Ignore, scanning already in progress");
-    }
-    oc_mutex_unlock(g_isScanningInProgressMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-void CALEGattStopDeviceScanning()
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    oc_mutex_lock(g_isScanningInProgressMutex);
-    if (g_isScanningInProgress)
-    {
-        int ret = bt_adapter_le_stop_scan();
-        if (BT_ERROR_NONE != ret)
-        {
-            oc_mutex_unlock(g_isScanningInProgressMutex);
-            OIC_LOG_V(ERROR, TAG, "bt_adapter_le_stop_scan failed[%s]",
-                      CALEGetErrorMsg(ret));
-            return;
-        }
-        g_isScanningInProgress = false;
-        g_isUnicastScanInProgress= false;
-    }
-    else
-    {
-        OIC_LOG(DEBUG, TAG, "Ignore, scanning not in progress");
-    }
-    oc_mutex_unlock(g_isScanningInProgressMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-void CAGattConnectThread (void *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN ");
-
-    VERIFY_NON_NULL_VOID(remoteAddress, TAG, "remote address is NULL");
-
-    char *address  = (char *)remoteAddress;
-
-    OIC_LOG_V(DEBUG, TAG, "remote address is [%s]", address);
-
-    CAResult_t result = CALEGattConnect(address);
-
-    if (CA_STATUS_OK != result)
-    {
-        OIC_LOG_V(ERROR, TAG, "bt_gatt_connect failed for [%s]", address);
-    }
-
-    OICFree(address);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-CAResult_t CALEGattConnect(const char *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL_RET(remoteAddress, TAG,
-                        "remote address is NULL", CA_STATUS_FAILED);
-
-    oc_mutex_lock(g_LEClientConnectMutex);
-    CAResult_t result = CA_STATUS_OK;
-
-    int ret = bt_gatt_connect(remoteAddress, true);
-    if (BT_ERROR_NONE != ret)
-    {
-        OIC_LOG_V(ERROR, TAG, "bt_gatt_connect Failed with ret value [%s] ",
-                  CALEGetErrorMsg(ret));
-        oc_mutex_unlock(g_LEClientConnectMutex);
-        return CA_STATUS_FAILED;
-    }
-
-    oc_mutex_unlock(g_LEClientConnectMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return result;
-}
-
-CAResult_t CALEGattDisConnect(const char *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL_RET(remoteAddress, TAG,
-                        "remote address is NULL", CA_STATUS_FAILED);
-
-    int ret = bt_gatt_disconnect(remoteAddress);
-
-    if (BT_ERROR_NONE != ret)
-    {
-        OIC_LOG_V(ERROR, TAG, "bt_gatt_disconnect Failed with ret value [%s] ",
-                  CALEGetErrorMsg(ret));
-        return CA_STATUS_FAILED;
-    }
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-CAResult_t CAUpdateCharacteristicsToGattServerImpl(LEServerInfo *serverInfo,
-        const uint8_t *data, const uint32_t dataLen)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL(serverInfo, TAG, "Server Info is NULL");
-
-    CALEGattStopDeviceScanning();
-
-    OIC_LOG_V(DEBUG, TAG, "Updating the data of length [%d] to [%s] ", dataLen,
-              serverInfo->remoteAddress);
-
-    int result = bt_gatt_set_value(serverInfo->writeChar, (char *)data, dataLen);
-
-    if (BT_ERROR_NONE != result)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_set_value Failed with return val [%s]",
-                  CALEGetErrorMsg(result));
-        goto exit;
-    }
-
-    result = bt_gatt_client_write_value(serverInfo->writeChar, CALEGattCharacteristicWriteCb,
-                                        NULL);
-    if (BT_ERROR_NONE != result)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_client_write_value Failed with return val [%s]",
-                  CALEGetErrorMsg(result));
-        goto exit;
-    }
-
-    // wait for callback for write Characteristic with success to sent data
-    OIC_LOG_V(DEBUG, TAG, "callback flag is %d", g_isSignalSetFlag);
-    oc_mutex_lock(g_threadWriteCharacteristicMutex);
-    if (!g_isSignalSetFlag)
-    {
-        OIC_LOG(DEBUG, TAG, "wait for callback to notify writeCharacteristic is success");
-        if (OC_WAIT_SUCCESS != oc_cond_wait_for(g_threadWriteCharacteristicCond,
-                                                g_threadWriteCharacteristicMutex,
-                                                WAIT_TIME_WRITE_CHARACTERISTIC))
-        {
-            g_isSignalSetFlag = false;
-            oc_mutex_unlock(g_threadWriteCharacteristicMutex);
-            OIC_LOG(ERROR, TAG, "there is no response. write has failed");
-            goto exit;
-        }
-    }
-    // reset flag set by writeCharacteristic Callback
-    g_isSignalSetFlag = false;
-    oc_mutex_unlock(g_threadWriteCharacteristicMutex);
-
-    oc_mutex_lock(g_scanMutex);
-    if (g_isMulticastInProgress || g_isUnicastScanInProgress)
-    {
-        if (CA_STATUS_OK != CALEGattStartDeviceScanning())
-        {
-            OIC_LOG(ERROR, TAG, "Could not start device scanning");
-        }
-    }
-    oc_mutex_unlock(g_scanMutex);
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-
-exit:
-    oc_mutex_lock(g_scanMutex);
-    if (g_isMulticastInProgress || g_isUnicastScanInProgress)
-    {
-        if (CA_STATUS_OK != CALEGattStartDeviceScanning())
-        {
-            OIC_LOG(ERROR, TAG, "Could not start device scanning");
-        }
-    }
-    oc_mutex_unlock(g_scanMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_FAILED;
-}
-
-void CADiscoverLEServicesThread(void *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL_VOID(remoteAddress, TAG, "remote address is NULL");
-
-    char *address  = (char *)remoteAddress;
-
-    CAResult_t result = CALEGattDiscoverServices(address);
-    if (CA_STATUS_OK != result)
-    {
-        OIC_LOG(ERROR, TAG, "CALEGattDiscoverServices failed");
-    }
-
-    OICFree(address);
-    OIC_LOG(DEBUG, TAG, "OUT");
-}
-
-CAResult_t CALEGattDiscoverServices(const char *remoteAddress)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL_RET(remoteAddress, TAG,
-                        "remote address is NULL", CA_STATUS_FAILED);
-
-    LEServerInfo *serverInfo = NULL;
-    unsigned int mtu_size;
-    oc_mutex_lock(g_LEServerListMutex);
-    if (CA_STATUS_OK != CAGetLEServerInfo(g_LEServerList, remoteAddress, &serverInfo))
-    {
-        oc_mutex_unlock(g_LEServerListMutex);
-        OIC_LOG_V(ERROR, TAG, "Could not get server info for [%s]", remoteAddress);
-        CALEGattDisConnect(remoteAddress);
-        return CA_STATUS_FAILED;
-    }
-
-    bt_gatt_h serviceHandle = NULL;
-    int32_t ret = bt_gatt_client_get_service(serverInfo->clientHandle, CA_GATT_SERVICE_UUID, &serviceHandle);
-    if (BT_ERROR_NONE != ret || NULL == serviceHandle)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_client_get_service Failed with ret value [%s] ", CALEGetErrorMsg(ret));
-        goto error_exit;
-    }
-
-    // Server will read data on this characteristic.
-    bt_gatt_h writeChrHandle = NULL;
-    ret = bt_gatt_service_get_characteristic(serviceHandle, CA_GATT_REQUEST_CHRC_UUID,
-            &writeChrHandle);
-    if (BT_ERROR_NONE != ret || NULL == writeChrHandle)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_service_get_characteristic Failed with ret value [%s] ",
-                  CALEGetErrorMsg(ret));
-        goto error_exit;
-    }
-
-    // Server will notify data on this characteristic.
-    bt_gatt_h readChrHandle = NULL;
-    ret = bt_gatt_service_get_characteristic(serviceHandle, CA_GATT_RESPONSE_CHRC_UUID,
-            &readChrHandle);
-    if (BT_ERROR_NONE != ret || NULL == readChrHandle)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_service_get_characteristic Failed with ret value [%s] ",
-                  CALEGetErrorMsg(ret));
-        goto error_exit;
-    }
-
-    //TODO: This data has to be freed while unsetting the callback.
-    char *addr = OICStrdup(remoteAddress);
-    if (NULL == addr)
-    {
-        OIC_LOG(ERROR, TAG, "addr is NULL");
-        goto error_exit;
-    }
-
-    ret = bt_gatt_client_set_characteristic_value_changed_cb(readChrHandle,
-            CALEGattCharacteristicChangedCb,
-            (void *)addr);
-    if (BT_ERROR_NONE != ret)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_client_set_characteristic_value_changed_cb Failed with ret value [%s]",
-                  CALEGetErrorMsg(ret));
-        goto error_exit;
-    }
-
-    ret = bt_gatt_client_set_att_mtu_changed_cb(serverInfo->clientHandle,
-            CALEGattClientMTUChangedCb,
-            (void *)serverInfo->remoteAddress);
-    if (BT_ERROR_NONE != ret)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_client_set_att_mtu_changed_cb Failed with ret value [%s]",
-                  CALEGetErrorMsg(ret));
-        goto error_exit;
-    }
-
-    oc_mutex_lock(g_threadMTUChangedMutex);
-    ret = bt_gatt_client_request_att_mtu_change(serverInfo->clientHandle, CA_SUPPORTED_BLE_MTU_SIZE - CA_BLE_MTU_HEADER_SIZE);
-    if (BT_ERROR_NONE != ret)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_client_request_att_mtu_change Failed with ret value [%s]",
-                  CALEGetErrorMsg(ret));
-        oc_mutex_unlock(g_threadMTUChangedMutex);
-        goto error_exit;
-    }
-
-    OIC_LOG(DEBUG, TAG, "wait for callback to notify MTU Changed Callback");
-    oc_cond_wait(g_threadMTUChangedCond, g_threadMTUChangedMutex);
-    oc_mutex_unlock(g_threadMTUChangedMutex);
-
-    OIC_LOG(DEBUG, TAG, "Done MTU");
-    ret = bt_gatt_client_get_att_mtu(serverInfo->clientHandle, &mtu_size);
-    if (BT_ERROR_NONE != ret)
-    {
-        OIC_LOG_V(ERROR, TAG,
-                  "bt_gatt_client_get_att_mtu Failed with ret value [%s]",
-                  CALEGetErrorMsg(ret));
-        goto error_exit;
-    }
-    OIC_LOG_V(DEBUG, TAG,"Negotiated MTU Size %d",mtu_size);
-
-    serverInfo->serviceHandle = serviceHandle;
-    serverInfo->readChar = readChrHandle;
-    serverInfo->writeChar = writeChrHandle;
-    serverInfo->status = LE_STATUS_SERVICES_DISCOVERED;
-    serverInfo->mtu_size = mtu_size;
-
-    while (serverInfo->pendingDataList)
-    {
-        LEData *leData = serverInfo->pendingDataList->data;
-        if (CA_STATUS_OK != CAUpdateCharacteristicsToGattServerImpl(
-                serverInfo, leData->data, leData->dataLength))
-        {
-            OIC_LOG_V(ERROR, TAG, "Failed to send pending data to [%s]",
-                      serverInfo->remoteAddress);
-
-            CADestroyLEDataList(&serverInfo->pendingDataList);
-            break;
-        }
-        CARemoveLEDataFromList(&serverInfo->pendingDataList);
-    }
-    oc_mutex_unlock(g_LEServerListMutex);
-
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-
-error_exit:
-    bt_gatt_client_destroy(serverInfo->clientHandle);
-    serverInfo->clientHandle = NULL;
-    oc_mutex_unlock(g_LEServerListMutex);
-    CALEGattDisConnect(remoteAddress);
-    return CA_STATUS_FAILED;
-}
-
-CAResult_t CAUpdateCharacteristicsToGattServer(const char *remoteAddress,
-        const uint8_t *data, const uint32_t dataLen,
-        CALETransferType_t type, const int32_t position)
-{
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    VERIFY_NON_NULL(data, TAG, "data is NULL");
-
-    if (0 == dataLen)
-    {
-        OIC_LOG(ERROR, TAG, "dataLen is less than or equal zero. Invalid input!");
-        return CA_STATUS_INVALID_PARAM;
-    }
-
-    LEServerInfo *serverInfo = NULL;
-    oc_mutex_lock(g_LEServerListMutex);
-    if (LE_UNICAST == type)
-    {
-        if (CA_STATUS_OK != CAGetLEServerInfo(g_LEServerList, remoteAddress, &serverInfo))
-        {
-            OIC_LOG_V(DEBUG, TAG,
-                      "Device with address [%s] not yet found, initiating scan",
-                      remoteAddress);
-
-            char *addr = OICStrdup(remoteAddress);
-            if (NULL == addr)
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG(ERROR, TAG, "Device address is NULL");
-                return CA_STATUS_FAILED;
-            }
-            serverInfo = (LEServerInfo *)OICCalloc(1, sizeof(LEServerInfo));
-            if (NULL == serverInfo)
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG(ERROR, TAG, "Calloc failed");
-                OICFree(addr);
-                return CA_STATUS_FAILED;
-            }
-            serverInfo->remoteAddress = addr;
-            serverInfo->status = LE_STATUS_UNICAST_PENDING;
-
-            if (CA_STATUS_OK != CAAddLEServerInfoToList(&g_LEServerList, serverInfo))
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG_V(ERROR, TAG, "Could not add [%s] to server list", remoteAddress);
-                CAFreeLEServerInfo(serverInfo);
-                return CA_STATUS_FAILED;
-            }
-
-            if (CA_STATUS_OK != CAAddLEDataToList(&serverInfo->pendingDataList, data, dataLen))
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                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)
-            {
-                CAResult_t result = CALEGattStartDeviceScanning();
-                if (CA_STATUS_OK != result)
-                {
-                    oc_mutex_unlock(g_scanMutex);
-                    OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning failed");
-                    return CA_STATUS_FAILED;
-                }
-                g_isUnicastScanInProgress = true;
-                // Start Timer
-                oc_cond_signal(g_startTimerCond);
-            }
-            else
-            {
-                g_isUnicastScanInProgress = true;
-                // Reset Timer
-                oc_cond_signal(g_scanningTimeCond);
-            }
-            oc_mutex_unlock(g_scanMutex);
-
-        }
-
-        if (serverInfo->status == LE_STATUS_DISCOVERED)
-        {
-            if (CA_STATUS_OK != CAAddLEDataToList(&serverInfo->pendingDataList, data, dataLen))
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG(ERROR, TAG, "Could not add data to pending list");
-                return CA_STATUS_FAILED;
-            }
-
-            bt_gatt_client_h clientHandle = NULL;
-            int32_t ret = bt_gatt_client_create(serverInfo->remoteAddress, &clientHandle);
-            if (BT_ERROR_NONE != ret || NULL == clientHandle)
-            {
-                OIC_LOG_V(ERROR, TAG,
-                          "bt_gatt_client_create Failed with ret value [%s] ", CALEGetErrorMsg(ret));
-                CALEGattDisConnect(serverInfo->remoteAddress);
-                return CA_STATUS_FAILED;
-            }
-            serverInfo->clientHandle = clientHandle;
-
-            serverInfo->status = LE_STATUS_CONNECTION_INITIATED;
-            if (CA_STATUS_OK != CALEGattInitiateConnection(serverInfo->remoteAddress))
-            {
-                OIC_LOG_V(ERROR, TAG, "Could not initiate connection to [%s]", serverInfo->remoteAddress);
-                serverInfo->status = LE_STATUS_DISCOVERED;
-                CADestroyLEDataList(&serverInfo->pendingDataList);
-                oc_mutex_unlock(g_LEServerListMutex);
-                return CA_STATUS_FAILED;
-            }
-        }
-        else if (serverInfo->status < LE_STATUS_SERVICES_DISCOVERED)
-        {
-            if (CA_STATUS_OK != CAAddLEDataToList(&serverInfo->pendingDataList, data, dataLen))
-            {
-                oc_mutex_unlock(g_LEServerListMutex);
-                OIC_LOG(ERROR, TAG, "Could not add data to pending list");
-                return CA_STATUS_FAILED;
-            }
-        }
-        else
-        {
-            if (CA_STATUS_OK != CAUpdateCharacteristicsToGattServerImpl(serverInfo, data, dataLen))
-            {
-                OIC_LOG_V(ERROR, TAG, "Could not update characteristic to gatt server [%s]",
-                          serverInfo->remoteAddress);
-                oc_mutex_unlock(g_LEServerListMutex);
-                return CA_STATUS_FAILED;
-            }
-        }
-    }
-    else if (LE_MULTICAST == type)
-    {
-        OIC_LOG(ERROR, TAG, "LE_MULTICAST type Not used");
-    }
-    oc_mutex_unlock(g_LEServerListMutex);
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
-}
-
-CAResult_t CAUpdateCharacteristicsToAllGattServers(const uint8_t *data, uint32_t dataLen)
-{
-    OIC_LOG(DEBUG,  TAG, "IN");
-
-    VERIFY_NON_NULL(data, TAG, "data is NULL");
-
-    if (0 == dataLen)
-    {
-        OIC_LOG(ERROR, TAG, "dataLen is less than or equal zero. Invalid input !");
-        return CA_STATUS_INVALID_PARAM;
-    }
-
-    oc_mutex_lock(g_LEServerListMutex);
-    LEServerInfoList *curNode = g_LEServerList;
-    while (curNode)
-    {
-        LEServerInfo *serverInfo = curNode->serverInfo;
-        if (serverInfo->status == LE_STATUS_SERVICES_DISCOVERED)
-        {
-            if (CA_STATUS_OK != CAUpdateCharacteristicsToGattServerImpl(serverInfo, data, dataLen))
-            {
-                OIC_LOG_V(ERROR, TAG, "Failed to update characteristics to gatt server [%s]",
-                          serverInfo->remoteAddress);
-            }
-        }
-        else if (serverInfo->status != LE_STATUS_INVALID)
-        {
-            if (CA_STATUS_OK != CAAddLEDataToList(&serverInfo->pendingDataList, data, dataLen))
-            {
-                OIC_LOG(ERROR, TAG, "Failed to add to pending list");
-            }
-        }
-        curNode = curNode->next;
-    }
-    oc_mutex_unlock(g_LEServerListMutex);
-
-    // Add the data to pending list.
-    LEData *multicastData = (LEData *)OICCalloc(1, sizeof(LEData));
-    if (NULL == multicastData)
-    {
-        OIC_LOG(ERROR, TAG, "Calloc failed");
-        goto exit;
-    }
-    multicastData->data = OICCalloc(1, dataLen);
-    if (NULL == multicastData->data)
-    {
-        OIC_LOG(ERROR, TAG, "Calloc failed");
-        goto exit;
-    }
-    memcpy(multicastData->data, data, dataLen);
-    multicastData->dataLength = dataLen;
-
-    oc_mutex_lock(g_multicastDataListMutex);
-    if (NULL == g_multicastDataList)
-    {
-        g_multicastDataList = u_arraylist_create();
-    }
-    u_arraylist_add(g_multicastDataList, (void *)multicastData);
-    oc_mutex_unlock(g_multicastDataListMutex);
-
-    // Start the scanning, if not started, else reset timer
-    oc_mutex_lock(g_scanMutex);
-    if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
-    {
-        CAResult_t result = CALEGattStartDeviceScanning();
-        if (CA_STATUS_OK != result)
-        {
-            oc_mutex_unlock(g_scanMutex);
-            OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning Failed");
-            goto exit;
-        }
-        g_isMulticastInProgress = true;
-        // Start the timer by signalling it
-        oc_cond_signal(g_startTimerCond);
-    }
-    else
-    {
-        g_isMulticastInProgress = true;
-        // Reset timer
-        oc_cond_signal(g_scanningTimeCond);
-    }
-    oc_mutex_unlock(g_scanMutex);
-
-exit:
-    OIC_LOG(DEBUG, TAG, "OUT ");
-    return CA_STATUS_OK;
-}
-
-uint16_t CALEClientGetMtuSize(const char* remote_address)
-{
-    LEServerInfo *serverInfo = NULL;
-    oc_mutex_lock(g_LEServerListMutex);
-    if (CA_STATUS_OK == CAGetLEServerInfo(g_LEServerList, remote_address, &serverInfo))
-    {
-        if (serverInfo->status == LE_STATUS_SERVICES_DISCOVERED){
-            OIC_LOG_V(DEBUG, TAG, "Mtu Size [%d]", serverInfo->mtu_size);
-            oc_mutex_unlock(g_LEServerListMutex);
-            OIC_LOG_V(INFO, TAG, "Test: returning Mtu Size [%d]", serverInfo->mtu_size - CA_BLE_MTU_HEADER_SIZE);
-            return serverInfo->mtu_size - CA_BLE_MTU_HEADER_SIZE;
-        }
-    }
-    oc_mutex_unlock(g_LEServerListMutex);
-    return CA_DEFAULT_BLE_MTU_SIZE;
-}
-
-bool CALEClientIsConnected(const char* address)
-{
-    (void)address;
-    //@Todo
-    return true;
-}
-
-CAResult_t CALEClientSendNegotiationMessage(const char* address)
-{
-    /* MCD : change the log as INFO_PRIVATE for security */
-    OIC_LOG_V(INFO_PRIVATE, TAG, "CALEClientSendNegotiationMessage(%s)", address);
-    //@Todo
-    //it will be implemented when tizen public 3.0 is released.
-    return CA_NOT_SUPPORTED;
-}