Imported Upstream version 1.0.0
[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / bt_le_adapter / caleadapter.c
index ff60572..571a890 100644 (file)
@@ -1,4 +1,4 @@
-/******************************************************************
+/* ****************************************************************
  *
  * Copyright 2014 Samsung Electronics All Rights Reserved.
  *
  ******************************************************************/
 #include "caleadapter.h"
 
-#ifdef __TIZEN__
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <ifaddrs.h>
-#include <unistd.h>
-#include <pthread.h>
-#endif //#ifdef __TIZEN__
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef __TIZEN__
-#include "cableserver.h"
-#include "cableclient.h"
+#include "caleinterface.h"
 #include "cacommon.h"
-#else // __ARDUINO__
-#include "BLEAdapterArduino.h"
+#include "camutex.h"
 #include "caadapterutils.h"
-#endif //#ifdef __TIZEN__
-#define CALEADAPTER_TAG "CA_BLE_ADAPTER"
+#ifndef SINGLE_THREAD
+#include "caqueueingthread.h"
+#endif
+#include "cafragmentation.h"
+#include "oic_malloc.h"
+#include "oic_string.h"
+#include "caremotehandler.h"
+
+/**
+ * Logging tag for module name.
+ */
+#define CALEADAPTER_TAG "LAD"
+
+
+/**
+ * Stores the information of the Data to be sent from the queues.
+ *
+ * This structure will be pushed to the sender/receiver queue for
+ * processing.
+ */
+typedef struct
+{
+    /// Remote endpoint contains the information of remote device.
+    CAEndpoint_t *remoteEndpoint;
+
+    /// Data to be transmitted over LE transport.
+    uint8_t *data;
+
+    /// Length of the data being transmitted.
+    uint32_t dataLen;
+} CALEData_t;
+
+/**
+ * Stores information of all the senders.
+ *
+ * This structure will be used to track and defragment all incoming
+ * data packet.
+ */
+typedef struct
+{
+    uint32_t recvDataLen;
+    uint32_t totalDataLen;
+    uint8_t *defragData;
+    CAEndpoint_t *remoteEndpoint;
+ } CABLESenderInfo_t;
+
+/**
+ * Callback to provide the status of the network change to CA layer.
+ */
+static CANetworkChangeCallback g_networkCallback = NULL;
+
+/**
+ * bleAddress of the local adapter. Value will be initialized to zero,
+ * and will be updated later.
+ */
+static char g_localBLEAddress[18] = { 0 };
+
+/**
+ * Variable to differentiate btw GattServer and GattClient.
+ */
+static bool g_isServer = false;
+
+/**
+ * Mutex to synchronize the task to be executed on the GattServer
+ * function calls.
+ */
+static ca_mutex g_bleIsServerMutex = NULL;
+
+/**
+ * Mutex to synchronize the callback to be called for the network
+ * changes.
+ */
+static ca_mutex g_bleNetworkCbMutex = NULL;
+
+/**
+ * Mutex to synchronize the updates of the local LE address of the
+ * adapter.
+ */
+static ca_mutex g_bleLocalAddressMutex = NULL;
+
+/**
+ * Reference to thread pool.
+ */
+static ca_thread_pool_t g_bleAdapterThreadPool = NULL;
+
+/**
+ * Mutex to synchronize the task to be pushed to thread pool.
+ */
+static ca_mutex g_bleAdapterThreadPoolMutex = NULL;
+
+/**
+ * Mutex to synchronize the queing of the data from SenderQueue.
+ */
+static ca_mutex g_bleClientSendDataMutex = NULL;
+
+/**
+ * Mutex to synchronize the queing of the data from ReceiverQueue.
+ */
+static ca_mutex g_bleReceiveDataMutex = NULL;
+
+
+/**
+ * Mutex to synchronize the queing of the data from SenderQueue.
+ */
+static ca_mutex g_bleServerSendDataMutex = NULL;
+
+/**
+ * Mutex to synchronize the callback to be called for the
+ * adapterReqResponse.
+ */
+static ca_mutex g_bleAdapterReqRespCbMutex = NULL;
+
+/**
+ * Callback to be called when network packet received from either
+ * GattServer or GattClient.
+ */
+static CANetworkPacketReceivedCallback g_networkPacketReceivedCallback = NULL;
+
+/**
+ * Callback to notify error from the BLE adapter.
+ */
+static CAErrorHandleCallback g_errorHandler = NULL;
+
+/**
+ * Storing Adapter state information.
+ */
+static CAAdapterState_t g_bleAdapterState = CA_ADAPTER_DISABLED;
+
+/**
+ * BLE Server Status.
+ *
+ * This enumeration provides information of LE Adapter Server status.
+ */
+typedef enum
+{
+    CA_SERVER_NOTSTARTED = 0,
+    CA_LISTENING_SERVER,
+    CA_DISCOVERY_SERVER
+} CALeServerStatus;
+
+/**
+ * Structure to maintain the status of the server.
+ */
+static CALeServerStatus gLeServerStatus = CA_SERVER_NOTSTARTED;
+
+/**
+ * Register network change notification callback.
+ *
+ * @param[in]  netCallback CANetworkChangeCallback callback which will
+ *                         be set for the change in network.
+ *
+ * @return  0 on success otherwise a positive error value.
+ * @retval  ::CA_STATUS_OK  Successful.
+ * @retval  ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval  ::CA_STATUS_FAILED Operation failed.
+ *
+ */
+static CAResult_t CALERegisterNetworkNotifications(CANetworkChangeCallback netCallback);
+
+/**
+ * Set the thread pool handle which is required for spawning new
+ * thread.
+ *
+ * @param[in] handle Thread pool handle which is given by above layer
+ *                   for using thread creation task.
+ *
+ */
+static void CASetLEAdapterThreadPoolHandle(ca_thread_pool_t handle);
+
+/**
+ * Call the callback to the upper layer when the device state gets
+ * changed.
+ *
+ * @param[in] adapter_state New state of the adapter to be notified to
+ *                          the upper layer.
+ */
+static void CALEDeviceStateChangedCb(CAAdapterState_t adapter_state);
+
+/**
+ * Used to initialize all required mutex variable for LE Adapter
+ * implementation.
+ *
+ * @return  0 on success otherwise a positive error value.
+ * @retval  ::CA_STATUS_OK  Successful.
+ * @retval  ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval  ::CA_STATUS_FAILED Operation failed.
+ *
+ */
+static CAResult_t CAInitLEAdapterMutex();
+
+/**
+ * Terminate all required mutex variables for LE adapter
+ * implementation.
+ */
+static void CATerminateLEAdapterMutex();
+
+/**
+ * Prepares and notify error through error callback.
+ */
+static void CALEErrorHandler(const char *remoteAddress,
+                             const uint8_t *data,
+                             uint32_t dataLen,
+                             CAResult_t result);
+
+#ifndef SINGLE_THREAD
+/**
+ * Stop condition of recvhandler.
+ */
+static bool g_dataReceiverHandlerState = false;
+
+/**
+ * Sender information.
+ */
+static u_arraylist_t *g_senderInfo = NULL;
+
+/**
+ * Queue to process the outgoing packets from GATTClient.
+ */
+static CAQueueingThread_t *g_bleClientSendQueueHandle = NULL;
+
+/**
+ * Queue to process the incoming packets to GATT Client.
+ */
+static CAQueueingThread_t *g_bleReceiverQueue = NULL;
+
+/**
+ * Queue to process the outgoing packets from GATTServer.
+ */
+static CAQueueingThread_t *g_bleServerSendQueueHandle = NULL;
+
+/**
+ * This function will be associated with the sender queue for
+ * GattServer.
+ *
+ * This function will fragment the data to the MTU of the transport
+ * and send the data in fragments to the adapters. The function will
+ * be blocked until all data is sent out from the adapter.
+ *
+ * @param[in] threadData Data pushed to the queue which contains the
+ *                       info about RemoteEndpoint and Data.
+ */
+static void CALEServerSendDataThread(void *threadData);
+
+/**
+ * This function will be associated with the sender queue for
+ * GattClient.
+ *
+ * This function will fragment the data to the MTU of the transport
+ * and send the data in fragments to the adapters. The function will
+ * be blocked until all data is sent out from the adapter.
+ *
+ * @param[in] threadData Data pushed to the queue which contains the
+ *                       info about RemoteEndpoint and Data.
+ */
+static void CALEClientSendDataThread(void *threadData);
+
+/**
+ * This function will be associated with the receiver queue.
+ *
+ * This function will defragment the received data from each sender
+ * respectively and will send it up to CA layer.  Respective sender's
+ * header will provide the length of the data sent.
+ *
+ * @param[in] threadData Data pushed to the queue which contains the
+ *                       info about RemoteEndpoint and Data.
+ */
+static void CALEDataReceiverHandler(void *threadData);
+
+/**
+ * This function will stop all queues created for GattServer and
+ * GattClient. All four queues will be be stopped with this function
+ * invocations.
+ */
+static void CAStopLEQueues();
+
+/**
+ * This function will terminate all queues created for GattServer and
+ * GattClient. All four queues will be be terminated with this
+ * function invocations.
+ */
+static void CATerminateLEQueues();
+
+/**
+ * This function will initalize the Receiver and Sender queues for
+ * GattServer. This function will in turn call the functions
+ * CAInitBleServerReceiverQueue() and CAInitBleServerSenderQueue() to
+ * initialize the queues.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CAResult_t CAInitLEServerQueues();
+
+/**
+ * This function will initalize the Receiver and Sender queues for
+ * GattClient. This function will inturn call the functions
+ * CAInitBleClientReceiverQueue() and CAInitBleClientSenderQueue() to
+ * initialize the queues.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ *
+ */
+static CAResult_t CAInitLEClientQueues();
+
+/**
+ * This function will initalize the Receiver queue for
+ * GattServer. This will initialize the queue to process the function
+ * CABLEServerSendDataThread() when ever the task is added to this
+ * queue.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CAResult_t CAInitLEServerSenderQueue();
+
+/**
+ * This function will initalize the Receiver queue for
+ * GattClient. This will initialize the queue to process the function
+ * CABLEClientSendDataThread() when ever the task is added to this
+ * queue.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CAResult_t CAInitLEClientSenderQueue();
+
+/**
+ * This function will initialize the Receiver queue for
+ * LEAdapter. This will initialize the queue to process the function
+ * CABLEDataReceiverHandler() when ever the task is added to this
+ * queue.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code
+ * @retval ::CA_STATUS_OK  Successful
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments
+ * @retval ::CA_STATUS_FAILED Operation failed
+ *
+ */
+static CAResult_t CAInitLEReceiverQueue();
+
+/**
+ * This function will create the Data required to send it in the
+ * queue.
+ *
+ * @param[in] remoteEndpoint Remote endpoint information of the
+ *                           server.
+ * @param[in] data           Data to be transmitted from LE.
+ * @param[in] dataLength     Length of the Data being transmitted.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CALEData_t *CACreateLEData(const CAEndpoint_t *remoteEndpoint,
+                                  const uint8_t *data,
+                                  uint32_t dataLength);
+
+/**
+ * Used to free the BLE information stored in the sender/receiver
+ * queues.
+ *
+ * @param[in] bleData Information for a particular data segment.
+ */
+static void CAFreeLEData(CALEData_t *bleData);
+
+/**
+ * Free data.
+ */
+static void CALEDataDestroyer(void *data, uint32_t size);
+
+static CAResult_t CAInitLEServerQueues()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_lock(g_bleAdapterThreadPoolMutex);
+
+    CAResult_t result = CAInitLEServerSenderQueue();
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleServerSenderQueue failed");
+        ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+        return CA_STATUS_FAILED;
+    }
+
+    result = CAInitLEReceiverQueue();
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleServerReceiverQueue failed");
+        ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+        return CA_STATUS_FAILED;
+    }
+
+    g_dataReceiverHandlerState = true;
+
+    ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static CAResult_t CAInitLEClientQueues()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_lock(g_bleAdapterThreadPoolMutex);
+
+    CAResult_t result = CAInitLEClientSenderQueue();
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleClientSenderQueue failed");
+        ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+        return CA_STATUS_FAILED;
+    }
+
+    result = CAInitLEReceiverQueue();
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleClientReceiverQueue failed");
+        ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+        return CA_STATUS_FAILED;
+    }
+
+    g_dataReceiverHandlerState = true;
+
+    ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static CAResult_t CAInitLEReceiverQueue()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+    // Check if the message queue is already initialized
+    if (g_bleReceiverQueue)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Already queue is initialized!");
+        return CA_STATUS_OK;
+    }
+
+    // Create recv message queue
+    g_bleReceiverQueue = (CAQueueingThread_t *) OICMalloc(sizeof(CAQueueingThread_t));
+    if (!g_bleReceiverQueue)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Memory allocation failed!");
+        return CA_MEMORY_ALLOC_FAILED;
+    }
+
+    g_senderInfo = u_arraylist_create();
+    if (!g_senderInfo)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "ClientInfo memory allcation failed!");
+        OICFree(g_bleReceiverQueue);
+        g_bleReceiverQueue = NULL;
+        return CA_MEMORY_ALLOC_FAILED;
+    }
+
+    if (CA_STATUS_OK != CAQueueingThreadInitialize(g_bleReceiverQueue, g_bleAdapterThreadPool,
+            CALEDataReceiverHandler, CALEDataDestroyer))
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to Initialize send queue thread");
+        OICFree(g_bleReceiverQueue);
+        g_bleReceiverQueue = NULL;
+        u_arraylist_free(&g_senderInfo);
+        return CA_STATUS_FAILED;
+    }
+
+    if (CA_STATUS_OK != CAQueueingThreadStart(g_bleReceiverQueue))
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_thread_pool_add_task failed ");
+        OICFree(g_bleReceiverQueue);
+        g_bleReceiverQueue = NULL;
+        u_arraylist_free(&g_senderInfo);
+        return CA_STATUS_FAILED;
+    }
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static CAResult_t CAInitLEServerSenderQueue()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+    // Check if the message queue is already initialized
+    if (g_bleServerSendQueueHandle)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Queue is already initialized!");
+        return CA_STATUS_OK;
+    }
+
+    // Create send message queue
+    g_bleServerSendQueueHandle = (CAQueueingThread_t *) OICMalloc(sizeof(CAQueueingThread_t));
+    if (!g_bleServerSendQueueHandle)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Memory allocation failed!");
+        return CA_MEMORY_ALLOC_FAILED;
+    }
+
+    if (CA_STATUS_OK != CAQueueingThreadInitialize(g_bleServerSendQueueHandle,
+                                                   g_bleAdapterThreadPool,
+                                                   CALEServerSendDataThread, CALEDataDestroyer))
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to Initialize send queue thread");
+        OICFree(g_bleServerSendQueueHandle);
+        g_bleServerSendQueueHandle = NULL;
+        return CA_STATUS_FAILED;
+    }
+
+    if (CA_STATUS_OK != CAQueueingThreadStart(g_bleServerSendQueueHandle))
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_thread_pool_add_task failed ");
+        OICFree(g_bleServerSendQueueHandle);
+        g_bleServerSendQueueHandle = NULL;
+        return CA_STATUS_FAILED;
+    }
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static void CALEClearSenderInfo()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    uint32_t listIndex = 0;
+    uint32_t listLength = u_arraylist_length(g_senderInfo);
+    for (listIndex = 0; listIndex < listLength; listIndex++)
+    {
+        CABLESenderInfo_t *info = (CABLESenderInfo_t *) u_arraylist_get(g_senderInfo, listIndex);
+        if(!info)
+        {
+            continue;
+        }
+
+        OICFree(info->defragData);
+        CAFreeEndpoint(info->remoteEndpoint);
+        OICFree(info);
+    }
+    u_arraylist_free(&g_senderInfo);
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static CAResult_t CAInitLEClientSenderQueue()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    if (g_bleClientSendQueueHandle)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Already queue is initialized!");
+        return CA_STATUS_OK;
+    }
+
+    // Create send message queue
+    g_bleClientSendQueueHandle = (CAQueueingThread_t *) OICMalloc(sizeof(CAQueueingThread_t));
+    if (!g_bleClientSendQueueHandle)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Memory allocation failed!");
+        return CA_MEMORY_ALLOC_FAILED;
+    }
+
+    if (CA_STATUS_OK != CAQueueingThreadInitialize(g_bleClientSendQueueHandle,
+                                                   g_bleAdapterThreadPool,
+                                                   CALEClientSendDataThread, CALEDataDestroyer))
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to Initialize send queue thread");
+        OICFree(g_bleClientSendQueueHandle);
+        g_bleClientSendQueueHandle = NULL;
+        return CA_STATUS_FAILED;
+    }
+
+    if (CA_STATUS_OK != CAQueueingThreadStart(g_bleClientSendQueueHandle))
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_thread_pool_add_task failed ");
+        OICFree(g_bleClientSendQueueHandle);
+        g_bleClientSendQueueHandle = NULL;
+        return CA_STATUS_FAILED;
+    }
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static void CAStopLEQueues()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_lock(g_bleClientSendDataMutex);
+    if (NULL != g_bleClientSendQueueHandle)
+    {
+        CAQueueingThreadStop(g_bleClientSendQueueHandle);
+    }
+    ca_mutex_unlock(g_bleClientSendDataMutex);
+
+    ca_mutex_lock(g_bleServerSendDataMutex);
+    if (NULL != g_bleServerSendQueueHandle)
+    {
+        CAQueueingThreadStop(g_bleServerSendQueueHandle);
+    }
+    ca_mutex_unlock(g_bleServerSendDataMutex);
+
+    ca_mutex_lock(g_bleReceiveDataMutex);
+    if (NULL != g_bleReceiverQueue)
+    {
+        CAQueueingThreadStop(g_bleReceiverQueue);
+    }
+    ca_mutex_unlock(g_bleReceiveDataMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static void CATerminateLEQueues()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    CAQueueingThreadDestroy(g_bleClientSendQueueHandle);
+    OICFree(g_bleClientSendQueueHandle);
+    g_bleClientSendQueueHandle = NULL;
+
+    CAQueueingThreadDestroy(g_bleServerSendQueueHandle);
+    OICFree(g_bleServerSendQueueHandle);
+    g_bleServerSendQueueHandle = NULL;
+
+    CAQueueingThreadDestroy(g_bleReceiverQueue);
+    OICFree(g_bleReceiverQueue);
+    g_bleReceiverQueue = NULL;
+
+    CALEClearSenderInfo();
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static CAResult_t CALEGetSenderInfo(const char *leAddress,
+                                    CABLESenderInfo_t **senderInfo,
+                                    uint32_t *senderIndex)
+{
+    VERIFY_NON_NULL_RET(leAddress,
+                        CALEADAPTER_TAG,
+                        "NULL BLE address argument",
+                        CA_STATUS_INVALID_PARAM);
+    VERIFY_NON_NULL_RET(senderIndex,
+                        CALEADAPTER_TAG,
+                        "NULL index argument",
+                        CA_STATUS_INVALID_PARAM);
+
+    const uint32_t listLength = u_arraylist_length(g_senderInfo);
+    const uint32_t addrLength = strlen(leAddress);
+    for (uint32_t index = 0; index < listLength; index++)
+    {
+        CABLESenderInfo_t *info = (CABLESenderInfo_t *) u_arraylist_get(g_senderInfo, index);
+        if(!info || !(info->remoteEndpoint))
+        {
+            continue;
+        }
+
+        if(!strncmp(info->remoteEndpoint->addr, leAddress, addrLength))
+        {
+            *senderIndex = index;
+            if(senderInfo)
+            {
+                *senderInfo = info;
+            }
+            return CA_STATUS_OK;
+        }
+    }
+
+    return CA_STATUS_FAILED;
+}
+
+static void CALEDataReceiverHandler(void *threadData)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_lock(g_bleReceiveDataMutex);
+
+    if (g_dataReceiverHandlerState)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "checking for DE Fragmentation");
+
+        CALEData_t *bleData = (CALEData_t *) threadData;
+        if (!bleData)
+        {
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Invalid bleData!");
+            ca_mutex_unlock(g_bleReceiveDataMutex);
+            return;
+        }
+
+        if(!(bleData->remoteEndpoint))
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Client RemoteEndPoint NULL!!");
+            ca_mutex_unlock(g_bleReceiveDataMutex);
+            return;
+        }
+
+        CABLESenderInfo_t *senderInfo = NULL;
+        uint32_t senderIndex = 0;
+
+        if(CA_STATUS_OK != CALEGetSenderInfo(bleData->remoteEndpoint->addr,
+                                                &senderInfo, &senderIndex))
+        {
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "This is a new client [%s]",
+                                                bleData->remoteEndpoint->addr);
+        }
+
+        if(!senderInfo)
+        {
+            CABLESenderInfo_t *newSender = OICMalloc(sizeof(CABLESenderInfo_t));
+            if(!newSender)
+            {
+                OIC_LOG(ERROR, CALEADAPTER_TAG, "Memory allocation failed for new sender");
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+            newSender->recvDataLen = 0;
+            newSender->totalDataLen = 0;
+            newSender->defragData = NULL;
+            newSender->remoteEndpoint = NULL;
+
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Parsing the header");
+            newSender->totalDataLen = CAParseHeader(bleData->data,
+                                                    bleData->dataLen);
+            if(!(newSender->totalDataLen))
+            {
+                OIC_LOG(ERROR, CALEADAPTER_TAG, "Total Data Length is parsed as 0!!!");
+                OICFree(newSender);
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Total data to be accumulated [%u] bytes",
+                                                newSender->totalDataLen);
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "data received in the first packet [%u] bytes",
+                                                bleData->dataLen);
+
+            newSender->defragData = OICCalloc(newSender->totalDataLen + 1,
+                                              sizeof(*newSender->defragData));
+
+            if (NULL == newSender->defragData)
+            {
+                OIC_LOG(ERROR, CALEADAPTER_TAG, "defragData is NULL!");
+                OICFree(newSender);
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+
+            const char *remoteAddress = bleData->remoteEndpoint->addr;
+            newSender->remoteEndpoint = CACreateEndpointObject(CA_DEFAULT_FLAGS,
+                                                            CA_ADAPTER_GATT_BTLE, remoteAddress, 0);
+            if (NULL == newSender->remoteEndpoint)
+            {
+                OIC_LOG(ERROR, CALEADAPTER_TAG, "remoteEndpoint is NULL!");
+                OICFree(newSender->defragData);
+                OICFree(newSender);
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+            memcpy(newSender->defragData, bleData->data + CA_HEADER_LENGTH,
+                    bleData->dataLen - CA_HEADER_LENGTH);
+            newSender->recvDataLen += bleData->dataLen - CA_HEADER_LENGTH;
+            u_arraylist_add(g_senderInfo,(void *)newSender);
+
+            //Getting newSender index position in g_senderInfo array list
+            if(CA_STATUS_OK !=
+                CALEGetSenderInfo(newSender->remoteEndpoint->addr, NULL, &senderIndex))
+            {
+                OIC_LOG(ERROR, CALEADAPTER_TAG, "Existing sender index not found!!");
+                OICFree(newSender->defragData);
+                CAFreeEndpoint(newSender->remoteEndpoint);
+                OICFree(newSender);
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+            senderInfo = newSender;
+        }
+        else
+        {
+            if(senderInfo->recvDataLen + bleData->dataLen > senderInfo->totalDataLen)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG,
+                            "Data Length exceeding error!! Receiving [%d] total length [%d]",
+                            senderInfo->recvDataLen + bleData->dataLen, senderInfo->totalDataLen);
+                u_arraylist_remove(g_senderInfo, senderIndex);
+                OICFree(senderInfo->defragData);
+                OICFree(senderInfo);
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Copying the data of length [%d]", bleData->dataLen);
+            memcpy(senderInfo->defragData + senderInfo->recvDataLen, bleData->data,
+                    bleData->dataLen);
+            senderInfo->recvDataLen += bleData->dataLen ;
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "totalDatalength  [%d] recveived Datalen [%d]",
+                                                senderInfo->totalDataLen, senderInfo->recvDataLen);
+        }
+
+        if (senderInfo->totalDataLen == senderInfo->recvDataLen)
+        {
+            ca_mutex_lock(g_bleAdapterReqRespCbMutex);
+            if (NULL == g_networkPacketReceivedCallback)
+            {
+                OIC_LOG(ERROR, CALEADAPTER_TAG, "gReqRespCallback is NULL!");
+
+                u_arraylist_remove(g_senderInfo, senderIndex);
+                OICFree(senderInfo->defragData);
+                OICFree(senderInfo);
+                ca_mutex_unlock(g_bleAdapterReqRespCbMutex);
+                ca_mutex_unlock(g_bleReceiveDataMutex);
+                return;
+            }
+
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending data up !");
+
+            const CASecureEndpoint_t tmp =
+                {
+                    .endpoint = *senderInfo->remoteEndpoint
+                };
+
+            g_networkPacketReceivedCallback(&tmp,
+                                            senderInfo->defragData,
+                                            senderInfo->recvDataLen);
+            ca_mutex_unlock(g_bleAdapterReqRespCbMutex);
+            u_arraylist_remove(g_senderInfo, senderIndex);
+            senderInfo->remoteEndpoint = NULL;
+            senderInfo->defragData = NULL;
+            OICFree(senderInfo);
+        }
+    }
+    ca_mutex_unlock(g_bleReceiveDataMutex);
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static void CALEServerSendDataThread(void *threadData)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    CALEData_t * const bleData = (CALEData_t *) threadData;
+    if (!bleData)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Invalid bledata!");
+        return;
+    }
+
+    uint8_t * const header = OICCalloc(CA_HEADER_LENGTH, 1);
+    VERIFY_NON_NULL_VOID(header, CALEADAPTER_TAG, "Malloc failed");
+
+    const uint32_t totalLength = bleData->dataLen + CA_HEADER_LENGTH;
+
+    OIC_LOG_V(DEBUG,
+              CALEADAPTER_TAG,
+              "Server total Data length with header is [%u]",
+              totalLength);
+
+    uint8_t * const dataSegment = OICCalloc(totalLength, 1);
+
+    if (NULL == dataSegment)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Malloc failed");
+        OICFree(header);
+        return;
+    }
+
+    CAResult_t result = CAGenerateHeader(header,
+                                         CA_HEADER_LENGTH,
+                                         bleData->dataLen);
+    if (CA_STATUS_OK != result )
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Generate header failed");
+        OICFree(header);
+        OICFree(dataSegment);
+        return;
+    }
+
+    memcpy(dataSegment, header, CA_HEADER_LENGTH);
+    OICFree(header);
+
+    uint32_t length = 0;
+    if (CA_SUPPORTED_BLE_MTU_SIZE > totalLength)
+    {
+        length = totalLength;
+        memcpy(dataSegment + CA_HEADER_LENGTH, bleData->data, bleData->dataLen);
+    }
+    else
+    {
+        length =  CA_SUPPORTED_BLE_MTU_SIZE;
+        memcpy(dataSegment + CA_HEADER_LENGTH, bleData->data,
+               CA_SUPPORTED_BLE_MTU_SIZE - CA_HEADER_LENGTH);
+    }
+
+    uint32_t iter = totalLength / CA_SUPPORTED_BLE_MTU_SIZE;
+    uint32_t index = 0;
+
+    // Send the first segment with the header.
+    if (NULL != bleData->remoteEndpoint) // Sending Unicast Data
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Server Sending Unicast Data");
+
+        result = CAUpdateCharacteristicsToGattClient(
+                    bleData->remoteEndpoint->addr, dataSegment, length);
+
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG_V(ERROR,
+                      CALEADAPTER_TAG,
+                      "Update characteristics failed, result [%d]",
+                      result);
+
+            g_errorHandler(bleData->remoteEndpoint,
+                           bleData->data,
+                           bleData->dataLen,
+                           result);
+            OICFree(dataSegment);
+            return;
+        }
+
+        OIC_LOG_V(DEBUG,
+                  CALEADAPTER_TAG,
+                  "Server Sent data length [%u]",
+                  length);
+        for (index = 1; index < iter; index++)
+        {
+            // Send the remaining header.
+            OIC_LOG_V(DEBUG,
+                      CALEADAPTER_TAG,
+                      "Sending the chunk number [%u]",
+                      index);
+
+            result =
+                CAUpdateCharacteristicsToGattClient(
+                    bleData->remoteEndpoint->addr,
+                    bleData->data + ((index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH),
+                    CA_SUPPORTED_BLE_MTU_SIZE);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG,
+                            "Update characteristics failed, result [%d]", result);
+                g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%d]",
+                                               CA_SUPPORTED_BLE_MTU_SIZE);
+        }
+
+        const uint32_t remainingLen =
+            totalLength % CA_SUPPORTED_BLE_MTU_SIZE;
+
+        if (remainingLen && (totalLength > CA_SUPPORTED_BLE_MTU_SIZE))
+        {
+            // send the last segment of the data (Ex: 22 bytes of 622
+            // bytes of data when MTU is 200)
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending the last chunk");
+            result = CAUpdateCharacteristicsToGattClient(
+                         bleData->remoteEndpoint->addr,
+                         bleData->data + (index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH,
+                         remainingLen);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR,
+                          CALEADAPTER_TAG,
+                          "Update characteristics failed, result [%d]",
+                          result);
+                g_errorHandler(bleData->remoteEndpoint,
+                               bleData->data,
+                               bleData->dataLen,
+                               result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%d]", remainingLen);
+        }
+     }
+    else
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Server Sending Multicast data");
+        result = CAUpdateCharacteristicsToAllGattClients(dataSegment, length);
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics failed, result [%d]",
+                      result);
+            CALEErrorHandler(NULL, bleData->data, bleData->dataLen, result);
+            OICFree(dataSegment);
+            return;
+        }
+        OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%d]", length);
+        for (index = 1; index < iter; index++)
+        {
+            // Send the remaining header.
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Sending the chunk number [%d]", index);
+            result = CAUpdateCharacteristicsToAllGattClients(
+                         bleData->data + ((index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH),
+                         CA_SUPPORTED_BLE_MTU_SIZE);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics failed, result [%d]",
+                          result);
+                CALEErrorHandler(NULL, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%u]", CA_SUPPORTED_BLE_MTU_SIZE);
+        }
+
+        const uint32_t remainingLen = totalLength % CA_SUPPORTED_BLE_MTU_SIZE;
+        if (remainingLen && (totalLength > CA_SUPPORTED_BLE_MTU_SIZE))
+        {
+            // send the last segment of the data (Ex: 22 bytes of 622 bytes of data when MTU is 200)
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending the last chunk");
+            result = CAUpdateCharacteristicsToAllGattClients(
+                         bleData->data + (index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH,
+                         remainingLen);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics failed, result [%d]",
+                          result);
+                CALEErrorHandler(NULL, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%d]", remainingLen);
+        }
+    }
+    OICFree(dataSegment);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static void CALEClientSendDataThread(void *threadData)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    CALEData_t *bleData = (CALEData_t *) threadData;
+    if (!bleData)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Invalid bledata!");
+        return;
+    }
+
+    uint8_t * const header = OICCalloc(CA_HEADER_LENGTH, 1);
+    VERIFY_NON_NULL_VOID(header, CALEADAPTER_TAG, "Malloc failed");
+
+    const uint32_t totalLength = bleData->dataLen + CA_HEADER_LENGTH;
+    uint8_t *dataSegment = OICCalloc(totalLength, 1);
+    if (NULL == dataSegment)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Malloc failed");
+        OICFree(header);
+        return;
+    }
+
+    CAResult_t result = CAGenerateHeader(header,
+                                         CA_HEADER_LENGTH,
+                                         bleData->dataLen);
+    if (CA_STATUS_OK != result )
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Generate header failed");
+        OICFree(header);
+        OICFree(dataSegment);
+        return ;
+    }
+    memcpy(dataSegment, header, CA_HEADER_LENGTH);
+    OICFree(header);
+
+    uint32_t length = 0;
+    if (CA_SUPPORTED_BLE_MTU_SIZE > totalLength)
+    {
+        length = totalLength;
+        memcpy(dataSegment + CA_HEADER_LENGTH,
+               bleData->data,
+               bleData->dataLen);
+    }
+    else
+    {
+        length = CA_SUPPORTED_BLE_MTU_SIZE;
+        memcpy(dataSegment + CA_HEADER_LENGTH,
+               bleData->data,
+               CA_SUPPORTED_BLE_MTU_SIZE - CA_HEADER_LENGTH);
+    }
+
+    const uint32_t iter = totalLength / CA_SUPPORTED_BLE_MTU_SIZE;
+    uint32_t index = 0;
+    if (NULL != bleData->remoteEndpoint) //Sending Unicast Data
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending Unicast Data");
+        // Send the first segment with the header.
+        result =
+            CAUpdateCharacteristicsToGattServer(
+                bleData->remoteEndpoint->addr,
+                dataSegment,
+                length,
+                LE_UNICAST,
+                0);
+
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG_V(ERROR,
+                      CALEADAPTER_TAG,
+                      "Update characteristics failed, result [%d]",
+                      result);
+            g_errorHandler(bleData->remoteEndpoint,
+                           bleData->data,
+                           bleData->dataLen,
+                           result);
+            OICFree(dataSegment);
+            return;
+        }
+
+        OIC_LOG_V(DEBUG,
+                  CALEADAPTER_TAG,
+                  "Client Sent Data length  is [%u]",
+                  length);
+
+        for (index = 1; index < iter; index++)
+        {
+            // Send the remaining header.
+            result = CAUpdateCharacteristicsToGattServer(
+                     bleData->remoteEndpoint->addr,
+                     bleData->data + (index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH,
+                     CA_SUPPORTED_BLE_MTU_SIZE,
+                     LE_UNICAST, 0);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR,
+                          CALEADAPTER_TAG,
+                          "Update characteristics failed, result [%d]",
+                          result);
+                g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Client Sent Data length  is [%d]",
+                                               CA_SUPPORTED_BLE_MTU_SIZE);
+        }
+
+        const uint32_t remainingLen = totalLength % CA_SUPPORTED_BLE_MTU_SIZE;
+        if (remainingLen && (totalLength > CA_SUPPORTED_BLE_MTU_SIZE))
+        {
+            // send the last segment of the data (Ex: 22 bytes of 622
+            // bytes of data when MTU is 200)
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending the last chunk");
+            result = CAUpdateCharacteristicsToGattServer(
+                     bleData->remoteEndpoint->addr,
+                     bleData->data + (index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH,
+                     remainingLen,
+                     LE_UNICAST, 0);
+
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics failed, result [%d]",
+                                                   result);
+                g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Client Sent Data length  is [%d]", remainingLen);
+        }
+    }
+    else
+    {
+        //Sending Mulitcast Data
+        // Send the first segment with the header.
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending Multicast Data");
+        result = CAUpdateCharacteristicsToAllGattServers(dataSegment, length);
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG_V(ERROR, CALEADAPTER_TAG,
+                      "Update characteristics (all) failed, result [%d]", result);
+            CALEErrorHandler(NULL, bleData->data, bleData->dataLen, result);
+            OICFree(dataSegment);
+            return ;
+        }
+        OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Client Sent Data length  is [%d]", length);
+        // Send the remaining header.
+        for (index = 1; index < iter; index++)
+        {
+            result = CAUpdateCharacteristicsToAllGattServers(
+                         bleData->data + (index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH,
+                         CA_SUPPORTED_BLE_MTU_SIZE);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics (all) failed, result [%d]",
+                          result);
+                CALEErrorHandler(NULL, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Client Sent Data length  is [%d]",
+                      CA_SUPPORTED_BLE_MTU_SIZE);
+        }
+
+        uint32_t remainingLen = totalLength % CA_SUPPORTED_BLE_MTU_SIZE;
+        if (remainingLen && (totalLength > CA_SUPPORTED_BLE_MTU_SIZE))
+        {
+            // send the last segment of the data (Ex: 22 bytes of 622
+            // bytes of data when MTU is 200)
+            OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending the last chunk");
+            result =
+                CAUpdateCharacteristicsToAllGattServers(
+                    bleData->data + (index * CA_SUPPORTED_BLE_MTU_SIZE) - CA_HEADER_LENGTH,
+                    remainingLen);
+            if (CA_STATUS_OK != result)
+            {
+                OIC_LOG_V(ERROR, CALEADAPTER_TAG,
+                          "Update characteristics (all) failed, result [%d]", result);
+                CALEErrorHandler(NULL, bleData->data, bleData->dataLen, result);
+                OICFree(dataSegment);
+                return;
+            }
+            OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Client Sent Data length  is [%d]", remainingLen);
+        }
+
+    }
+
+    OICFree(dataSegment);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT - CABLEClientSendDataThread");
+}
+
+static CALEData_t *CACreateLEData(const CAEndpoint_t *remoteEndpoint,
+                                  const uint8_t *data,
+                                  uint32_t dataLength)
+{
+    CALEData_t * const bleData = OICMalloc(sizeof(CALEData_t));
+
+    if (!bleData)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Memory allocation failed!");
+        return NULL;
+    }
+
+    bleData->remoteEndpoint = CACloneEndpoint(remoteEndpoint);
+    bleData->data = OICCalloc(dataLength + 1, 1);
+
+    if (NULL == bleData->data)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Memory allocation failed!");
+        CAFreeLEData(bleData);
+        return NULL;
+    }
+
+    memcpy(bleData->data, data, dataLength);
+    bleData->dataLen = dataLength;
+
+    return bleData;
+}
+
+static void CAFreeLEData(CALEData_t *bleData)
+{
+    VERIFY_NON_NULL_VOID(bleData, CALEADAPTER_TAG, "Param bleData is NULL");
+
+    CAFreeEndpoint(bleData->remoteEndpoint);
+    OICFree(bleData->data);
+    OICFree(bleData);
+}
+
+static void CALEDataDestroyer(void *data, uint32_t size)
+{
+    if ((size_t)size < sizeof(CALEData_t *))
+    {
+        OIC_LOG_V(ERROR, CALEADAPTER_TAG,
+                  "Destroy data too small %p %d", data, size);
+    }
+    CALEData_t *ledata = (CALEData_t *) data;
+
+    CAFreeLEData(ledata);
+}
+#endif
+
+static CAResult_t CAInitLEAdapterMutex()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    if (NULL == g_bleIsServerMutex)
+    {
+        g_bleIsServerMutex = ca_mutex_new();
+        if (NULL == g_bleIsServerMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleNetworkCbMutex)
+    {
+        g_bleNetworkCbMutex = ca_mutex_new();
+        if (NULL == g_bleNetworkCbMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            CATerminateLEAdapterMutex();
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleLocalAddressMutex)
+    {
+        g_bleLocalAddressMutex = ca_mutex_new();
+        if (NULL == g_bleLocalAddressMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            CATerminateLEAdapterMutex();
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleAdapterThreadPoolMutex)
+    {
+        g_bleAdapterThreadPoolMutex = ca_mutex_new();
+        if (NULL == g_bleAdapterThreadPoolMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            CATerminateLEAdapterMutex();
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleClientSendDataMutex)
+    {
+        g_bleClientSendDataMutex = ca_mutex_new();
+        if (NULL == g_bleClientSendDataMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            CATerminateLEAdapterMutex();
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleServerSendDataMutex)
+    {
+        g_bleServerSendDataMutex = ca_mutex_new();
+        if (NULL == g_bleServerSendDataMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            CATerminateLEAdapterMutex();
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleAdapterReqRespCbMutex)
+    {
+        g_bleAdapterReqRespCbMutex = ca_mutex_new();
+        if (NULL == g_bleAdapterReqRespCbMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            CATerminateLEAdapterMutex();
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    if (NULL == g_bleReceiveDataMutex)
+    {
+        g_bleReceiveDataMutex = ca_mutex_new();
+        if (NULL == g_bleReceiveDataMutex)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "ca_mutex_new failed");
+            return CA_STATUS_FAILED;
+        }
+    }
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static void CATerminateLEAdapterMutex()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_free(g_bleIsServerMutex);
+    g_bleIsServerMutex = NULL;
+
+    ca_mutex_free(g_bleNetworkCbMutex);
+    g_bleNetworkCbMutex = NULL;
+
+    ca_mutex_free(g_bleLocalAddressMutex);
+    g_bleLocalAddressMutex = NULL;
 
-static CANetworkChangeCallback gNetworkCallback = NULL;
-static char gLocalBLEAddress[16] =
-{ 0, };
+    ca_mutex_free(g_bleAdapterThreadPoolMutex);
+    g_bleAdapterThreadPoolMutex = NULL;
 
-static int gIsServer = 0;
+    ca_mutex_free(g_bleClientSendDataMutex);
+    g_bleClientSendDataMutex = NULL;
 
-int CALERegisterNetworkNotifications(CANetworkChangeCallback netCallback);
+    ca_mutex_free(g_bleServerSendDataMutex);
+    g_bleServerSendDataMutex = NULL;
 
-#ifdef __TIZEN__
-int CALEDeviceStateChangedCb(int result, bt_adapter_state_e adapter_state, void *user_data);
-#endif //#ifdef __TIZEN__
+    ca_mutex_free(g_bleAdapterReqRespCbMutex);
+    g_bleAdapterReqRespCbMutex = NULL;
 
-pthread_mutex_t gBleIsServerMutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+    ca_mutex_free(g_bleReceiveDataMutex);
+    g_bleReceiveDataMutex = NULL;
 
-pthread_mutex_t gBleNetworkCbMutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+/**
+ * Starting LE connectivity adapters.
+ *
+ * As its peer to peer it does not require to start any servers.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ */
+static CAResult_t CAStartLE();
+
+/**
+ * Start listening server for receiving multicast search requests.
+ *
+ * Transport Specific Behavior:
+ *   LE  Starts GATT Server with prefixed UUID and Characteristics
+ *   per OIC Specification.
+ * @return  ::CA_STATUS_OK or Appropriate error code.
+ */
+static CAResult_t CAStartLEListeningServer();
+
+/**
+ * Stops listening server from receiving multicast search requests.
+ *
+ * Transport Specific Behavior:
+ *   LE  Starts GATT Server with prefixed UUID and Characteristics
+ *   per OIC Specification.
+ * @return  ::CA_STATUS_OK or Appropriate error code.
+ */
+static CAResult_t CAStopLEListeningServer();
+
+/**
+ * Sarting discovery of servers for receiving multicast
+ * advertisements.
+ *
+ * Transport Specific Behavior:
+ *   LE  Starts GATT Server with prefixed UUID and Characteristics
+ *   per OIC Specification.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code
+ */
+static CAResult_t CAStartLEDiscoveryServer();
+
+/**
+ * Send data to the endpoint using the adapter connectivity.
+ *
+ * @param[in] endpoint Remote Endpoint information (like MAC address,
+ *                     reference URI and connectivity type) to which
+ *                     the unicast data has to be sent.
+ * @param[in] data     Data which required to be sent.
+ * @param[in] dataLen  Size of data to be sent.
+ *
+ * @note  dataLen must be > 0.
+ *
+ * @return The number of bytes sent on the network, or -1 on error.
+ */
+static int32_t CASendLEUnicastData(const CAEndpoint_t *endpoint,
+                                   const void *data,
+                                   uint32_t dataLen);
+
+/**
+ * Send multicast data to the endpoint using the LE connectivity.
+ *
+ * @param[in] endpoint Remote Endpoint information to which the
+ *                     multicast data has to be sent.
+ * @param[in] data     Data which required to be sent.
+ * @param[in] dataLen  Size of data to be sent.
+ *
+ * @note  dataLen must be > 0.
+ *
+ * @return The number of bytes sent on the network, or -1 on error.
+ */
+static int32_t CASendLEMulticastData(const CAEndpoint_t *endpoint,
+                                     const void *data,
+                                     uint32_t dataLen);
+
+/**
+ * Get LE Connectivity network information.
+ *
+ * @param[out] info Local connectivity information structures.
+ * @param[out] size Number of local connectivity structures.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ */
+static CAResult_t CAGetLEInterfaceInformation(CAEndpoint_t **info,
+                                              uint32_t *size);
+
+/**
+ * Read Synchronous API callback.
+ *
+ * @return  ::CA_STATUS_OK or Appropriate error code.
+ */
+static CAResult_t CAReadLEData();
+
+/**
+ * Stopping the adapters and close socket connections.
+ *
+ * LE Stops all GATT servers and GATT Clients.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ */
+static CAResult_t CAStopLE();
+
+/**
+ * Terminate the LE connectivity adapter.
+ *
+ * Configuration information will be deleted from further use.
+ */
+static void CATerminateLE();
+
+/**
+ * This function will receive the data from the GattServer and add the
+ * data to the Server receiver queue.
+ *
+ * @param[in] remoteAddress Remote address of the device from where
+ *                          data is received.
+ * @param[in] data          Actual data recevied from the remote
+ *                          device.
+ * @param[in] dataLength    Length of the data received from the
+ *                          remote device.
+ * @param[in] sentLength    Length of the data sent from the remote
+ *                          device.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ *
+ */
+static CAResult_t CALEAdapterServerReceivedData(const char *remoteAddress,
+                                                const uint8_t *data,
+                                                uint32_t dataLength,
+                                                uint32_t *sentLength);
+
+/**
+ * This function will receive the data from the GattClient and add the
+ * data into the Client receiver queue.
+ *
+ * @param[in] remoteAddress Remote address of the device from where
+ *                          data is received.
+ * @param[in] data          Actual data recevied from the remote
+ *                          device.
+ * @param[in] dataLength    Length of the data received from the
+ *                          remote device.
+ * @param[in] sentLength    Length of the data sent from the remote
+ *                          device.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CAResult_t CALEAdapterClientReceivedData(const char *remoteAddress,
+                                                const uint8_t *data,
+                                                uint32_t dataLength,
+                                                uint32_t *sentLength);
+
+/**
+ * Set the NetworkPacket received callback to CA layer from adapter
+ * layer.
+ *
+ * @param[in] callback Callback handle sent from the upper layer.
+ */
+static void CASetLEReqRespAdapterCallback(CANetworkPacketReceivedCallback callback);
 
-pthread_mutex_t gBleLocalAddressMutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+/**
+ * Push the data from CA layer to the Sender processor queue.
+ *
+ * @param[in] remoteEndpoint Remote endpoint information of the
+ *                           server.
+ * @param[in] data           Data to be transmitted from LE.
+ * @param[in] dataLen        Length of the Data being transmitted.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CAResult_t CALEAdapterServerSendData(const CAEndpoint_t *remoteEndpoint,
+                                            const uint8_t *data,
+                                            uint32_t dataLen);
+
+/**
+ * Push the data from CA layer to the Sender processor queue.
+ *
+ * @param[in] remoteEndpoint Remote endpoint information of the
+ *                           server.
+ * @param[in] data           Data to be transmitted from LE.
+ * @param[in] dataLen        Length of the Data being transmitted.
+ *
+ * @return ::CA_STATUS_OK or Appropriate error code.
+ * @retval ::CA_STATUS_OK  Successful.
+ * @retval ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
+ * @retval ::CA_STATUS_FAILED Operation failed.
+ */
+static CAResult_t CALEAdapterClientSendData(const CAEndpoint_t *remoteEndpoint,
+                                            const uint8_t *data,
+                                            uint32_t dataLen);
 
 CAResult_t CAInitializeLE(CARegisterConnectivityCallback registerCallback,
-        CANetworkPacketReceivedCallback reqRespCallback, CANetworkChangeCallback netCallback)
+                          CANetworkPacketReceivedCallback reqRespCallback,
+                          CANetworkChangeCallback netCallback,
+                          CAErrorHandleCallback errorCallback,
+                          ca_thread_pool_t handle)
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
 
     //Input validation
-    VERIFY_NON_NULL(registerCallback, NULL, "RegisterConnectivity callback is null");
-    VERIFY_NON_NULL(reqRespCallback, NULL, "PacketReceived Callback is null");
-    VERIFY_NON_NULL(netCallback, NULL, "NetworkChange Callback is null");
+    VERIFY_NON_NULL(registerCallback, CALEADAPTER_TAG, "RegisterConnectivity callback is null");
+    VERIFY_NON_NULL(reqRespCallback, CALEADAPTER_TAG, "PacketReceived Callback is null");
+    VERIFY_NON_NULL(netCallback, CALEADAPTER_TAG, "NetworkChange Callback is null");
 
-#ifdef __TIZEN__
-
-    int ret = bt_initialize();
-    if (0 != ret)
+    CAResult_t result = CA_STATUS_OK;
+    result = CAInitLEAdapterMutex();
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleAdapterMutex failed!");
+        return CA_STATUS_FAILED;
+    }
+    result = CAInitializeLENetworkMonitor();
+    if (CA_STATUS_OK != result)
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "bt_initialize failed!");
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitializeLENetworkMonitor() failed");
         return CA_STATUS_FAILED;
     }
 
-#endif //#ifdef __TIZEN__
-    CASetBLEReqRescallback(reqRespCallback);
+    CAInitializeLEAdapter();
+
+    CASetLEClientThreadPoolHandle(handle);
+    CASetLEReqRespClientCallback(CALEAdapterClientReceivedData);
+    CASetLEServerThreadPoolHandle(handle);
+    CASetLEAdapterThreadPoolHandle(handle);
+    CASetLEReqRespServerCallback(CALEAdapterServerReceivedData);
+    CASetLEReqRespAdapterCallback(reqRespCallback);
+
+    CASetBLEClientErrorHandleCallback(CALEErrorHandler);
+    CASetBLEServerErrorHandleCallback(CALEErrorHandler);
     CALERegisterNetworkNotifications(netCallback);
 
-    CAConnectivityHandler_t connHandler;
-    connHandler.startListenServer = CAStartLEListeningServer;
-    connHandler.startDiscoverServer = CAStartLEDiscoveryServer;
-    connHandler.sendData = CASendLEUnicastData;
-    connHandler.sendDataToAll = CASendLEMulticastData;
-    connHandler.startNotifyServer = CAStartLENotifyServer;
-    connHandler.sendNotification = CASendLENotification;
-    connHandler.GetnetInfo = CAGetLEInterfaceInformation;
-    connHandler.readData = CAReadLEData;
-    connHandler.terminate = CATerminateLE;
-    registerCallback(connHandler, CA_LE);
+    g_errorHandler = errorCallback;
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+    static const CAConnectivityHandler_t connHandler =
+        {
+            .startAdapter = CAStartLE,
+            .stopAdapter = CAStopLE,
+            .startListenServer = CAStartLEListeningServer,
+            .stopListenServer = CAStopLEListeningServer,
+            .startDiscoveryServer = CAStartLEDiscoveryServer,
+            .sendData = CASendLEUnicastData,
+            .sendDataToAll = CASendLEMulticastData,
+            .GetnetInfo = CAGetLEInterfaceInformation,
+            .readData = CAReadLEData,
+            .terminate = CATerminateLE
+        };
+
+    registerCallback(connHandler, CA_ADAPTER_GATT_BTLE);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
 
     return CA_STATUS_OK;
 }
 
-void CATerminateLE()
+static CAResult_t CAStartLE()
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "CAStartLE");
 
-    CASetBLEReqRescallback(NULL);
-    CALERegisterNetworkNotifications(NULL);
+    return CAStartLEAdapter();
+}
+
+static CAResult_t CAStopLE()
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+#ifndef SINGLE_THREAD
+    CAStopLEQueues();
+#endif
 
-    pthread_mutex_lock(&gBleIsServerMutex);
-    if (gIsServer == 1)
+    ca_mutex_lock(g_bleIsServerMutex);
+    if (true == g_isServer)
     {
-        CAStopBleGattServer();
+        CAStopLEGattServer();
     }
     else
     {
-        CAStopBLEGattClient();
+        CAStopLEGattClient();
     }
-    pthread_mutex_unlock(&gBleIsServerMutex);
+    ca_mutex_unlock(g_bleIsServerMutex);
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
-    return;
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+
+    return CA_STATUS_OK;
 }
 
-void CALEServerInitThreadFunc(void *param)
+static void CATerminateLE()
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "[CALEServerInitThreadFunc]IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
 
-    CAStartBleGattServer();
-
-    OCLog(DEBUG, CALEADAPTER_TAG, "[CALEServerInitThreadFunc] OUT");
-}
+    CASetLEReqRespServerCallback(NULL);
+    CASetLEReqRespClientCallback(NULL);
+    CALERegisterNetworkNotifications(NULL);
+    CASetLEReqRespAdapterCallback(NULL);
+    CATerminateLENetworkMonitor();
 
-void CALEClientInitThreadFunc(void *param)
-{
-    OCLog(DEBUG, CALEADAPTER_TAG, "[CALEClientInitThreadFunc]IN");
+    ca_mutex_lock(g_bleIsServerMutex);
+    if (true == g_isServer)
+    {
+        CATerminateLEGattServer();
+    }
+    else
+    {
+        CATerminateLEGattClient();
+    }
+    ca_mutex_unlock(g_bleIsServerMutex);
 
-    CAStartBLEGattClient();
+#ifndef SINGLE_THREAD
+    CATerminateLEQueues();
+#endif
+    CATerminateLEAdapterMutex();
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "[CALEClientInitThreadFunc] OUT");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
 }
 
-CAResult_t CAStartLEListeningServer()
+static CAResult_t CAStartLEListeningServer()
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
-
-    int init_pthread_status = 0;
-    pthread_t pthread_id = 0;
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-    init_pthread_status = pthread_create(&pthread_id, &attr, CALEServerInitThreadFunc, NULL);
-
-    if (init_pthread_status != 0)
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+#ifndef ROUTING_GATEWAY
+    CAResult_t result = CA_STATUS_OK;
+#ifndef SINGLE_THREAD
+    result = CAInitLEServerQueues();
+    if (CA_STATUS_OK != result)
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "pthread_create failed!");
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitLEServerQueues failed");
         return CA_STATUS_FAILED;
     }
+#endif
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
-    pthread_mutex_lock(&gBleIsServerMutex);
-    gIsServer = 1;
-    pthread_mutex_unlock(&gBleIsServerMutex);
-    return CA_STATUS_OK;
-}
-
-CAResult_t CAStartLEDiscoveryServer()
-{
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
-
-    int init_pthread_status = 0;
-    pthread_t pthread_id = 0;
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-    init_pthread_status = pthread_create(&pthread_id, &attr, CALEClientInitThreadFunc, NULL);
+    result = CAGetLEAdapterState();
+    if (CA_ADAPTER_NOT_ENABLED == result)
+    {
+        gLeServerStatus = CA_LISTENING_SERVER;
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Listen Server will be started once BT Adapter is enabled");
+        return CA_STATUS_OK;
+    }
 
-    if (init_pthread_status != 0)
+    if (CA_STATUS_FAILED == result)
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "pthread_create failed!");
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Bluetooth get state failed!");
         return CA_STATUS_FAILED;
     }
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
-    pthread_mutex_lock(&gBleIsServerMutex);
-    gIsServer = 0;
-    pthread_mutex_unlock(&gBleIsServerMutex);
+    CAStartLEGattServer();
+
+    ca_mutex_lock(g_bleIsServerMutex);
+    g_isServer = true;
+    ca_mutex_unlock(g_bleIsServerMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return CA_STATUS_OK;
+#else
+    // Routing Gateway only supports BLE client mode.
+    OIC_LOG(ERROR, CALEADAPTER_TAG, "LE server not supported in Routing Gateway");
+    return CA_NOT_SUPPORTED;
+#endif
 }
 
-CAResult_t CAStartLENotifyServer()
+static CAResult_t CAStopLEListeningServer()
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
-
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
-
-    return CA_STATUS_OK;
+    OIC_LOG(ERROR, CALEADAPTER_TAG, "Listen server stop not supported.");
+    return CA_NOT_SUPPORTED;
 }
 
-uint32_t CASendLENotification(const CARemoteEndpoint_t *endpoint, void *data, uint32_t dataLen)
+static CAResult_t CAStartLEDiscoveryServer()
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+    CAResult_t result = CA_STATUS_OK;
+#ifndef SINGLE_THREAD
+    result = CAInitLEClientQueues();
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitLEClientQueues failed");
+        return CA_STATUS_FAILED;
+    }
+#endif
+    result = CAGetLEAdapterState();
+    if (CA_ADAPTER_NOT_ENABLED == result)
+    {
+        gLeServerStatus = CA_DISCOVERY_SERVER;
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Listen Server will be started once BT Adapter is enabled");
+        return CA_STATUS_OK;
+    }
+
+    if (CA_STATUS_FAILED == result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Bluetooth get state failed!");
+        return CA_STATUS_FAILED;
+    }
+
+    CAStartLEGattClient();
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+    ca_mutex_lock(g_bleIsServerMutex);
+    g_isServer = false;
+    ca_mutex_unlock(g_bleIsServerMutex);
 
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return CA_STATUS_OK;
 }
 
-CAResult_t CAReadLEData()
+static CAResult_t CAReadLEData()
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
-
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
-
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+#ifdef SINGLE_THREAD
+    CACheckLEData();
+#endif
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return CA_STATUS_OK;
 }
 
-uint32_t CASendLEUnicastData(const CARemoteEndpoint_t *endpoint, void *data, uint32_t dataLen)
+static int32_t CASendLEUnicastData(const CAEndpoint_t *endpoint,
+                                   const void *data,
+                                   uint32_t dataLen)
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
 
     //Input validation
-    VERIFY_NON_NULL(endpoint, NULL, "Remote endpoint is null");
-    VERIFY_NON_NULL(data, NULL, "Data is null");
+    VERIFY_NON_NULL_RET(endpoint, CALEADAPTER_TAG, "Remote endpoint is null", -1);
+    VERIFY_NON_NULL_RET(data, CALEADAPTER_TAG, "Data is null", -1);
 
     CAResult_t result = CA_STATUS_FAILED;
 
-#ifdef __TIZEN__
-    pthread_mutex_lock(&gBleIsServerMutex);
-    if (gIsServer)
+    ca_mutex_lock(g_bleIsServerMutex);
+    if (true  == g_isServer)
     {
-        result = CAUpdateCharacteristicsInGattServer(data, dataLen);
+        result = CALEAdapterServerSendData(endpoint, data, dataLen);
         if (CA_STATUS_OK != result)
         {
-            OCLogv(ERROR, CALEADAPTER_TAG,
-                    "[SendLEUnicastData] sending unicast data to [%s] failed\n", endpoint->addressInfo.BT.btMacAddress);
-            pthread_mutex_unlock(&gBleIsServerMutex);
-            return 0;
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Send unicast data failed\n");
+            if (g_errorHandler)
+            {
+                g_errorHandler(endpoint, data, dataLen, result);
+            }
+            ca_mutex_unlock(g_bleIsServerMutex);
+            return -1;
         }
     }
     else
     {
-
-        result = CAUpdateCharacteristicsToGattServer(endpoint->addressInfo.BT.btMacAddress, data,
-                dataLen, UNICAST, 0);
+        result = CALEAdapterClientSendData(endpoint, data, dataLen);
         if (CA_STATUS_OK != result)
         {
-            OCLogv(ERROR, CALEADAPTER_TAG,
-                    "[SendLEUnicastData] sending unicast data to [%s] failed\n", endpoint->addressInfo.BT.btMacAddress);
-            pthread_mutex_unlock(&gBleIsServerMutex);
-            return 0;
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Send unicast data failed \n");
+            if (g_errorHandler)
+            {
+                g_errorHandler(endpoint, data, dataLen, result);
+            }
+            ca_mutex_unlock(g_bleIsServerMutex);
+            return -1;
         }
     }
-    pthread_mutex_unlock(&gBleIsServerMutex);
-#else
-    char *tempPath = "temp_path";
-    updateCharacteristicsInGattServer(tempPath, (char *) data, dataLen);
-#endif //#ifdef __TIZEN__
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+    ca_mutex_unlock(g_bleIsServerMutex);
 
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return dataLen;
 }
 
-uint32_t CASendLEMulticastData(void *data, uint32_t dataLen)
+static int32_t CASendLEMulticastData(const CAEndpoint_t *endpoint,
+                                     const void *data,
+                                     uint32_t dataLen)
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
 
     //Input validation
-    VERIFY_NON_NULL(data, NULL, "Data is null");
+    VERIFY_NON_NULL_RET(data, CALEADAPTER_TAG, "Data is null", -1);
 
     if (0 >= dataLen)
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "Invalid Parameter");
-        return 0;
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Invalid Parameter");
+        return -1;
     }
 
     CAResult_t result = CA_STATUS_FAILED;
-#ifdef __TIZEN__
-    pthread_mutex_lock(&gBleIsServerMutex);
-    if (gIsServer)
+
+    ca_mutex_lock(g_bleIsServerMutex);
+    if (true  == g_isServer)
     {
-        result = CAUpdateCharacteristicsInGattServer(data, dataLen);
+        result = CALEAdapterServerSendData(NULL, data, dataLen);
         if (CA_STATUS_OK != result)
         {
-            OCLogv(ERROR, CALEADAPTER_TAG,
-                    "[CASendLEMulticastData] updating data in server is failed");
-            pthread_mutex_unlock(&gBleIsServerMutex);
-            return 0;
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Send multicast data failed" );
+
+            ca_mutex_unlock(g_bleIsServerMutex);
+            if (g_errorHandler)
+            {
+                g_errorHandler(endpoint, data, dataLen, result);
+            }
+            return -1;
         }
     }
     else
     {
-        result = CAUpdateCharacteristicsToAllGattServers(data, dataLen);
+        result = CALEAdapterClientSendData(NULL, data, dataLen);
         if (CA_STATUS_OK != result)
         {
-            OCLogv(ERROR, CALEADAPTER_TAG,
-                    "[SendLEMulticastDataToAll] multicasting data to servers failed" );
-            pthread_mutex_unlock(&gBleIsServerMutex);
-            return 0;
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Send Multicast data failed" );
+            if (g_errorHandler)
+            {
+                g_errorHandler(endpoint, data, dataLen, result);
+            }
+            ca_mutex_unlock(g_bleIsServerMutex);
+            return -1;
         }
     }
-    pthread_mutex_unlock(&gBleIsServerMutex);
-#else
-    char *tempPath = "temp_path";
-    updateCharacteristicsInGattServer(tempPath, (char *) data, dataLen);
-#endif //#ifdef __TIZEN__
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+    ca_mutex_unlock(g_bleIsServerMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return dataLen;
 }
 
-CAResult_t CAGetLEInterfaceInformation(CALocalConnectivityt_t **info, uint32_t *size)
+static CAResult_t CAGetLEInterfaceInformation(CAEndpoint_t **info, uint32_t *size)
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
-
-    VERIFY_NON_NULL(info, NULL, "CALocalConnectivity info is null");
-
-#ifdef OIC_ARDUINODUE
-    OCLog(DEBUG, CALEADAPTER_TAG, "Info from ARDUINO");
-    //1: call corresponding Arduino API
-#endif
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
 
-#if __TIZEN__
+    VERIFY_NON_NULL(info, CALEADAPTER_TAG, "CALocalConnectivity info is null");
 
     char *local_address = NULL;
 
-    bt_adapter_get_address(&local_address);
+    CAResult_t res = CAGetLEAddress(&local_address);
+    if (CA_STATUS_OK != res)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "CAGetLEAddress has failed");
+        return res;
+    }
+
     if (NULL == local_address)
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "Get local bt adapter address failed");
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "local_address is NULL");
         return CA_STATUS_FAILED;
     }
 
-#endif //#if ARDUINODUE
     *size = 0;
-    (*info) = (CALocalConnectivityt_t *) OICMalloc(sizeof(CALocalConnectivityt_t));
+    (*info) = (CAEndpoint_t *) OICCalloc(1, sizeof(CAEndpoint_t));
     if (NULL == (*info))
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "Malloc failure!");
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Malloc failure!");
+        OICFree(local_address);
         return CA_STATUS_FAILED;
     }
-    memset((*info), 0x0, sizeof(CALocalConnectivityt_t));
 
-    strncpy((*info)->addressInfo.BT.btMacAddress, local_address, strlen(local_address));
-    pthread_mutex_lock(&gBleLocalAddressMutex);
-    strncpy(gLocalBLEAddress, local_address, sizeof(gLocalBLEAddress));
-    pthread_mutex_unlock(&gBleLocalAddressMutex);
+    size_t local_address_len = strlen(local_address);
 
-    (*info)->type = CA_LE;
+    if(local_address_len >= sizeof(g_localBLEAddress) ||
+            local_address_len >= MAX_ADDR_STR_SIZE_CA - 1)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "local_address is too long");
+        OICFree(*info);
+        OICFree(local_address);
+        return CA_STATUS_FAILED;
+    }
+
+    OICStrcpy((*info)->addr, sizeof((*info)->addr), local_address);
+    ca_mutex_lock(g_bleLocalAddressMutex);
+    OICStrcpy(g_localBLEAddress, sizeof(g_localBLEAddress), local_address);
+    ca_mutex_unlock(g_bleLocalAddressMutex);
+
+    (*info)->adapter = CA_ADAPTER_GATT_BTLE;
     *size = 1;
     OICFree(local_address);
 
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return CA_STATUS_OK;
 }
 
-int CALERegisterNetworkNotifications(CANetworkChangeCallback netCallback)
+static CAResult_t CALERegisterNetworkNotifications(CANetworkChangeCallback netCallback)
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
 
-    pthread_mutex_lock(&gBleNetworkCbMutex);
-    gNetworkCallback = netCallback;
-    pthread_mutex_unlock(&gBleNetworkCbMutex);
-    int ret = 0;
-#ifdef __TIZEN__
+    ca_mutex_lock(g_bleNetworkCbMutex);
+    g_networkCallback = netCallback;
+    ca_mutex_unlock(g_bleNetworkCbMutex);
+    CAResult_t res = CA_STATUS_OK;
     if (netCallback)
     {
-        ret = bt_adapter_set_state_changed_cb(CALEDeviceStateChangedCb, NULL);
-        if(ret != 0)
+        res = CASetLEAdapterStateChangedCb(CALEDeviceStateChangedCb);
+        if (CA_STATUS_OK != res)
         {
-            OCLog(ERROR, CALEADAPTER_TAG, "bt_adapter_set_state_changed_cb failed!");
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "CASetLEAdapterStateChangedCb failed!");
         }
     }
     else
     {
-        ret = bt_adapter_unset_state_changed_cb();
-        if(ret != 0)
+        res = CAUnSetLEAdapterStateChangedCb();
+        if (CA_STATUS_OK != res)
         {
-            OCLog(ERROR, CALEADAPTER_TAG, "bt_adapter_set_state_changed_cb failed!");
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "CASetLEAdapterStateChangedCb failed!");
         }
     }
-#endif //#ifdef __TIZEN__
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return res;
+}
+
+static void CALEDeviceStateChangedCb(CAAdapterState_t adapter_state)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    VERIFY_NON_NULL_VOID(g_localBLEAddress, CALEADAPTER_TAG, "g_localBLEAddress is null");
+    CAEndpoint_t localEndpoint = { .adapter = CA_ADAPTER_GATT_BTLE };
+
+    ca_mutex_lock(g_bleLocalAddressMutex);
+    OICStrcpy(localEndpoint.addr,
+              sizeof(localEndpoint.addr),
+              g_localBLEAddress);
+    ca_mutex_unlock(g_bleLocalAddressMutex);
+
+    g_bleAdapterState = adapter_state;
+    // Start a GattServer/Client if gLeServerStatus is SET
+    if (CA_LISTENING_SERVER == gLeServerStatus)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Before CAStartLEGattServer");
+        CAStartLEGattServer();
+    }
+    else if (CA_DISCOVERY_SERVER == gLeServerStatus)
+    {
+        OIC_LOG(DEBUG, CALEADAPTER_TAG, "Before CAStartBleGattClient");
+        CAStartLEGattClient();
+    }
+    gLeServerStatus = CA_SERVER_NOTSTARTED;
+
+    ca_mutex_lock(g_bleNetworkCbMutex);
+    if (NULL != g_networkCallback)
+    {
+        g_networkCallback(&localEndpoint, adapter_state);
+    }
+    else
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "g_networkCallback is NULL");
+    }
+    ca_mutex_unlock(g_bleNetworkCbMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static CAResult_t CALEAdapterClientSendData(const CAEndpoint_t *remoteEndpoint,
+                                            const uint8_t *data,
+                                            uint32_t dataLen)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Param data is NULL");
+#ifndef SINGLE_THREAD
+    VERIFY_NON_NULL_RET(g_bleClientSendQueueHandle, CALEADAPTER_TAG,
+                        "g_bleClientSendQueueHandle is  NULL",
+                        CA_STATUS_FAILED);
+    VERIFY_NON_NULL_RET(g_bleClientSendDataMutex, CALEADAPTER_TAG,
+                        "g_bleClientSendDataMutex is NULL",
+                        CA_STATUS_FAILED);
+
+    VERIFY_NON_NULL_RET(g_bleClientSendQueueHandle, CALEADAPTER_TAG, "g_bleClientSendQueueHandle",
+                        CA_STATUS_FAILED);
+
+    OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Data Sending to LE layer [%u]", dataLen);
+
+    CALEData_t *bleData = CACreateLEData(remoteEndpoint, data, dataLen);
+    if (!bleData)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to create bledata!");
+        return CA_MEMORY_ALLOC_FAILED;
+    }
+    // Add message to send queue
+    ca_mutex_lock(g_bleClientSendDataMutex);
+    CAQueueingThreadAddData(g_bleClientSendQueueHandle, bleData, sizeof(CALEData_t));
+    ca_mutex_unlock(g_bleClientSendDataMutex);
+#endif
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return CA_STATUS_OK;
 }
 
-#ifdef __TIZEN__
+static CAResult_t CALEAdapterServerSendData(const CAEndpoint_t *remoteEndpoint,
+                                            const uint8_t *data,
+                                            uint32_t dataLen)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Param data is NULL");
+
+#ifdef SINGLE_THREAD
+    uint8_t header[CA_HEADER_LENGTH] = { 0 };
+
+    CAResult_t result =
+        CAGenerateHeader(header, CA_HEADER_LENGTH, dataLen);
+
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Generate header failed");
+        return CA_STATUS_FAILED;
+    }
+
+    if (!CAIsLEConnected())
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "le not conn");
+        return CA_STATUS_FAILED;
+    }
+
+    result = CAUpdateCharacteristicsToAllGattClients(header, CA_HEADER_LENGTH);
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Update characteristics failed");
+        return CA_STATUS_FAILED;
+    }
+
+    const uint32_t dataLimit = dataLen / CA_SUPPORTED_BLE_MTU_SIZE;
+    for (uint32_t iter = 0; iter < dataLimit; iter++)
+    {
+        result =
+            CAUpdateCharacteristicsToAllGattClients(
+                data + (iter * CA_SUPPORTED_BLE_MTU_SIZE),
+                CA_SUPPORTED_BLE_MTU_SIZE);
+
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Update characteristics failed");
+            return CA_STATUS_FAILED;
+        }
+
+        CALEDoEvents();
+    }
+
+    const uint32_t remainingLen = dataLen % CA_SUPPORTED_BLE_MTU_SIZE;
+    if (remainingLen)
+    {
+        result =
+            CAUpdateCharacteristicsToAllGattClients(
+                data + (dataLimit * CA_SUPPORTED_BLE_MTU_SIZE),
+                remainingLen);
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG(ERROR, CALEADAPTER_TAG, "Update characteristics failed");
+            return CA_STATUS_FAILED;
+        }
+        CALEDoEvents();
+    }
+#else
+    VERIFY_NON_NULL_RET(g_bleServerSendQueueHandle, CALEADAPTER_TAG,
+                        "BleClientReceiverQueue is NULL",
+                        CA_STATUS_FAILED);
+    VERIFY_NON_NULL_RET(g_bleServerSendDataMutex, CALEADAPTER_TAG,
+                        "BleClientSendDataMutex is NULL",
+                        CA_STATUS_FAILED);
+
+    VERIFY_NON_NULL_RET(g_bleServerSendQueueHandle, CALEADAPTER_TAG, "sendQueueHandle",
+                        CA_STATUS_FAILED);
+
+    OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Data Sending to LE layer [%d]", dataLen);
+
+    CALEData_t * const bleData =
+        CACreateLEData(remoteEndpoint, data, dataLen);
+
+    if (!bleData)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to create bledata!");
+        return CA_MEMORY_ALLOC_FAILED;
+    }
+
+    // Add message to send queue
+    ca_mutex_lock(g_bleServerSendDataMutex);
+    CAQueueingThreadAddData(g_bleServerSendQueueHandle,
+                            bleData,
+                            sizeof(CALEData_t));
+    ca_mutex_unlock(g_bleServerSendDataMutex);
+#endif
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
 
-int CALEDeviceStateChangedCb(int result, bt_adapter_state_e adapter_state, void *user_data)
+static CAResult_t CALEAdapterServerReceivedData(const char *remoteAddress,
+                                                const uint8_t *data,
+                                                uint32_t dataLength,
+                                                uint32_t *sentLength)
 {
-    OCLog(DEBUG, CALEADAPTER_TAG, "IN");
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    //Input validation
+    VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Data is null");
+    VERIFY_NON_NULL(sentLength, CALEADAPTER_TAG, "Sent data length holder is null");
 
-    bt_adapter_state_e btAdaptorState = BT_ADAPTER_DISABLED;
-    if (BT_ADAPTER_ENABLED == adapter_state)
+#ifdef SINGLE_THREAD
+    if(g_networkPacketReceivedCallback)
+    {
+        // will be filled by upper layer
+        const CASecureEndpoint_t endpoint =
+            { .endpoint = { .adapter = CA_ADAPTER_GATT_BTLE } };
+
+
+        g_networkPacketReceivedCallback(&endpoint, data, dataLength);
+    }
+#else
+    VERIFY_NON_NULL_RET(g_bleReceiverQueue,
+                        CALEADAPTER_TAG,
+                        "g_bleReceiverQueue",
+                        CA_STATUS_FAILED);
+
+    //Add message to data queue
+    CAEndpoint_t * const remoteEndpoint =
+        CACreateEndpointObject(CA_DEFAULT_FLAGS,
+                               CA_ADAPTER_GATT_BTLE,
+                               remoteAddress,
+                               0);
+
+    if (NULL == remoteEndpoint)
     {
-        btAdaptorState = BT_ADAPTER_ENABLED;
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to create remote endpoint !");
+        return CA_STATUS_FAILED;
     }
 
-    CALocalConnectivityt_t localEndpoint;
+    // Create bleData to add to queue
+    OIC_LOG_V(DEBUG,
+              CALEADAPTER_TAG,
+              "Data received from LE layer [%d]",
+              dataLength);
 
-    pthread_mutex_lock(&gBleLocalAddressMutex);
-    strncpy(localEndpoint.addressInfo.BT.btMacAddress, gLocalBLEAddress, strlen(gLocalBLEAddress));
-    pthread_mutex_unlock(&gBleLocalAddressMutex);
+    CALEData_t * const bleData =
+        CACreateLEData(remoteEndpoint, data, dataLength);
 
-    pthread_mutex_lock(&gBleNetworkCbMutex);
-    if(NULL != gNetworkCallback)
+    if (!bleData)
     {
-        gNetworkCallback(&localEndpoint, adapter_state);
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to create bledata!");
+        CAFreeEndpoint(remoteEndpoint);
+        return CA_MEMORY_ALLOC_FAILED;
     }
-    else
+
+    CAFreeEndpoint(remoteEndpoint);
+    // Add message to receiver queue
+    CAQueueingThreadAddData(g_bleReceiverQueue, bleData, sizeof(CALEData_t));
+
+    *sentLength = dataLength;
+#endif
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+    return CA_STATUS_OK;
+}
+
+static CAResult_t CALEAdapterClientReceivedData(const char *remoteAddress,
+                                                const uint8_t *data,
+                                                uint32_t dataLength,
+                                                uint32_t *sentLength)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    //Input validation
+    VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Data is null");
+    VERIFY_NON_NULL(sentLength, CALEADAPTER_TAG, "Sent data length holder is null");
+#ifndef SINGLE_THREAD
+    VERIFY_NON_NULL_RET(g_bleReceiverQueue, CALEADAPTER_TAG, "g_bleReceiverQueue",
+                        CA_STATUS_FAILED);
+
+    //Add message to data queue
+    CAEndpoint_t *remoteEndpoint = CACreateEndpointObject(CA_DEFAULT_FLAGS,
+                                                          CA_ADAPTER_GATT_BTLE,
+                                                          remoteAddress, 0);
+    if (NULL == remoteEndpoint)
+    {
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to create remote endpoint !");
+        return CA_STATUS_FAILED;
+    }
+
+    OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Data received from LE layer [%u]", dataLength);
+
+    // Create bleData to add to queue
+    CALEData_t *bleData = CACreateLEData(remoteEndpoint, data, dataLength);
+    if (!bleData)
     {
-        OCLog(ERROR, CALEADAPTER_TAG, "gNetworkCallback is NULL");
+        OIC_LOG(ERROR, CALEADAPTER_TAG, "Failed to create bledata!");
+        CAFreeEndpoint(remoteEndpoint);
+        return CA_MEMORY_ALLOC_FAILED;
     }
-    pthread_mutex_unlock(&gBleNetworkCbMutex);
-    OCLog(DEBUG, CALEADAPTER_TAG, "OUT");
+
+    CAFreeEndpoint(remoteEndpoint);
+    // Add message to receiver queue
+    CAQueueingThreadAddData(g_bleReceiverQueue, bleData, sizeof(CALEData_t));
+
+    *sentLength = dataLength;
+#endif
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
     return CA_STATUS_OK;
 }
-#endif //#ifdef OIC_TIZEN
+
+static void CASetLEAdapterThreadPoolHandle(ca_thread_pool_t handle)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_lock(g_bleAdapterThreadPoolMutex);
+    g_bleAdapterThreadPool = handle;
+    ca_mutex_unlock(g_bleAdapterThreadPoolMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static void CASetLEReqRespAdapterCallback(CANetworkPacketReceivedCallback callback)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN");
+
+    ca_mutex_lock(g_bleAdapterReqRespCbMutex);
+
+    g_networkPacketReceivedCallback = callback;
+
+    ca_mutex_unlock(g_bleAdapterReqRespCbMutex);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "OUT");
+}
+
+static void CALEErrorHandler(const char *remoteAddress,
+                             const uint8_t *data,
+                             uint32_t dataLen,
+                             CAResult_t result)
+{
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "CALEErrorHandler IN");
+
+    VERIFY_NON_NULL_VOID(data, CALEADAPTER_TAG, "Data is null");
+
+    CAEndpoint_t *rep = CACreateEndpointObject(CA_DEFAULT_FLAGS,
+                                               CA_ADAPTER_GATT_BTLE,
+                                               remoteAddress,
+                                               0);
+
+    // if required, will be used to build remote endpoint
+    g_errorHandler(rep, data, dataLen, result);
+
+    CAFreeEndpoint(rep);
+
+    OIC_LOG(DEBUG, CALEADAPTER_TAG, "CALEErrorHandler OUT");
+}