[CONPRO-1172] allocates too much memory
[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / camessagehandler.c
old mode 100644 (file)
new mode 100755 (executable)
index d839c95..d9be889
@@ -1,4 +1,4 @@
-/******************************************************************
+/* *****************************************************************
  *
  * Copyright 2014 Samsung Electronics All Rights Reserved.
  *
 #include "cainterface.h"
 #include "camessagehandler.h"
 #include "caremotehandler.h"
-#include "cainterfacecontroller.h"
 #include "caprotocolmessage.h"
-#include "caretransmission.h"
+#include "logger.h"
+#include "trace.h"
+#ifndef WITH_UPSTREAM_LIBCOAP
+#include "coap/config.h"
+#endif
+#include "oic_malloc.h"
+#include "canetworkconfigurator.h"
 #include "caadapterutils.h"
+#include "cainterfacecontroller.h"
+#include "caretransmission.h"
+#include "oic_string.h"
+
+#ifdef WITH_BWT
+#include "cablockwisetransfer.h"
+#endif
+
+#ifndef  SINGLE_THREAD
 #include "uqueue.h"
-#include "logger.h"
-#include "config.h" /* for coap protocol */
 #include "cathreadpool.h" /* for thread pool */
 #include "caqueueingthread.h"
-#include "camutex.h"
-#include "oic_malloc.h"
-#include "oic_string.h"
-#include "canetworkconfigurator.h"
 
-#define TAG PCF("CA")
 #define SINGLE_HANDLE
-
 #define MAX_THREAD_POOL_SIZE    20
 
-typedef enum
-{
-    SEND_TYPE_MULTICAST = 0, SEND_TYPE_UNICAST
-} CASendDataType_t;
-
-typedef enum
-{
-    CA_REQUEST_DATA = 1,
-    CA_RESPONSE_DATA = 2,
-    CA_ERROR_DATA = 3,
-} CADataType_t;
-
-typedef struct
-{
-    CASendDataType_t type;
-    CAEndpoint_t *remoteEndpoint;
-    CARequestInfo_t *requestInfo;
-    CAResponseInfo_t *responseInfo;
-    CAErrorInfo_t *errorInfo;
-    CAHeaderOption_t *options;
-    CADataType_t dataType;
-    uint8_t numOptions;
-} CAData_t;
-
 // thread pool handle
 static ca_thread_pool_t g_threadPoolHandle = NULL;
 
@@ -76,21 +58,74 @@ static ca_thread_pool_t g_threadPoolHandle = NULL;
 static CAQueueingThread_t g_sendThread;
 static CAQueueingThread_t g_receiveThread;
 
+#else
+#define CA_MAX_RT_ARRAY_SIZE    3
+#endif  // SINGLE_THREAD
+
+#define TAG "OIC_CA_MSG_HANDLE"
+
 static CARetransmission_t g_retransmissionContext;
 
 // handler field
 static CARequestCallback g_requestHandler = NULL;
 static CAResponseCallback g_responseHandler = NULL;
 static CAErrorCallback g_errorHandler = NULL;
+static CANetworkMonitorCallback g_nwMonitorHandler = NULL;
 
 static void CAErrorHandler(const CAEndpoint_t *endpoint,
                            const void *data, uint32_t dataLen,
                            CAResult_t result);
 
+static CAData_t* CAGenerateHandlerData(const CAEndpoint_t *endpoint,
+                                       const CARemoteId_t *identity,
+                                       const void *data, CADataType_t dataType);
+
+static void CASendErrorInfo(const CAEndpoint_t *endpoint, const CAInfo_t *info,
+                            CAResult_t result);
+
+#ifdef SINGLE_THREAD
+static void CAProcessReceivedData(CAData_t *data);
+#endif
+static void CADestroyData(void *data, uint32_t size);
+static void CALogPayloadInfo(CAInfo_t *info);
+static bool CADropSecondMessage(CAHistory_t *history, const CAEndpoint_t *endpoint, uint16_t id,
+                                CAToken_t token, uint8_t tokenLength);
+
+/**
+ * print send / receive message of CoAP.
+ * @param[in] data      CA information which has send/receive message and endpoint.
+ * @param[in] pdu       CoAP pdu low data.
+ */
+static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu);
+
+#ifndef ARDUINO
+static char g_headerBuffer[MAX_LOG_BUFFER_SIZE] = {0};
+static size_t g_headerIndex = 0;
+static void CASamsungLogMessage(const CAData_t *data, const coap_pdu_t *pdu);
+#endif
+
+#ifdef WITH_BWT
+void CAAddDataToSendThread(CAData_t *data)
+{
+    VERIFY_NON_NULL_VOID(data, TAG, "data");
+
+    // add thread
+    CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
+}
+
+void CAAddDataToReceiveThread(CAData_t *data)
+{
+    VERIFY_NON_NULL_VOID(data, TAG, "data");
+
+    // add thread
+    CAQueueingThreadAddData(&g_receiveThread, data, sizeof(CAData_t));
+}
+#endif
+
 static bool CAIsSelectedNetworkAvailable()
 {
     u_arraylist_t *list = CAGetSelectedNetworkList();
-    if (!list || list->length == 0)
+    if (!list || u_arraylist_length(list) == 0)
     {
         OIC_LOG(ERROR, TAG, "No selected network");
         return false;
@@ -99,38 +134,171 @@ static bool CAIsSelectedNetworkAvailable()
     return true;
 }
 
+static CAData_t* CAGenerateHandlerData(const CAEndpoint_t *endpoint,
+                                       const CARemoteId_t *identity,
+                                       const void *data, CADataType_t dataType)
+{
+    OIC_LOG(DEBUG, TAG, "CAGenerateHandlerData IN");
+    CAInfo_t *info = NULL;
+    CAData_t *cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
+    if (!cadata)
+    {
+        OIC_LOG(ERROR, TAG, "memory allocation failed");
+        return NULL;
+    }
+#ifdef SINGLE_THREAD
+    CAEndpoint_t* ep = endpoint;
+#else
+    CAEndpoint_t* ep = CACloneEndpoint(endpoint);
+    if (!ep)
+    {
+        OIC_LOG(ERROR, TAG, "endpoint clone failed");
+        goto exit;
+    }
+#endif
+
+    OIC_LOG_V(DEBUG, TAG, "address : %s", ep->addr);
+
+    if (CA_RESPONSE_DATA == dataType)
+    {
+        CAResponseInfo_t* resInfo = (CAResponseInfo_t*)OICCalloc(1, sizeof(CAResponseInfo_t));
+        if (!resInfo)
+        {
+            OIC_LOG(ERROR, TAG, "memory allocation failed");
+            goto exit;
+        }
+
+        CAResult_t result = CAGetResponseInfoFromPDU(data, resInfo, endpoint);
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG(ERROR, TAG, "CAGetResponseInfoFromPDU Failed");
+            CADestroyResponseInfoInternal(resInfo);
+            goto exit;
+        }
+        cadata->responseInfo = resInfo;
+        info = &resInfo->info;
+        if (identity)
+        {
+            info->identity = *identity;
+        }
+        OIC_LOG(DEBUG, TAG, "Response Info :");
+        CALogPayloadInfo(info);
+    }
+    else if (CA_REQUEST_DATA == dataType)
+    {
+        CARequestInfo_t* reqInfo = (CARequestInfo_t*)OICCalloc(1, sizeof(CARequestInfo_t));
+        if (!reqInfo)
+        {
+            OIC_LOG(ERROR, TAG, "memory allocation failed");
+            goto exit;
+        }
+
+        CAResult_t result = CAGetRequestInfoFromPDU(data, endpoint, reqInfo);
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG(ERROR, TAG, "CAGetRequestInfoFromPDU failed");
+            CADestroyRequestInfoInternal(reqInfo);
+            goto exit;
+        }
+
+        if ((reqInfo->info.type != CA_MSG_CONFIRM) &&
+            CADropSecondMessage(&caglobals.ca.requestHistory, endpoint, reqInfo->info.messageId,
+                                reqInfo->info.token, reqInfo->info.tokenLength))
+        {
+            OIC_LOG(INFO, TAG, "Second Request with same Token, Drop it");
+            CADestroyRequestInfoInternal(reqInfo);
+            goto exit;
+        }
+
+        cadata->requestInfo = reqInfo;
+        info = &reqInfo->info;
+        if (identity)
+        {
+            info->identity = *identity;
+        }
+        OIC_LOG(DEBUG, TAG, "Request Info :");
+        CALogPayloadInfo(info);
+   }
+    else if (CA_ERROR_DATA == dataType)
+    {
+        CAErrorInfo_t *errorInfo = (CAErrorInfo_t *)OICCalloc(1, sizeof (CAErrorInfo_t));
+        if (!errorInfo)
+        {
+            OIC_LOG(ERROR, TAG, "Memory allocation failed!");
+            goto exit;
+        }
+
+        CAResult_t result = CAGetErrorInfoFromPDU(data, endpoint, errorInfo);
+        if (CA_STATUS_OK != result)
+        {
+            OIC_LOG(ERROR, TAG, "CAGetErrorInfoFromPDU failed");
+            OICFree(errorInfo);
+            goto exit;
+        }
+
+        cadata->errorInfo = errorInfo;
+        info = &errorInfo->info;
+        if (identity)
+        {
+            info->identity = *identity;
+        }
+        OIC_LOG(DEBUG, TAG, "error Info :");
+        CALogPayloadInfo(info);
+    }
+
+    cadata->remoteEndpoint = ep;
+    cadata->dataType = dataType;
+
+    OIC_LOG(DEBUG, TAG, "CAGenerateHandlerData OUT");
+    return cadata;
+
+exit:
+    OICFree(cadata);
+#ifndef SINGLE_THREAD
+    CAFreeEndpoint(ep);
+#endif
+    return NULL;
+}
+
 static void CATimeoutCallback(const CAEndpoint_t *endpoint, const void *pdu, uint32_t size)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
     VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint");
     VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
-
+#ifdef SINGLE_THREAD
+    CAEndpoint_t* ep = endpoint;
+#else
     CAEndpoint_t* ep = CACloneEndpoint(endpoint);
-    if (NULL == ep)
+    if (!ep)
     {
         OIC_LOG(ERROR, TAG, "clone failed");
         return;
     }
+#endif
 
     CAResponseInfo_t* resInfo = (CAResponseInfo_t*)OICCalloc(1, sizeof(CAResponseInfo_t));
 
-    if (NULL == resInfo)
+    if (!resInfo)
     {
         OIC_LOG(ERROR, TAG, "calloc failed");
+#ifndef SINGLE_THREAD
         CAFreeEndpoint(ep);
+#endif
         return;
     }
 
     resInfo->result = CA_RETRANSMIT_TIMEOUT;
     resInfo->info.type = CAGetMessageTypeFromPduBinaryData(pdu, size);
     resInfo->info.messageId = CAGetMessageIdFromPduBinaryData(pdu, size);
-    CAResult_t res = CAGetTokenFromPDU((const coap_hdr_t *) pdu, &(resInfo->info));
+
+    CAResult_t res = CAGetTokenFromPDU((const coap_hdr_transport_t *) pdu, &(resInfo->info),
+                                       endpoint);
     if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "fail to get Token from retransmission list");
-        OICFree(resInfo->info.token);
-        OICFree(resInfo);
+        CADestroyResponseInfoInternal(resInfo);
+#ifndef SINGLE_THREAD
         CAFreeEndpoint(ep);
+#endif
         return;
     }
 
@@ -138,8 +306,10 @@ static void CATimeoutCallback(const CAEndpoint_t *endpoint, const void *pdu, uin
     if (NULL == cadata)
     {
         OIC_LOG(ERROR, TAG, "memory allocation failed !");
+#ifndef SINGLE_THREAD
         CAFreeEndpoint(ep);
-        OICFree(resInfo);
+#endif
+        CADestroyResponseInfoInternal(resInfo);
         return;
     }
 
@@ -148,13 +318,32 @@ static void CATimeoutCallback(const CAEndpoint_t *endpoint, const void *pdu, uin
     cadata->requestInfo = NULL;
     cadata->responseInfo = resInfo;
 
+#ifdef WITH_BWT
+    if (CAIsSupportedBlockwiseTransfer(endpoint->adapter))
+    {
+        res = CARemoveBlockDataFromListWithSeed(resInfo->info.token, resInfo->info.tokenLength,
+                                                endpoint->port);
+        if (CA_STATUS_OK != res)
+        {
+            OIC_LOG(ERROR, TAG, "CARemoveBlockDataFromListWithSeed failed");
+        }
+    }
+#endif // WITH_BWT
+
+#ifdef SINGLE_THREAD
+    CAProcessReceivedData(cadata);
+#else
     CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
-    OIC_LOG(DEBUG, TAG, "OUT");
+#endif
 }
 
-static void CADataDestroyer(void *data, uint32_t size)
+static void CADestroyData(void *data, uint32_t size)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
+    OIC_LOG(DEBUG, TAG, "CADestroyData IN");
+    if ((size_t)size < sizeof(CAData_t))
+    {
+        OIC_LOG_V(ERROR, TAG, "Destroy data too small %p %d", data, size);
+    }
     CAData_t *cadata = (CAData_t *) data;
 
     if (NULL == cadata)
@@ -162,11 +351,12 @@ static void CADataDestroyer(void *data, uint32_t size)
         OIC_LOG(ERROR, TAG, "cadata is NULL");
         return;
     }
-
+#ifndef SINGLE_THREAD
     if (NULL != cadata->remoteEndpoint)
     {
         CAFreeEndpoint(cadata->remoteEndpoint);
     }
+#endif
 
     if (NULL != cadata->requestInfo)
     {
@@ -180,27 +370,18 @@ static void CADataDestroyer(void *data, uint32_t size)
 
     if (NULL != cadata->errorInfo)
     {
-       CAInfo_t *info = &cadata->errorInfo->info;
-       OICFree(info->token);
-       OICFree(info->options);
-       OICFree(info->payload);
-       OICFree(info->resourceUri);
-       OICFree(cadata->errorInfo);
+        CADestroyErrorInfoInternal(cadata->errorInfo);
     }
 
     OICFree(cadata);
-    OIC_LOG(DEBUG, TAG, "OUT");
+    OIC_LOG(DEBUG, TAG, "CADestroyData OUT");
 }
 
-static void CAReceiveThreadProcess(void *threadData)
+#ifdef SINGLE_THREAD
+static void CAProcessReceivedData(CAData_t *data)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
-    // Currently not supported
-    // This will be enabled when RI supports multi threading
-#ifndef SINGLE_HANDLE
-    CAData_t *data = (CAData_t *) threadData;
-
-    if (NULL == data)
+    OIC_LOG(DEBUG, TAG, "CAProcessReceivedData IN");
+    if (!data)
     {
         OIC_LOG(ERROR, TAG, "thread data error!!");
         return;
@@ -210,8 +391,7 @@ static void CAReceiveThreadProcess(void *threadData)
     // #1 parse the data
     // #2 get endpoint
     CAEndpoint_t *rep = (CAEndpoint_t *)(data->remoteEndpoint);
-
-    if (NULL == rep)
+    if (!rep)
     {
         OIC_LOG(ERROR, TAG, "remoteEndpoint error!!");
         return;
@@ -230,295 +410,551 @@ static void CAReceiveThreadProcess(void *threadData)
         g_errorHandler(rep, data->errorInfo);
     }
 
-#endif /* SINGLE_HANDLE */
-    OIC_LOG(DEBUG, TAG, "OUT");
+    CADestroyData(data, sizeof(CAData_t));
+
+    OIC_LOG(DEBUG, TAG, "CAProcessReceivedData OUT");
 }
+#endif
 
-static void CASendThreadProcess(void *threadData)
+#ifndef SINGLE_THREAD
+static void CAReceiveThreadProcess(void *threadData)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
+#ifndef SINGLE_HANDLE
     CAData_t *data = (CAData_t *) threadData;
+    OIC_TRACE_BEGIN(%s:CAProcessReceivedData, TAG);
+    CAProcessReceivedData(data);
+    OIC_TRACE_END();
+#else
+    (void)threadData;
+#endif
+}
+#endif // SINGLE_THREAD
 
-    VERIFY_NON_NULL_VOID(data, TAG, "data");
-    VERIFY_NON_NULL_VOID(data->remoteEndpoint, TAG, "remoteEndpoint");
+static CAResult_t CAProcessMulticastData(const CAData_t *data)
+{
+    VERIFY_NON_NULL(data, TAG, "data");
+    VERIFY_NON_NULL(data->remoteEndpoint, TAG, "remoteEndpoint");
+
+    coap_pdu_t *pdu = NULL;
+    CAInfo_t *info = NULL;
+    coap_list_t *options = NULL;
+    coap_transport_t transport = COAP_UDP;
+    CAResult_t res = CA_SEND_FAILED;
+
+    if (!data->requestInfo && !data->responseInfo)
+    {
+        OIC_LOG(ERROR, TAG, "request or response info is empty");
+        return res;
+    }
+
+    if (data->requestInfo)
+    {
+        OIC_LOG(DEBUG, TAG, "requestInfo is available..");
+
+        info = &data->requestInfo->info;
+        pdu = CAGeneratePDU(CA_GET, info, data->remoteEndpoint, &options, &transport);
+    }
+    else if (data->responseInfo)
+    {
+        OIC_LOG(DEBUG, TAG, "responseInfo is available..");
+
+        info = &data->responseInfo->info;
+        pdu = CAGeneratePDU(data->responseInfo->result, info, data->remoteEndpoint,
+                            &options, &transport);
+    }
+
+    if (!pdu)
+    {
+        OIC_LOG(ERROR,TAG,"Failed to generate multicast PDU");
+        CASendErrorInfo(data->remoteEndpoint, info, CA_SEND_FAILED);
+        coap_delete_list(options);
+        return res;
+    }
+
+#ifdef WITH_BWT
+    if (CAIsSupportedBlockwiseTransfer(data->remoteEndpoint->adapter))
+    {
+        // Blockwise transfer
+        res = CAAddBlockOption(&pdu, info, data->remoteEndpoint, &options);
+        if (CA_STATUS_OK != res)
+        {
+            OIC_LOG(DEBUG, TAG, "CAAddBlockOption has failed");
+            goto exit;
+        }
+    }
+#endif // WITH_BWT
+
+    CALogPDUInfo(data, pdu);
+
+    res = CASendMulticastData(data->remoteEndpoint, pdu->transport_hdr, pdu->length, data->dataType);
+    if (CA_STATUS_OK != res)
+    {
+        OIC_LOG_V(ERROR, TAG, "send failed:%d", res);
+        goto exit;
+    }
+
+    coap_delete_list(options);
+    coap_delete_pdu(pdu);
+    return res;
+
+exit:
+    CAErrorHandler(data->remoteEndpoint, pdu->transport_hdr, pdu->length, res);
+    coap_delete_list(options);
+    coap_delete_pdu(pdu);
+    return res;
+}
+
+static CAResult_t CAProcessSendData(const CAData_t *data)
+{
+    VERIFY_NON_NULL(data, TAG, "data");
+    VERIFY_NON_NULL(data->remoteEndpoint, TAG, "remoteEndpoint");
 
     CAResult_t res = CA_STATUS_FAILED;
 
+    if (CA_NETWORK_COMMAND == data->dataType)
+    {
+        if (CA_REQ_DISCONNECT == data->eventInfo)
+        {
+#ifdef TCP_ADAPTER
+            // request TCP disconnect
+            if (CA_ADAPTER_TCP == data->remoteEndpoint->adapter)
+            {
+                OIC_LOG(INFO, TAG, "request TCP disconnect");
+                return CADisconnectSession(data->remoteEndpoint);
+            }
+#endif
+        }
+    }
+
     CASendDataType_t type = data->type;
 
     coap_pdu_t *pdu = NULL;
+    CAInfo_t *info = NULL;
+    coap_list_t *options = NULL;
+    coap_transport_t transport = COAP_UDP;
 
     if (SEND_TYPE_UNICAST == type)
     {
+        OIC_LOG(DEBUG,TAG,"Unicast message");
+
+#ifdef ROUTING_GATEWAY
+        /*
+         * When forwarding a packet, do not attempt retransmission as its the responsibility of
+         * packet originator node
+         */
+        bool skipRetransmission = false;
+#endif
 
         if (NULL != data->requestInfo)
         {
             OIC_LOG(DEBUG, TAG, "requestInfo is available..");
 
-            pdu = CAGeneratePDU(data->requestInfo->method, &data->requestInfo->info);
+            info = &data->requestInfo->info;
+#ifdef ROUTING_GATEWAY
+            skipRetransmission = data->requestInfo->info.skipRetransmission;
+#endif
+            pdu = CAGeneratePDU(data->requestInfo->method, info, data->remoteEndpoint,
+                                &options, &transport);
         }
         else if (NULL != data->responseInfo)
         {
             OIC_LOG(DEBUG, TAG, "responseInfo is available..");
 
-            pdu = CAGeneratePDU(data->responseInfo->result, &data->responseInfo->info);
+            info = &data->responseInfo->info;
+#ifdef ROUTING_GATEWAY
+            skipRetransmission = data->responseInfo->info.skipRetransmission;
+#endif
+            pdu = CAGeneratePDU(data->responseInfo->result, info, data->remoteEndpoint,
+                                &options, &transport);
         }
         else
         {
             OIC_LOG(DEBUG, TAG, "request info, response info is empty");
+            return CA_STATUS_INVALID_PARAM;
         }
 
         // interface controller function call.
         if (NULL != pdu)
         {
-            CALogPDUInfo(pdu);
+#ifdef WITH_BWT
+            if (CAIsSupportedBlockwiseTransfer(data->remoteEndpoint->adapter))
+            {
+                // Blockwise transfer
+                if (NULL != info)
+                {
+                    CAResult_t res = CAAddBlockOption(&pdu, info,
+                                                      data->remoteEndpoint,
+                                                      &options);
+                    if (CA_STATUS_OK != res)
+                    {
+                        OIC_LOG(INFO, TAG, "to write block option has failed");
+                        CAErrorHandler(data->remoteEndpoint, pdu->transport_hdr, pdu->length, res);
+                        coap_delete_list(options);
+                        coap_delete_pdu(pdu);
+                        return res;
+                    }
+                }
+            }
+#endif // WITH_BWT
+            CALogPDUInfo(data, pdu);
 
-            res = CASendUnicastData(data->remoteEndpoint, pdu->hdr, pdu->length);
+            OIC_LOG_V(INFO, TAG, "CASendUnicastData type : %d", data->dataType);
+            res = CASendUnicastData(data->remoteEndpoint, pdu->transport_hdr, pdu->length, data->dataType);
             if (CA_STATUS_OK != res)
             {
                 OIC_LOG_V(ERROR, TAG, "send failed:%d", res);
+                CAErrorHandler(data->remoteEndpoint, pdu->transport_hdr, pdu->length, res);
+                coap_delete_list(options);
                 coap_delete_pdu(pdu);
-                return;
+                return res;
             }
-            // for retransmission
-            res = CARetransmissionSentData(&g_retransmissionContext, data->remoteEndpoint, pdu->hdr,
-                                           pdu->length);
-            if (CA_STATUS_OK != res)
+
+#ifdef WITH_TCP
+            if (CAIsSupportedCoAPOverTCP(data->remoteEndpoint->adapter))
             {
-                OIC_LOG_V(INFO, TAG, "retransmission will be not working: %d", res);
-                coap_delete_pdu(pdu);
-                return;
+                OIC_LOG(INFO, TAG, "retransmission will be not worked");
+            }
+            else
+#endif
+#ifdef ROUTING_GATEWAY
+            if (!skipRetransmission)
+#endif
+            {
+                // for retransmission
+                res = CARetransmissionSentData(&g_retransmissionContext,
+                                               data->remoteEndpoint,
+                                               data->dataType,
+                                               pdu->transport_hdr, pdu->length);
+                if ((CA_STATUS_OK != res) && (CA_NOT_SUPPORTED != res))
+                {
+                    //when retransmission not supported this will return CA_NOT_SUPPORTED, ignore
+                    OIC_LOG_V(INFO, TAG, "retransmission is not enabled due to error, res : %d", res);
+                    coap_delete_list(options);
+                    coap_delete_pdu(pdu);
+                    return res;
+                }
             }
 
+            coap_delete_list(options);
             coap_delete_pdu(pdu);
         }
+        else
+        {
+            OIC_LOG(ERROR,TAG,"Failed to generate unicast PDU");
+            CASendErrorInfo(data->remoteEndpoint, info, CA_SEND_FAILED);
+            return CA_SEND_FAILED;
+        }
     }
     else if (SEND_TYPE_MULTICAST == type)
     {
-        OIC_LOG(DEBUG, TAG, "both requestInfo & responseInfo is not available");
+        OIC_LOG(DEBUG,TAG,"Multicast message");
+#ifdef WITH_TCP
+        /*
+         * If CoAP over TCP is enabled, the CoAP pdu wont be same for IP and other adapters.
+         * That's why we need to generate two pdu's, one for IP and second for other transports.
+         * Two possible cases we might have to split: a) when adapter is CA_DEFAULT_ADAPTER
+         * b) when one of the adapter is IP adapter(ex: CA_ADAPTER_IP | CA_ADAPTER_GATT_BTLE)
+         */
+        if (data->remoteEndpoint->adapter == CA_DEFAULT_ADAPTER ||
+                (CA_ADAPTER_IP & data->remoteEndpoint->adapter &&
+                    CA_ADAPTER_IP != data->remoteEndpoint->adapter))
+        {
+            if (data->remoteEndpoint->adapter == CA_DEFAULT_ADAPTER)
+            {
+                data->remoteEndpoint->adapter = CA_ALL_ADAPTERS ^ CA_ADAPTER_IP;
+            }
+            else
+            {
+                data->remoteEndpoint->adapter = data->remoteEndpoint->adapter ^ CA_ADAPTER_IP;
+            }
+            CAProcessMulticastData(data);
+            data->remoteEndpoint->adapter = CA_ADAPTER_IP;
+            CAProcessMulticastData(data);
+        }
+        else
+        {
+            CAProcessMulticastData(data);
+        }
+#else
+        CAProcessMulticastData(data);
+#endif
+    }
+    return CA_STATUS_OK;
+}
+
+#ifndef SINGLE_THREAD
+static void CASendThreadProcess(void *threadData)
+{
+    CAData_t *data = (CAData_t *) threadData;
+    OIC_TRACE_BEGIN(%s:CAProcessSendData, TAG);
+    CAProcessSendData(data);
+    OIC_TRACE_END();
+}
+#endif
+
+/*
+ * If a second message arrives with the same message ID, token and the other address
+ * family, drop it.  Typically, IPv6 beats IPv4, so the IPv4 message is dropped.
+ */
+static bool CADropSecondMessage(CAHistory_t *history, const CAEndpoint_t *ep, uint16_t id,
+                                CAToken_t token, uint8_t tokenLength)
+{
+    if (!ep)
+    {
+        return true;
+    }
+    if (ep->adapter != CA_ADAPTER_IP)
+    {
+        return false;
+    }
+    if (!caglobals.ip.dualstack)
+    {
+        return false;
+    }
 
-        CAInfo_t *info = &data->requestInfo->info;
+    if (tokenLength > CA_MAX_TOKEN_LEN)
+    {
+        /*
+         * If token length is more than CA_MAX_TOKEN_LEN,
+         * we compare the first CA_MAX_TOKEN_LEN bytes only.
+         */
+        tokenLength = CA_MAX_TOKEN_LEN;
+    }
 
-        info->options = data->options;
-        info->numOptions = data->numOptions;
+    bool ret = false;
+    CATransportFlags_t familyFlags = ep->flags & CA_IPFAMILY_MASK;
 
-        pdu = CAGeneratePDU(CA_GET, info);
-        if (NULL != pdu)
+    for (size_t i = 0; i < sizeof(history->items) / sizeof(history->items[0]); i++)
+    {
+        CAHistoryItem_t *item = &(history->items[i]);
+        if (id == item->messageId && tokenLength == item->tokenLength
+            && memcmp(item->token, token, tokenLength) == 0)
         {
-            CALogPDUInfo(pdu);
-
-            res = CASendMulticastData(data->remoteEndpoint, pdu->hdr, pdu->length);
-            if (CA_STATUS_OK != res)
+            if ((familyFlags ^ item->flags) == CA_IPFAMILY_MASK)
             {
-                OIC_LOG_V(ERROR, TAG, "send failed:%d", res);
-                coap_delete_pdu(pdu);
-                return;
+                OIC_LOG_V(INFO, TAG, "IPv%c duplicate message ignored",
+                          familyFlags & CA_IPV6 ? '6' : '4');
+                ret = true;
+                break;
             }
-
-            coap_delete_pdu(pdu);
         }
     }
 
-    OIC_LOG(DEBUG, TAG, "OUT");
+    history->items[history->nextIndex].flags = familyFlags;
+    history->items[history->nextIndex].messageId = id;
+    if (token && tokenLength)
+    {
+        memcpy(history->items[history->nextIndex].token, token, tokenLength);
+        history->items[history->nextIndex].tokenLength = tokenLength;
+    }
+
+    if (++history->nextIndex >= HISTORYSIZE)
+    {
+        history->nextIndex = 0;
+    }
+
+    return ret;
 }
 
-static void CAReceivedPacketCallback(const CAEndpoint_t *endpoint, void *data, uint32_t dataLen)
+static CAResult_t CAReceivedPacketCallback(const CASecureEndpoint_t *sep,
+                                           const void *data, uint32_t dataLen)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
-    VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint");
-    VERIFY_NON_NULL_VOID(data, TAG, "data");
+    VERIFY_NON_NULL(sep, TAG, "remoteEndpoint");
+    VERIFY_NON_NULL(data, TAG, "data");
+    OIC_TRACE_BEGIN(%s:CAReceivedPacketCallback, TAG);
+
+    if (0 == dataLen)
+    {
+        OIC_LOG(ERROR, TAG, "dataLen is zero");
+        OIC_TRACE_END();
+
+        return CA_STATUS_FAILED;
+    }
+
+    // samsung log
+    OIC_LOG(DEBUG, TAG, "received pdu data :");
+    if (dataLen < 32)
+    {
+        OIC_LOG_BUFFER(DEBUG, TAG,  data, dataLen);
+    }
+    else
+    {
+        OIC_LOG_BUFFER(DEBUG, TAG,  data, 32);
+    }
 
+    CAResult_t res = CA_STATUS_OK;
     uint32_t code = CA_NOT_FOUND;
-    coap_pdu_t *pdu = (coap_pdu_t *) CAParsePDU((const char *) data, dataLen, &code);
-    OICFree(data);
+    CAData_t *cadata = NULL;
 
+    coap_pdu_t *pdu = (coap_pdu_t *) CAParsePDU((const char *) data, dataLen, &code,
+                                                &(sep->endpoint));
     if (NULL == pdu)
     {
         OIC_LOG(ERROR, TAG, "Parse PDU failed");
-        return;
+        res = CA_STATUS_FAILED;
+        goto exit;
     }
 
+    OIC_LOG_V(DEBUG, TAG, "code = %d", code);
     if (CA_GET == code || CA_POST == code || CA_PUT == code || CA_DELETE == code)
     {
-        CARequestInfo_t *ReqInfo = (CARequestInfo_t *) OICCalloc(1, sizeof(CARequestInfo_t));
-        if (NULL == ReqInfo)
+        cadata = CAGenerateHandlerData(&(sep->endpoint), &(sep->identity), pdu, CA_REQUEST_DATA);
+        if (!cadata)
         {
-            OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, Memory allocation failed!");
+            OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, CAGenerateHandlerData failed!");
             coap_delete_pdu(pdu);
-            return;
+            goto exit;
         }
-
-        CAResult_t res = CAGetRequestInfoFromPDU(pdu, ReqInfo);
-        if (CA_STATUS_OK != res)
+    }
+    else
+    {
+        cadata = CAGenerateHandlerData(&(sep->endpoint), &(sep->identity), pdu, CA_RESPONSE_DATA);
+        if (!cadata)
         {
-            OIC_LOG_V(ERROR, TAG, "CAGetRequestInfoFromPDU failed : %d", res);
-            OICFree(ReqInfo);
+            OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, CAGenerateHandlerData failed!");
             coap_delete_pdu(pdu);
-            return;
+            goto exit;
         }
 
-        if (NULL != ReqInfo->info.options)
+#ifdef WITH_TCP
+        if (CAIsSupportedCoAPOverTCP(sep->endpoint.adapter))
         {
-            uint32_t i;
-            for (i = 0; i < ReqInfo->info.numOptions; i++)
-            {
-                OIC_LOG_V(DEBUG, TAG, "Request- optionID: %d", ReqInfo->info.options[i].optionID);
-
-                OIC_LOG_V(DEBUG, TAG, "Request- list: %s", ReqInfo->info.options[i].optionData);
-            }
+            OIC_LOG(INFO, TAG, "retransmission is not supported");
         }
-
-        if (NULL != ReqInfo->info.payload)
+        else
+#endif
         {
-            OIC_LOG_V(DEBUG, TAG, "Request- payload: %s", ReqInfo->info.payload);
-        }
-        OIC_LOG_V(DEBUG, TAG, "Request- code: %d", ReqInfo->method);
-        if (NULL != ReqInfo->info.token)
-        {
-            OIC_LOG(DEBUG, TAG, "Request- token:");
-            OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) ReqInfo->info.token,
-                           ReqInfo->info.tokenLength);
-        }
-        OIC_LOG_V(DEBUG, TAG, "Request- msgID : %d", ReqInfo->info.messageId);
-        // store the data at queue.
-        CAData_t *cadata = NULL;
-        cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
-        if (NULL == cadata)
-        {
-            OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, Memory allocation failed !");
-            CADestroyRequestInfoInternal(ReqInfo);
-            coap_delete_pdu(pdu);
-            return;
-        }
-
-        cadata->type = SEND_TYPE_UNICAST;
-        cadata->remoteEndpoint = CACloneEndpoint(endpoint);
-        cadata->requestInfo = ReqInfo;
-        cadata->responseInfo = NULL;
-        CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
-    }
-    else
-    {
-        CAResponseInfo_t *ResInfo = (CAResponseInfo_t *) OICCalloc(1, sizeof(CAResponseInfo_t));
-        if (NULL == ResInfo)
-        {
-            OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, Memory allocation failed!");
-            coap_delete_pdu(pdu);
-            return;
-        }
-
-        CAResult_t res = CAGetResponseInfoFromPDU(pdu, ResInfo);
-        if (CA_STATUS_OK != res)
-        {
-            OIC_LOG_V(ERROR, TAG, "CAGetResponseInfoFromPDU failed : %d", res);
-            OICFree(ResInfo);
-            coap_delete_pdu(pdu);
-            return;
-        }
+            // for retransmission
+            void *retransmissionPdu = NULL;
+            CARetransmissionReceivedData(&g_retransmissionContext, cadata->remoteEndpoint, pdu->transport_hdr,
+                                         pdu->length, &retransmissionPdu);
 
-        if (NULL != ResInfo->info.options)
-        {
-            uint32_t i;
-            for (i = 0; i < ResInfo->info.numOptions; i++)
+            // get token from saved data in retransmission list
+            if (retransmissionPdu && CA_EMPTY == code)
             {
-                OIC_LOG_V(DEBUG, TAG, "Response- optionID: %d", ResInfo->info.options[i].optionID);
-
-                OIC_LOG_V(DEBUG, TAG, "Response- list: %s", ResInfo->info.options[i].optionData);
+                if (cadata->responseInfo)
+                {
+                    CAInfo_t *info = &cadata->responseInfo->info;
+                    CAResult_t res = CAGetTokenFromPDU((const coap_hdr_transport_t *)retransmissionPdu,
+                                                       info, &(sep->endpoint));
+                    if (CA_STATUS_OK != res)
+                    {
+                        OIC_LOG(ERROR, TAG, "fail to get Token from retransmission list");
+                        OICFree(info->token);
+                        info->tokenLength = 0;
+                    }
+                }
             }
+            OICFree(retransmissionPdu);
         }
+    }
 
-        if (NULL != ResInfo->info.payload)
+    cadata->type = SEND_TYPE_UNICAST;
+
+    CALogPDUInfo(cadata, pdu);
+
+#ifdef SINGLE_THREAD
+    CAProcessReceivedData(cadata);
+#else
+#ifdef WITH_BWT
+    if (CAIsSupportedBlockwiseTransfer(sep->endpoint.adapter))
+    {
+        CAResult_t res = CAReceiveBlockWiseData(pdu, &(sep->endpoint), cadata, dataLen);
+        if (CA_NOT_SUPPORTED == res || CA_REQUEST_TIMEOUT == res)
         {
-            OIC_LOG_V(DEBUG, TAG, "Response- payload: %s", ResInfo->info.payload);
+            OIC_LOG(DEBUG, TAG, "this message does not have block option");
+            CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
         }
-        OIC_LOG_V(DEBUG, TAG, "Response- code: %d", ResInfo->result);
-        if (NULL != ResInfo->info.token)
+        else
         {
-            OIC_LOG(DEBUG, TAG, "Response- token:");
-            OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) ResInfo->info.token,
-                           ResInfo->info.tokenLength);
+            CADestroyData(cadata, sizeof(CAData_t));
         }
-        OIC_LOG_V(DEBUG, TAG, "Response- msgID: %d", ResInfo->info.messageId);
+    }
+    else
+#endif
+    {
+        CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
+    }
+#endif // SINGLE_THREAD
 
-        // store the data at queue.
-        CAData_t *cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
-        if (NULL == cadata)
-        {
-            OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, Memory allocation failed !");
-            CADestroyResponseInfoInternal(ResInfo);
-            coap_delete_pdu(pdu);
-            return;
-        }
+    coap_delete_pdu(pdu);
 
-        cadata->type = SEND_TYPE_UNICAST;
-        cadata->remoteEndpoint = CACloneEndpoint(endpoint);
-        cadata->requestInfo = NULL;
+exit:
+    OIC_LOG(DEBUG, TAG, "OUT - Recv Thread");
+    OIC_TRACE_END();
+    return res;
+}
 
-        // for retransmission
-        void *retransmissionPdu = NULL;
-        CARetransmissionReceivedData(&g_retransmissionContext, endpoint, pdu->hdr, pdu->length,
-                                     &retransmissionPdu);
+static void CAAdapterStateChangedCallback(CATransportAdapter_t transportType, bool enabled)
+{
+    if (!enabled)
+    {
+        CAClearMessageHandler(transportType);
+    }
+}
 
-        // get token from saved data in retransmission list
-        if (retransmissionPdu && CA_EMPTY == code)
-        {
-            CAResult_t res = CAGetTokenFromPDU((const coap_hdr_t *)retransmissionPdu,
-                                               &(ResInfo->info));
-            if (CA_STATUS_OK != res)
-            {
-                OIC_LOG(ERROR, TAG, "fail to get Token from retransmission list");
-                OICFree(ResInfo->info.token);
-            }
-        }
-        OICFree(retransmissionPdu);
-        cadata->responseInfo = ResInfo;
+static bool CAClearQueueEndpointDataContext(void *data, uint32_t size, void *ctx)
+{
+    (void)size;
 
-        CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
+    if (NULL == data || NULL == ctx)
+    {
+        return false;
     }
 
-    if (pdu)
+    CAData_t *caData = (CAData_t *)data;
+    const CAEndpoint_t *endpoint = (const CAEndpoint_t *)ctx;
+
+    if (NULL != caData && NULL != caData->remoteEndpoint)
     {
-        coap_delete_pdu(pdu);
+        if (strcmp(caData->remoteEndpoint->addr, endpoint->addr) == 0
+            && caData->remoteEndpoint->port == endpoint->port
+            && caData->remoteEndpoint->adapter == endpoint->adapter)
+        {
+            return true;
+        }
     }
-    OIC_LOG(DEBUG, TAG, "OUT");
+    return false;
 }
 
-static void CANetworkChangedCallback(const CAEndpoint_t *info, CANetworkStatus_t status)
+static void CAConnectionStateChangedCallback(const CAEndpoint_t *info, bool isConnected)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
-
-    OIC_LOG(DEBUG, TAG, "OUT");
+    if (!isConnected)
+    {
+        CAResult_t res = CAQueueingThreadClearContextData(&g_sendThread,
+                                                          CAClearQueueEndpointDataContext,
+                                                          (void *)info);
+        if (CA_STATUS_OK != res)
+        {
+            OIC_LOG(ERROR, TAG, "Could not clear the send queue");
+        }
+    }
 }
 
 void CAHandleRequestResponseCallbacks()
 {
-
+#ifdef SINGLE_THREAD
+    CAReadData();
+    CARetransmissionBaseRoutine((void *)&g_retransmissionContext);
+#else
 #ifdef SINGLE_HANDLE
     // parse the data and call the callbacks.
     // #1 parse the data
     // #2 get endpoint
 
-    ca_mutex_lock(g_receiveThread.threadMutex);
+    oc_mutex_lock(g_receiveThread.threadMutex);
 
     u_queue_message_t *item = u_queue_get_element(g_receiveThread.dataQueue);
 
-    ca_mutex_unlock(g_receiveThread.threadMutex);
+    oc_mutex_unlock(g_receiveThread.threadMutex);
 
-    if (NULL == item)
-    {
-        return;
-    }
-
-    // get values
-    void *msg = item->msg;
-
-    if (NULL == msg)
+    if (NULL == item || NULL == item->msg)
     {
         return;
     }
 
     // get endpoint
-    CAData_t *td = (CAData_t *) msg;
+    CAData_t *td = (CAData_t *) item->msg;
 
     if (td->requestInfo && g_requestHandler)
     {
@@ -536,232 +972,352 @@ void CAHandleRequestResponseCallbacks()
         g_errorHandler(td->remoteEndpoint, td->errorInfo);
     }
 
-    CADataDestroyer(msg, sizeof(CAData_t));
+    CADestroyData(item->msg, sizeof(CAData_t));
     OICFree(item);
 
-#endif
-    OIC_LOG(DEBUG, TAG, "CAHandleRequestResponseCallbacks OUT");
+#endif // SINGLE_HANDLE
+#endif // SINGLE_THREAD
 }
 
-CAResult_t CADetachRequestMessage(const CAEndpoint_t *object, const CARequestInfo_t *request)
+static CAData_t* CAPrepareSendData(const CAEndpoint_t *endpoint, const void *sendData,
+                                   CADataType_t dataType)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
+    OIC_LOG(DEBUG, TAG, "CAPrepareSendData IN");
 
-    VERIFY_NON_NULL(object, TAG, "object");
-    VERIFY_NON_NULL(request, TAG, "request");
+    CAData_t *cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
+    if (!cadata)
+    {
+        OIC_LOG(ERROR, TAG, "memory allocation failed");
+        return NULL;
+    }
 
-    if (false == CAIsSelectedNetworkAvailable())
+    if (CA_REQUEST_DATA == dataType)
     {
-        return CA_STATUS_FAILED;
+#ifdef SINGLE_THREAD
+        CARequestInfo_t *request = (CARequestInfo_t *)sendData;
+#else
+        // clone request info
+        CARequestInfo_t *request = CACloneRequestInfo((CARequestInfo_t *)sendData);
+        if (!request)
+        {
+            OIC_LOG(ERROR, TAG, "CACloneRequestInfo failed");
+            goto exit;
+        }
+#endif
+        cadata->type = request->isMulticast ? SEND_TYPE_MULTICAST : SEND_TYPE_UNICAST;
+        cadata->requestInfo =  request;
+    }
+    else if (CA_RESPONSE_DATA == dataType || CA_RESPONSE_FOR_RES == dataType)
+    {
+#ifdef SINGLE_THREAD
+        CAResponseInfo_t *response = (CAResponseInfo_t *)sendData;
+#else
+        // clone response info
+        CAResponseInfo_t *response = CACloneResponseInfo((CAResponseInfo_t *)sendData);
+        if (!response)
+        {
+            OIC_LOG(ERROR, TAG, "CACloneResponseInfo failed");
+            goto exit;
+        }
+#endif
+        cadata->type = response->isMulticast ? SEND_TYPE_MULTICAST : SEND_TYPE_UNICAST;
+        cadata->responseInfo = response;
+    }
+    else
+    {
+        OIC_LOG(ERROR, TAG, "CAPrepareSendData unknown data type");
+        goto exit;
     }
 
-    CAEndpoint_t *remoteEndpoint = NULL;
-    CARequestInfo_t *requestInfo = NULL;
-    CAData_t *data = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
-    CA_MEMORY_ALLOC_CHECK(data);
+#ifdef SINGLE_THREAD
+    CAEndpoint_t* ep = endpoint;
+#else
+    CAEndpoint_t* ep = CACloneEndpoint(endpoint);
+    if (!ep)
+    {
+        OIC_LOG(ERROR, TAG, "endpoint clone failed");
+        goto exit;
+    }
+#endif
+    cadata->remoteEndpoint = ep;
+    cadata->dataType = dataType;
+    return cadata;
 
-    // clone remote endpoint
-    remoteEndpoint = CACloneEndpoint(object);
-    CA_MEMORY_ALLOC_CHECK(remoteEndpoint);
+exit:
+#ifndef SINGLE_THREAD
+    CADestroyData(cadata, sizeof(CAData_t));
+#else
+    OICFree(cadata);
+#endif
+    return NULL;
+}
 
-    // clone request info
-    requestInfo = CACloneRequestInfo(request);
-    CA_MEMORY_ALLOC_CHECK(requestInfo);
+CAResult_t CADetachSendNetworkReqMessage(const CAEndpoint_t *endpoint,
+                                         CAConnectEvent_t event,
+                                         CADataType_t dataType)
+{
+    VERIFY_NON_NULL(endpoint, TAG, "endpoint");
 
-    // save data
-    data->type = request->isMulticast ? SEND_TYPE_MULTICAST : SEND_TYPE_UNICAST;
-    data->remoteEndpoint = remoteEndpoint;
-    data->requestInfo = requestInfo;
-    data->responseInfo = NULL;
-    data->options = NULL;
-    data->numOptions = 0;
-    if (NULL != requestInfo->info.options && 0 < requestInfo->info.numOptions)
+    if (false == CAIsSelectedNetworkAvailable())
     {
-        uint8_t numOptions = requestInfo->info.numOptions;
-        // copy data
-        CAHeaderOption_t *headerOption = (CAHeaderOption_t *) OICMalloc(sizeof(CAHeaderOption_t)
-                                                                        * numOptions);
-        CA_MEMORY_ALLOC_CHECK(headerOption);
+        return CA_STATUS_FAILED;
+    }
 
-        memcpy(headerOption, requestInfo->info.options, sizeof(CAHeaderOption_t) * numOptions);
+#ifndef SINGLE_THREAD
+    CAData_t *cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
+    if (!cadata)
+    {
+        OIC_LOG(ERROR, TAG, "cadata memory allocation failed");
+        return CA_STATUS_FAILED;
+    }
 
-        data->options = headerOption;
-        data->numOptions = numOptions;
+    CAEndpoint_t* ep = CACloneEndpoint(endpoint);
+    if (!ep)
+    {
+        OIC_LOG(ERROR, TAG, "endpoint clone failed");
+        OICFree(cadata);
+        return CA_STATUS_FAILED;
     }
 
-    // add thread
-    CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
+    cadata->remoteEndpoint = ep;
+    cadata->eventInfo = event;
+    cadata->dataType = dataType;
 
-// memory error label.
-memory_error_exit:
-    CAFreeEndpoint(remoteEndpoint);
-    CADestroyRequestInfoInternal(requestInfo);
+    CAQueueingThreadAddData(&g_sendThread, cadata, sizeof(CAData_t));
+#endif
 
-    OICFree(data);
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_MEMORY_ALLOC_FAILED;
+    return CA_STATUS_OK;
 }
 
-CAResult_t CADetachResponseMessage(const CAEndpoint_t *object,
-                                   const CAResponseInfo_t *response)
+CAResult_t CADetachSendMessage(const CAEndpoint_t *endpoint, const void *sendMsg,
+                               CADataType_t dataType)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
-    VERIFY_NON_NULL(object, TAG, "object");
-    VERIFY_NON_NULL(response, TAG, "response");
+    VERIFY_NON_NULL(endpoint, TAG, "endpoint");
+    VERIFY_NON_NULL(sendMsg, TAG, "sendMsg");
 
     if (false == CAIsSelectedNetworkAvailable())
     {
         return CA_STATUS_FAILED;
     }
 
-    CAEndpoint_t *remoteEndpoint = NULL;
-    CAResponseInfo_t *responseInfo = NULL;
-
-    // allocate & initialize
-    CAData_t *data = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
-    CA_MEMORY_ALLOC_CHECK(data);
-
-    // clone remote endpoint
-    remoteEndpoint = CACloneEndpoint(object);
-    CA_MEMORY_ALLOC_CHECK(remoteEndpoint);
-
-    // clone response info
-    responseInfo = CACloneResponseInfo(response);
-    CA_MEMORY_ALLOC_CHECK(responseInfo);
-
-    // save data
-    data->type = SEND_TYPE_UNICAST;
-    data->remoteEndpoint = remoteEndpoint;
-    data->requestInfo = NULL;
-    data->responseInfo = responseInfo;
-    data->options = NULL;
-    data->numOptions = 0;
-    if (NULL != responseInfo->info.options && 0 < responseInfo->info.numOptions)
+#ifdef ARDUINO
+    // If max retransmission queue is reached, then don't handle new request
+    if (CA_MAX_RT_ARRAY_SIZE == u_arraylist_length(g_retransmissionContext.dataList))
     {
-        uint8_t numOptions = responseInfo->info.numOptions;
-        // copy data
-        CAHeaderOption_t *headerOption = (CAHeaderOption_t *) OICMalloc(sizeof(CAHeaderOption_t)
-                                                                        * numOptions);
-        CA_MEMORY_ALLOC_CHECK(headerOption);
-
-        memcpy(headerOption, responseInfo->info.options, sizeof(CAHeaderOption_t) * numOptions);
+        OIC_LOG(ERROR, TAG, "max RT queue size reached!");
+        return CA_SEND_FAILED;
+    }
+#endif // ARDUINO
 
-        data->options = headerOption;
-        data->numOptions = numOptions;
+    CAData_t *data = CAPrepareSendData(endpoint, sendMsg, dataType);
+    if(!data)
+    {
+        OIC_LOG(ERROR, TAG, "CAPrepareSendData failed");
+        return CA_MEMORY_ALLOC_FAILED;
     }
 
-    // add thread
-    CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
+    OIC_LOG_V(INFO_PRIVATE, TAG, "DID of endpoint of this message is %s", endpoint->remoteId);
 
-    OIC_LOG(DEBUG, TAG, "OUT");
-    return CA_STATUS_OK;
+#ifdef SINGLE_THREAD
+    CAResult_t result = CAProcessSendData(data);
+    if (CA_STATUS_OK != result)
+    {
+        OIC_LOG(ERROR, TAG, "CAProcessSendData failed");
+        OICFree(data);
+        return result;
+    }
 
-// memory error label.
-memory_error_exit:
-    CAFreeEndpoint(remoteEndpoint);
-    CADestroyResponseInfoInternal(responseInfo);
     OICFree(data);
-    OIC_LOG(DEBUG, TAG, "OUT");
 
-    return CA_MEMORY_ALLOC_FAILED;
-}
+#else
+#ifdef WITH_BWT
+    if (CAIsSupportedBlockwiseTransfer(endpoint->adapter))
+    {
+        CACheckAndDeleteTimedOutBlockData();
+        // send block data
+        CAResult_t res = CASendBlockWiseData(data);
+        if (CA_NOT_SUPPORTED == res)
+        {
+            OIC_LOG(DEBUG, TAG, "normal msg will be sent");
+            CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
+            return CA_STATUS_OK;
+        }
+        else
+        {
+            CADestroyData(data, sizeof(CAData_t));
+        }
 
-CAResult_t CADetachMessageResourceUri(const CAURI_t resourceUri, const CAToken_t token,
-                                      uint8_t tokenLength, const CAHeaderOption_t *options,
-                                      uint8_t numOptions)
-{
-    return CA_NOT_SUPPORTED;
+        return res;
+    }
+    else
+#endif // WITH_BWT
+    {
+        CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
+    }
+#endif // SINGLE_THREAD
+
+    return CA_STATUS_OK;
 }
 
 void CASetInterfaceCallbacks(CARequestCallback ReqHandler, CAResponseCallback RespHandler,
-                             CAErrorCallback errroHandler)
+                             CAErrorCallback errorHandler)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
     g_requestHandler = ReqHandler;
     g_responseHandler = RespHandler;
-    g_errorHandler = errroHandler;
-    OIC_LOG(DEBUG, TAG, "OUT");
+    g_errorHandler = errorHandler;
 }
 
-CAResult_t CAInitializeMessageHandler()
+void CASetNetworkMonitorCallback(CANetworkMonitorCallback nwMonitorHandler)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
-    CASetPacketReceivedCallback(CAReceivedPacketCallback);
+    g_nwMonitorHandler = nwMonitorHandler;
+}
 
-    CASetNetworkChangeCallback(CANetworkChangedCallback);
+CAResult_t CAInitializeMessageHandler(CATransportAdapter_t transportType)
+{
+    CASetPacketReceivedCallback(CAReceivedPacketCallback);
     CASetErrorHandleCallback(CAErrorHandler);
 
+#ifndef SINGLE_THREAD
     // create thread pool
     CAResult_t res = ca_thread_pool_init(MAX_THREAD_POOL_SIZE, &g_threadPoolHandle);
-
-    if (res != CA_STATUS_OK)
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "thread pool initialize error.");
         return res;
     }
 
     // send thread initialize
-    if (CA_STATUS_OK != CAQueueingThreadInitialize(&g_sendThread, g_threadPoolHandle,
-                                                   CASendThreadProcess, CADataDestroyer))
+    res = CAQueueingThreadInitialize(&g_sendThread, g_threadPoolHandle,
+                                     CASendThreadProcess, CADestroyData);
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "Failed to Initialize send queue thread");
-        return CA_STATUS_FAILED;
+        return res;
     }
 
     // start send thread
+#ifndef __TIZENRT__
     res = CAQueueingThreadStart(&g_sendThread);
-
-    if (res != CA_STATUS_OK)
+#else
+    res = CAQueueingThreadStart(&g_sendThread, "IoT_MessageHandlerQueue");
+#endif
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "thread start error(send thread).");
-        ca_thread_pool_free(g_threadPoolHandle);
-        g_threadPoolHandle = NULL;
         return res;
     }
 
     // receive thread initialize
-    if (CA_STATUS_OK != CAQueueingThreadInitialize(&g_receiveThread, g_threadPoolHandle,
-                                                   CAReceiveThreadProcess, CADataDestroyer))
+    res = CAQueueingThreadInitialize(&g_receiveThread, g_threadPoolHandle,
+                                     CAReceiveThreadProcess, CADestroyData);
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "Failed to Initialize receive queue thread");
-        return CA_STATUS_FAILED;
+        return res;
     }
 
 #ifndef SINGLE_HANDLE // This will be enabled when RI supports multi threading
     // start receive thread
-    res = CAQueueingThreadStart(&gReceiveThread);
-
-    if (res != CA_STATUS_OK)
+    res = CAQueueingThreadStart(&g_receiveThread);
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "thread start error(receive thread).");
         return res;
     }
-#endif
+#endif // SINGLE_HANDLE
 
     // retransmission initialize
-    CARetransmissionInitialize(&g_retransmissionContext, g_threadPoolHandle, CASendUnicastData,
-                               CATimeoutCallback, NULL);
+    res = CARetransmissionInitialize(&g_retransmissionContext, g_threadPoolHandle,
+                                     CASendUnicastData, CATimeoutCallback, NULL);
+    if (CA_STATUS_OK != res)
+    {
+        OIC_LOG(ERROR, TAG, "Failed to Initialize Retransmission.");
+        return res;
+    }
+
+#ifdef WITH_BWT
+    // block-wise transfer initialize
+    res = CAInitializeBlockWiseTransfer(CAAddDataToSendThread, CAAddDataToReceiveThread);
+    if (CA_STATUS_OK != res)
+    {
+        OIC_LOG(ERROR, TAG, "Failed to Initialize BlockWiseTransfer.");
+        return res;
+    }
+#endif
 
     // start retransmission
     res = CARetransmissionStart(&g_retransmissionContext);
-
-    if (res != CA_STATUS_OK)
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "thread start error(retransmission thread).");
         return res;
     }
 
     // initialize interface adapters by controller
-    CAInitializeAdapters(g_threadPoolHandle);
-    OIC_LOG(DEBUG, TAG, "OUT");
+    CAInitializeAdapters(g_threadPoolHandle, transportType);
+    CASetNetworkMonitorCallbacks(CAAdapterStateChangedCallback, CAConnectionStateChangedCallback);
+#else
+    // retransmission initialize
+    CAResult_t res = CARetransmissionInitialize(&g_retransmissionContext, NULL, CASendUnicastData,
+                                                CATimeoutCallback, NULL);
+    if (CA_STATUS_OK != res)
+    {
+        OIC_LOG(ERROR, TAG, "Failed to Initialize Retransmission.");
+        return res;
+    }
+
+    CAInitializeAdapters();
+#endif // SINGLE_THREAD
+
     return CA_STATUS_OK;
 }
 
+static bool CAClearQueueAdapterDataContext(void *data, uint32_t size, void *ctx)
+{
+    (void)size;
+
+    if (NULL == data || NULL == ctx)
+    {
+        return false;
+    }
+
+    CAData_t *caData = (CAData_t *)data;
+    CATransportAdapter_t *type = (CATransportAdapter_t *)ctx;
+
+    if (NULL != caData && NULL != caData->remoteEndpoint
+        && caData->remoteEndpoint->adapter == *type)
+    {
+        return true;
+    }
+    return false;
+}
+
+void CAClearMessageHandler(CATransportAdapter_t transportType)
+{
+    CATransportAdapter_t *typeCtx = &transportType;
+
+    CAResult_t res = CAQueueingThreadClearContextData(&g_sendThread,
+                                                      CAClearQueueAdapterDataContext,
+                                                      typeCtx);
+
+    if (res != CA_STATUS_OK)
+    {
+        OIC_LOG_V(ERROR, TAG, "Clear send data failed[%d]", res);
+    }
+
+    if (transportType & DEFAULT_RETRANSMISSION_TYPE)
+    {
+        res = CARetransmissionClearAdapterData(&g_retransmissionContext, transportType);
+        if (res != CA_STATUS_OK)
+        {
+            OIC_LOG_V(ERROR, TAG, "Clear retransmission data failed[%d]", res);
+        }
+    }
+}
+
 void CATerminateMessageHandler()
 {
-    OIC_LOG(DEBUG, TAG, "IN");
+#ifndef SINGLE_THREAD
     CATransportAdapter_t connType;
     u_arraylist_t *list = CAGetSelectedNetworkList();
     uint32_t length = u_arraylist_length(list);
@@ -798,7 +1354,7 @@ void CATerminateMessageHandler()
     if (NULL != g_receiveThread.threadMutex)
     {
 #ifndef SINGLE_HANDLE // This will be enabled when RI supports multi threading
-        CAQueueingThreadStop(&gReceiveThread);
+        CAQueueingThreadStop(&g_receiveThread);
 #endif
     }
 
@@ -809,110 +1365,456 @@ void CATerminateMessageHandler()
         g_threadPoolHandle = NULL;
     }
 
+#ifdef WITH_BWT
+    CATerminateBlockWiseTransfer();
+#endif
     CARetransmissionDestroy(&g_retransmissionContext);
     CAQueueingThreadDestroy(&g_sendThread);
     CAQueueingThreadDestroy(&g_receiveThread);
 
     // terminate interface adapters by controller
     CATerminateAdapters();
+#else
+    // terminate interface adapters by controller
+    CATerminateAdapters();
 
-    OIC_LOG(DEBUG, TAG, "OUT");
+    // stop retransmission
+    CARetransmissionStop(&g_retransmissionContext);
+    CARetransmissionDestroy(&g_retransmissionContext);
+#endif // SINGLE_THREAD
 }
 
-void CALogPDUInfo(coap_pdu_t *pdu)
+static void CALogPayloadInfo(CAInfo_t *info)
 {
-    VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
-
-    OIC_LOG_V(DEBUG, TAG, "PDU Maker - payload : %s", pdu->data);
-
-    OIC_LOG_V(DEBUG, TAG, "PDU Maker - type : %d", pdu->hdr->type);
-
-    OIC_LOG_V(DEBUG, TAG, "PDU Maker - code : %d", pdu->hdr->code);
+    if (info)
+    {
+        if (info->options)
+        {
+            for (uint32_t i = 0; i < info->numOptions; i++)
+            {
+                OIC_LOG_V(DEBUG, TAG, "optionID: %u", info->options[i].optionID);
 
-    OIC_LOG_V(DEBUG, TAG, "PDU Maker - id : %d", ntohs(pdu->hdr->id));
+                OIC_LOG_V(DEBUG, TAG, "list: %s", info->options[i].optionData);
+            }
+        }
 
-    OIC_LOG(DEBUG, TAG, "PDU Maker - token :");
+        if (info->payload)
+        {
+            OIC_LOG_V(DEBUG, TAG, "payload: %p(%zu)", info->payload,
+                      info->payloadSize);
+        }
 
-    OIC_LOG_BUFFER(DEBUG, TAG, pdu->hdr->token, pdu->hdr->token_length);
+        if (info->token)
+        {
+            OIC_LOG(DEBUG, TAG, "token:");
+            OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) info->token,
+                           info->tokenLength);
+        }
+        OIC_LOG_V(DEBUG, TAG, "msgID: %u", info->messageId);
+    }
+    else
+    {
+        OIC_LOG(DEBUG, TAG, "info is NULL, cannot output log data");
+    }
 }
 
 void CAErrorHandler(const CAEndpoint_t *endpoint,
                     const void *data, uint32_t dataLen,
                     CAResult_t result)
 {
-    OIC_LOG(DEBUG, TAG, "IN");
+    OIC_LOG(DEBUG, TAG, "CAErrorHandler IN");
     VERIFY_NON_NULL_VOID(endpoint, TAG, "remoteEndpoint");
     VERIFY_NON_NULL_VOID(data, TAG, "data");
 
+    if (0 == dataLen)
+    {
+        OIC_LOG(ERROR, TAG, "dataLen is zero");
+        return;
+    }
+
+#ifndef SINGLE_THREAD
     uint32_t code = CA_NOT_FOUND;
     //Do not free remoteEndpoint and data. Currently they will be freed in data thread
     //Get PDU data
-    coap_pdu_t *pdu = (coap_pdu_t *)CAParsePDU((const char *)data, dataLen, &code);
+    coap_pdu_t *pdu = (coap_pdu_t *)CAParsePDU((const char *)data, dataLen, &code, endpoint);
     if (NULL == pdu)
     {
         OIC_LOG(ERROR, TAG, "Parse PDU failed");
         return;
     }
 
-    CAErrorInfo_t *errorInfo = (CAErrorInfo_t *)OICCalloc(1, sizeof (CAErrorInfo_t));
-    if (NULL == errorInfo)
+    CAData_t *cadata = CAGenerateHandlerData(endpoint, NULL, pdu, CA_ERROR_DATA);
+    if (!cadata)
     {
-        OIC_LOG(ERROR, TAG, "CAErrorHandler, Memory allocation failed!");
+        OIC_LOG(ERROR, TAG, "CAErrorHandler, CAGenerateHandlerData failed!");
         coap_delete_pdu(pdu);
         return;
     }
 
-    CAResult_t res = CAGetErrorInfoFromPDU(pdu, errorInfo);
-    if (CA_STATUS_OK != res)
+    cadata->errorInfo->result = result;
+
+    CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
+    coap_delete_pdu(pdu);
+#else
+    (void)result;
+#endif
+
+    OIC_LOG(DEBUG, TAG, "CAErrorHandler OUT");
+    return;
+}
+
+static void CASendErrorInfo(const CAEndpoint_t *endpoint, const CAInfo_t *info, CAResult_t result)
+{
+    OIC_LOG(DEBUG, TAG, "CASendErrorInfo IN");
+#ifndef SINGLE_THREAD
+    CAData_t *cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
+    if (!cadata)
     {
-        OIC_LOG_V(ERROR, TAG, "CAGetErrorInfoFromPDU failed : %d", res);
-        OICFree(errorInfo);
-        coap_delete_pdu(pdu);
-       return;
+        OIC_LOG(ERROR, TAG, "cadata memory allocation failed");
+        return;
     }
 
-    errorInfo->result = result;
-    OIC_LOG_V(DEBUG, TAG, "error : %d", result);
-    if (NULL != errorInfo->info.payload)
+    CAEndpoint_t* ep = CACloneEndpoint(endpoint);
+    if (!ep)
     {
-        OIC_LOG_V(DEBUG, TAG, "error, payload: %s", errorInfo->info.payload);
+        OIC_LOG(ERROR, TAG, "endpoint clone failed");
+        OICFree(cadata);
+        return;
     }
 
-    OIC_LOG(DEBUG, TAG, "error, token");
-    OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) errorInfo->info.token,
-                   errorInfo->info.tokenLength);
-    OIC_LOG_V(DEBUG, TAG, "CAErrorHandler, msgID : %d", errorInfo->info.messageId);
-
-    CAEndpoint_t *rep = NULL;
-    rep = CACloneEndpoint(endpoint);
-    if (!rep)
+    CAErrorInfo_t *errorInfo = (CAErrorInfo_t *)OICCalloc(1, sizeof (CAErrorInfo_t));
+    if (!errorInfo)
     {
-        OIC_LOG(ERROR, TAG, "CAErrorHandler, CloneEndpoint Failed");
-        OICFree(errorInfo);
-        coap_delete_pdu(pdu);
+        OIC_LOG(ERROR, TAG, "errorInfo memory allocation failed");
+        OICFree(cadata);
+        CAFreeEndpoint(ep);
         return;
     }
 
-    // store the data at queue.
-    CAData_t *cadata = NULL;
-    cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
-    if (NULL == cadata)
+    CAResult_t res = CACloneInfo(info, &errorInfo->info);
+    if (CA_STATUS_OK != res)
     {
-        OIC_LOG(ERROR, TAG, "CAReceivedPacketCallback, Memory allocation failed !");
-        CAFreeEndpoint(rep);
+        OIC_LOG(ERROR, TAG, "info clone failed");
+        OICFree(cadata);
         OICFree(errorInfo);
-        coap_delete_pdu(pdu);
+        CAFreeEndpoint(ep);
         return;
     }
 
-    cadata->remoteEndpoint = rep;
-    cadata->requestInfo = NULL;
-    cadata->responseInfo = NULL;
+    errorInfo->result = result;
+    cadata->remoteEndpoint = ep;
     cadata->errorInfo = errorInfo;
     cadata->dataType = CA_ERROR_DATA;
 
     CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
-    coap_delete_pdu(pdu);
+#endif
+    OIC_LOG(DEBUG, TAG, "CASendErrorInfo OUT");
+}
 
-    return;
+
+
+#ifndef ARDUINO
+#ifdef __TIZENRT__
+static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu)
+{
+
+       if(data == NULL || pdu == NULL)
+       {
+               printf("INVALID INPUT, CALogPDUInfo FAIL\n");
+       }
+
+       char type[30] = "";
+
+       switch(data->dataType)
+       {
+               case CA_REQUEST_DATA:
+                       strncpy(type, "\e[32mREQUEST  <<<<\e[m", 30);
+                       break;
+               case CA_RESPONSE_DATA:
+                       strncpy(type, "\e[36mRESPONSE >>>>\e[m", 30);
+                       break;
+               case CA_ERROR_DATA:
+                       strncpy(type, "ERROR", 30);
+                       break;
+               case CA_RESPONSE_FOR_RES:
+                       strncpy(type, "RESP_RES >>>>", 30);
+                       break;
+               default:
+                       snprintf(type, 30, "Type : %d", data->dataType);
+                       break;
+       }
+
+
+       char method[20] = "";
+       const CAInfo_t *info = NULL;
+       if (NULL != data->requestInfo)
+       {
+               switch(data->requestInfo->method)
+               {
+                       case CA_GET:
+                               strncpy(method, "GET", 20);
+                               break;
+                       case CA_POST:
+                               strncpy(method, "POST", 20);
+                               break;
+                       case CA_PUT:
+                               strncpy(method, "PUT", 20);
+                               break;
+                       case CA_DELETE:
+                               strncpy(method, "DEL", 20);
+                               break;
+                       default:
+                               sprintf(method, "Method : %d", data->requestInfo->method);
+                               break;
+               }
+               info = &data->requestInfo->info;
+       }
+
+       if(NULL != data->responseInfo)
+       {
+
+               sprintf(method, "result : %d", data->responseInfo->result);
+               info = &data->responseInfo->info;
+       }
+
+
+       char log_buffer[1024] = "";
+       sprintf(log_buffer, "CA_LOG [%5d] | %-13s | %-12s | msg size : %4d | %s", pdu->transport_hdr->udp.id , type, method, pdu->length, info->resourceUri);
+
+       puts(log_buffer);
 }
+
+
+#else
+
+static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu)
+{
+    OIC_LOG(DEBUG, TAG, "CALogPDUInfo");
+
+    VERIFY_NON_NULL_VOID(data, TAG, "data");
+    VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
+    OIC_TRACE_BEGIN(%s:CALogPDUInfo, TAG);
+
+    OIC_LOG(INFO, ANALYZER_TAG, "=================================================");
+    if(SEND_TYPE_MULTICAST == data->type)
+    {
+        OIC_LOG(INFO, ANALYZER_TAG, "Is Multicast = true");
+    }
+    else
+    {
+        OIC_LOG(INFO, ANALYZER_TAG, "Is Multicast = false");
+    }
+
+    if (NULL != data->remoteEndpoint)
+    {
+        CALogAdapterTypeInfo(data->remoteEndpoint->adapter);
+        OIC_LOG_V(INFO, ANALYZER_TAG, "Address = [%s]:[%d]", data->remoteEndpoint->addr,
+                  data->remoteEndpoint->port);
+    }
+
+    switch(data->dataType)
+    {
+        case CA_REQUEST_DATA:
+            OIC_LOG(INFO, ANALYZER_TAG, "Data Type = [CA_REQUEST_DATA]");
+            break;
+        case CA_RESPONSE_DATA:
+            OIC_LOG(INFO, ANALYZER_TAG, "Data Type = [CA_RESPONSE_DATA]");
+            break;
+        case CA_ERROR_DATA:
+            OIC_LOG(INFO, ANALYZER_TAG, "Data Type = [CA_ERROR_DATA]");
+            break;
+        case CA_RESPONSE_FOR_RES:
+            OIC_LOG(INFO, ANALYZER_TAG, "Data Type = [CA_RESPONSE_FOR_RES]");
+            break;
+        default:
+            OIC_LOG_V(INFO, ANALYZER_TAG, "Data Type = [%d]", data->dataType);
+            break;
+    }
+
+    const CAInfo_t *info = NULL;
+    if (NULL != data->requestInfo)
+    {
+        switch(data->requestInfo->method)
+        {
+            case CA_GET:
+                OIC_LOG(INFO, ANALYZER_TAG, "Method = [GET]");
+                break;
+            case CA_POST:
+                OIC_LOG(INFO, ANALYZER_TAG, "Method = [POST]");
+                break;
+            case CA_PUT:
+                OIC_LOG(INFO, ANALYZER_TAG, "Method = [PUT]");
+                break;
+            case CA_DELETE:
+                OIC_LOG(INFO, ANALYZER_TAG, "Method = [DELETE]");
+                break;
+            default:
+                OIC_LOG_V(INFO, ANALYZER_TAG, "Method = [%d]", data->requestInfo->method);
+                break;
+        }
+        info = &data->requestInfo->info;
+    }
+
+    if (NULL != data->responseInfo)
+    {
+        OIC_LOG_V(INFO, ANALYZER_TAG, "result code = [%d]", data->responseInfo->result);
+        info = &data->responseInfo->info;
+    }
+
+    if (pdu->transport_hdr)
+    {
+        OIC_LOG_V(INFO, ANALYZER_TAG, "Msg ID = [%d]", pdu->transport_hdr->udp.id);
+    }
+
+    if (info)
+    {
+        OIC_LOG(INFO, ANALYZER_TAG, "Coap Token");
+        OIC_LOG_BUFFER(INFO, ANALYZER_TAG, (const uint8_t *) info->token, info->tokenLength);
+        OIC_TRACE_BUFFER("OIC_CA_MSG_HANDLE:CALogPDUInfo:token",
+                         (const uint8_t *) info->token, info->tokenLength);
+        OIC_LOG_V(INFO, ANALYZER_TAG, "Res URI = [%s]", info->resourceUri);
+        OIC_TRACE_MARK(%s:CALogPDUInfo:uri:%s, TAG, info->resourceUri);
+
+        if (CA_FORMAT_APPLICATION_CBOR == info->payloadFormat)
+        {
+            OIC_LOG(INFO, ANALYZER_TAG, "Payload Format = [CA_FORMAT_APPLICATION_CBOR]");
+        }
+        else
+        {
+            OIC_LOG_V(INFO, ANALYZER_TAG, "Payload Format = [%d]", info->payloadFormat);
+        }
+    }
+
+    size_t payloadLen = (pdu->data) ? (unsigned char *) pdu->hdr + pdu->length - pdu->data : 0;
+    OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Message Full Size = [%u]", pdu->length);
+    OIC_LOG(INFO, ANALYZER_TAG, "CoAP Header (+ 0xFF)");
+    OIC_LOG_BUFFER(INFO, ANALYZER_TAG,  (const uint8_t *) pdu->transport_hdr,
+                   pdu->length - payloadLen);
+    OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Header size = [%" PRIuPTR "]", (size_t) pdu->length - payloadLen);
+
+    OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Payload");
+    OIC_LOG_BUFFER(INFO_PRIVATE, ANALYZER_TAG, pdu->data, payloadLen);
+    OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Payload Size = [%" PRIuPTR "]", payloadLen);
+    OIC_LOG(INFO, ANALYZER_TAG, "=================================================");
+
+    // samsung log
+    CASamsungLogMessage(data, pdu);
+    OIC_TRACE_END();
+}
+
+static void CASamsungLogMessage(const CAData_t *data, const coap_pdu_t *pdu)
+{
+    OIC_LOG(INFO, TAG, "CASamsungLogMessage");
+    VERIFY_NON_NULL_VOID(data, TAG, "data");
+    VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
+    VERIFY_NON_NULL_VOID(data->remoteEndpoint, TAG, "data->remoteEndpoint");
+
+    const CAInfo_t *info = NULL;
+    if (NULL != data->requestInfo)
+    {
+        info = &data->requestInfo->info;
+    }
+
+    if (NULL != data->responseInfo)
+    {
+        info = &data->responseInfo->info;
+    }
+
+    VERIFY_NON_NULL_VOID(info, TAG, "info");
+
+    memset(g_headerBuffer, 0, MAX_LOG_BUFFER_SIZE);
+    g_headerIndex = 0;
+
+    g_headerBuffer[g_headerIndex++] = data->dataType;
+    g_headerBuffer[g_headerIndex++] = '|';
+    g_headerBuffer[g_headerIndex++] = data->remoteEndpoint->adapter;
+    g_headerBuffer[g_headerIndex++] = '|';
+    g_headerBuffer[g_headerIndex++] = data->type;
+    g_headerBuffer[g_headerIndex++] = '|';
+
+    if (NULL != data->remoteEndpoint)
+    {
+        int i = 0;
+        while (data->remoteEndpoint->addr[i])
+        {
+            g_headerBuffer[g_headerIndex++] = data->remoteEndpoint->addr[i];
+            i++;
+        }
+        g_headerBuffer[g_headerIndex++] = ':';
+        g_headerBuffer[g_headerIndex++] = (data->remoteEndpoint->port >> 8) & 0x0000ff;
+        g_headerBuffer[g_headerIndex++] = data->remoteEndpoint->port & 0x000000ff;
+    }
+
+    g_headerBuffer[g_headerIndex++] = '|';
+    if (data->requestInfo)
+    {
+        g_headerBuffer[g_headerIndex++] = data->requestInfo->method;
+    }
+    else
+    {
+        g_headerBuffer[g_headerIndex++] = 0;
+    }
+
+    g_headerBuffer[g_headerIndex++] = '|';
+    if (data->responseInfo)
+    {
+        g_headerBuffer[g_headerIndex++] = data->responseInfo->result;
+    }
+    else
+    {
+        g_headerBuffer[g_headerIndex++] = 0;
+    }
+    g_headerBuffer[g_headerIndex++] = '|';
+
+    if (pdu->transport_hdr)
+    {
+        g_headerBuffer[g_headerIndex++] = (pdu->transport_hdr->udp.id >> 8) & 0x0000ff;
+        g_headerBuffer[g_headerIndex++] = pdu->transport_hdr->udp.id & 0x000000ff;
+    }
+    else
+    {
+        g_headerBuffer[g_headerIndex++] = 0;
+        g_headerBuffer[g_headerIndex++] = 0;
+    }
+    g_headerBuffer[g_headerIndex++] = '|';
+
+    if (info->token && info->tokenLength > 0)
+    {
+        for (size_t i = 0; i < info->tokenLength; i++)
+        {
+            g_headerBuffer[g_headerIndex++] = info->token[i];
+        }
+        g_headerBuffer[g_headerIndex++] = '|';
+    }
+
+    if (info->resourceUri)
+    {
+        size_t i = 0;
+        while (info->resourceUri[i])
+        {
+            g_headerBuffer[g_headerIndex++] = info->resourceUri[i];
+            i++;
+        }
+        g_headerBuffer[g_headerIndex++] = '|';
+    }
+
+    OIC_LOG_CA_BUFFER(INFO, TAG, (uint8_t *) g_headerBuffer, g_headerIndex, 1);
+    size_t payloadLen = (unsigned char *) pdu->hdr + pdu->length - pdu->data;
+    OIC_LOG_CA_BUFFER(INFO_PRIVATE, TAG, pdu->data, payloadLen, 0);
+}
+#endif
+
+#else
+static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu)
+{
+    VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
+    (void)data;
+
+    OIC_LOG_V(DEBUG, TAG, "PDU Maker - payload : %s", pdu->data);
+    OIC_LOG_V(DEBUG, TAG, "PDU Maker - type : %d", pdu->transport_hdr->udp.type);
+    OIC_LOG_V(DEBUG, TAG, "PDU Maker - code : %d", pdu->transport_hdr->udp.code);
+    OIC_LOG(DEBUG, TAG, "PDU Maker - token :");
+    OIC_LOG_BUFFER(DEBUG, TAG, pdu->transport_hdr->udp.token,
+                   pdu->transport_hdr->udp.token_length);
+}
+#endif