X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Ftcp_adapter%2Fcatcpserver.c;h=748d9a8c82e1ed91b64437b2361cf99c2f7824dd;hb=a6423190ad34f213e19237b1f24b2c1ff751707d;hp=3e2ab585b274ad554eb39547d9603bca1a9438e9;hpb=76ac4cfd9ffb58a17c93d74c3f6a21b11b07cf50;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
index 3e2ab58..748d9a8 100644
--- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
+++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
@@ -22,7 +22,12 @@
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/ioctl.h>
+#ifdef __TIZENRT__
+#include <tinyara/config.h>
+#include <poll.h>
+#else
 #include <sys/poll.h>
+#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -41,7 +46,7 @@
 #include "caipnwmonitor.h"
 #include <coap/pdu.h>
 #include "caadapterutils.h"
-#include "camutex.h"
+#include "octhread.h"
 #include "oic_malloc.h"
 
 #ifdef __WITH_TLS__
@@ -51,7 +56,8 @@
 /**
  * Logging tag for module name.
  */
-#define TAG "OIC_CA_TCP_SERVER"
+//#define TAG "OIC_CA_TCP_SERVER"
+#define TAG TCP_SERVER_TAG
 
 /**
  * Maximum CoAP over TCP header length
@@ -65,14 +71,38 @@
 #define TLS_HEADER_SIZE 5
 
 /**
+ * Max Connection Counts.
+ */
+#define MAX_CONNECTION_COUNTS   500
+
+#define COAP_TCP_MAX_BUFFER_CHUNK_SIZE 65530 //64kb - 6 (coap+tcp max header size)
+
+#define MILLISECONDS_PER_SECOND   (1000)
+
+/**
+ * Thread pool.
+ */
+static ca_thread_pool_t g_threadPool = NULL;
+
+/**
  * Mutex to synchronize device object list.
  */
-static ca_mutex g_mutexObjectList = NULL;
+static oc_mutex g_mutexObjectList = NULL;
 
 /**
  * Conditional mutex to synchronize.
  */
-static ca_cond g_condObjectList = NULL;
+static oc_cond g_condObjectList = NULL;
+
+/**
+ * Mutex to synchronize send.
+ */
+static oc_mutex g_mutexSend = NULL;
+
+/**
+ * Conditional mutex to synchronize send.
+ */
+static oc_cond g_condSend = NULL;
 
 /**
  * Maintains the callback to be notified when data received from remote device.
@@ -89,10 +119,6 @@ static CATCPErrorHandleCallback g_tcpErrorHandler = NULL;
  */
 static CATCPConnectionHandleCallback g_connectionCallback = NULL;
 
-static CAResult_t CATCPCreateMutex();
-static void CATCPDestroyMutex();
-static CAResult_t CATCPCreateCond();
-static void CATCPDestroyCond();
 static CASocketFd_t CACreateAcceptSocket(int family, CASocket_t *sock);
 static void CAAcceptConnection(CATransportFlags_t flag, CASocket_t *sock);
 static void CAFindReadyMessage();
@@ -100,6 +126,28 @@ static void CASelectReturned(fd_set *readFds);
 static void CAReceiveMessage(int fd);
 static void CAReceiveHandler(void *data);
 static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem);
+static void CATCPInitializeSocket();
+static CATCPSessionInfo_t *CAGetSessionInfoFromFDAsOwner(int fd, size_t *index);
+
+#if defined(__TIZEN__)
+static char g_cloudproxyUri[CA_MAX_URI_LENGTH];
+
+CAResult_t CASetCloudAddressForProxy(const char *uri)
+{
+    if (uri == NULL)
+        memset(g_cloudproxyUri, '\0', sizeof (g_cloudproxyUri));
+    else
+        OICStrcpy(g_cloudproxyUri, sizeof (g_cloudproxyUri), uri);
+    return CA_STATUS_OK;
+}
+
+const char *CAGetCloudAddressForProxy()
+{
+    if (g_cloudproxyUri[0] == '\0')
+        return NULL;
+    return g_cloudproxyUri;
+}
+#endif
 
 #define CHECKFD(FD) \
     if (FD > caglobals.tcp.maxfd) \
@@ -118,70 +166,70 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem);
         FD_SET(caglobals.tcp.TYPE.fd, FDS); \
     }
 
-/**
- * Read length amount of data from socket item->fd
- * Can read less data length then requested
- * Actual read length added to item->len variable
- *
- * @param[in/out] item - used socket, buffer and to update received message length
- * @param[in]  length  - length of data required to read
- * @param[in]  flags   - additional info about socket
- * @return             - CA_STATUS_OK or appropriate error code
- */
-static CAResult_t CARecv(CATCPSessionInfo_t *item, size_t length, int flags)
+void CATCPDestroyMutex()
 {
-    if (NULL == item)
+    if (g_mutexObjectList)
     {
-        return CA_STATUS_INVALID_PARAM;
+        oc_mutex_free(g_mutexObjectList);
+        g_mutexObjectList = NULL;
     }
+}
 
-    //skip read operation if requested zero length
-    if (0 == length)
+CAResult_t CATCPCreateMutex()
+{
+    if (!g_mutexObjectList)
     {
-        return CA_STATUS_OK;
+        g_mutexObjectList = oc_mutex_new();
+        if (!g_mutexObjectList)
+        {
+            OIC_LOG(ERROR, TAG, "Failed to create mutex!");
+            return CA_STATUS_FAILED;
+        }
     }
 
-    unsigned char *buffer = item->data + item->len;
-
-    int len = recv(item->fd, buffer, length, flags);
+    return CA_STATUS_OK;
+}
 
-    if (len < 0)
+void CATCPDestroyCond()
+{
+    if (g_condObjectList)
     {
-        OIC_LOG_V(ERROR, TAG, "recv failed %s", strerror(errno));
-        return CA_RECEIVE_FAILED;
+        oc_cond_free(g_condObjectList);
+        g_condObjectList = NULL;
     }
-    else if (0 == len)
+}
+
+CAResult_t CATCPCreateCond()
+{
+    if (!g_condObjectList)
     {
-        OIC_LOG(INFO, TAG, "Received disconnect from peer. Close connection");
-        item->state = DISCONNECTED;
-        return CA_DESTINATION_DISCONNECTED;
+        g_condObjectList = oc_cond_new();
+        if (!g_condObjectList)
+        {
+            OIC_LOG(ERROR, TAG, "Failed to create cond!");
+            return CA_STATUS_FAILED;
+        }
     }
-
-    OIC_LOG_V(DEBUG, TAG, "recv len = %d", len);
-    OIC_LOG_BUFFER(DEBUG, TAG, buffer, len);
-
-    item->len += len;
-
     return CA_STATUS_OK;
 }
 
-static void CATCPDestroyMutex()
+void CATCPDestroySendMutex()
 {
-    if (g_mutexObjectList)
+    if (g_mutexSend)
     {
-        ca_mutex_free(g_mutexObjectList);
-        g_mutexObjectList = NULL;
+        oc_mutex_free(g_mutexSend);
+        g_mutexSend = NULL;
     }
 }
 
-static CAResult_t CATCPCreateMutex()
+CAResult_t CATCPCreateSendMutex()
 {
-    if (!g_mutexObjectList)
+    if (!g_mutexSend)
     {
-        g_mutexObjectList = ca_mutex_new();
-        if (!g_mutexObjectList)
+        g_mutexSend = oc_mutex_new();
+        if (!g_mutexSend)
         {
-            OIC_LOG(ERROR, TAG, "Failed to created mutex!");
+            OIC_LOG(ERROR, TAG, "Failed to create send mutex!");
             return CA_STATUS_FAILED;
         }
     }
@@ -189,23 +237,23 @@ static CAResult_t CATCPCreateMutex()
     return CA_STATUS_OK;
 }
 
-static void CATCPDestroyCond()
+void CATCPDestroySendCond()
 {
-    if (g_condObjectList)
+    if (g_condSend)
     {
-        ca_cond_free(g_condObjectList);
-        g_condObjectList = NULL;
+        oc_cond_free(g_condSend);
+        g_condSend = NULL;
     }
 }
 
-static CAResult_t CATCPCreateCond()
+CAResult_t CATCPCreateSendCond()
 {
-    if (!g_condObjectList)
+    if (!g_condSend)
     {
-        g_condObjectList = ca_cond_new();
-        if (!g_condObjectList)
+        g_condSend = oc_cond_new();
+        if (!g_condSend)
         {
-            OIC_LOG(ERROR, TAG, "Failed to created cond!");
+            OIC_LOG(ERROR, TAG, "Failed to create send cond!");
             return CA_STATUS_FAILED;
         }
     }
@@ -217,14 +265,21 @@ static void CAReceiveHandler(void *data)
     (void)data;
     OIC_LOG(DEBUG, TAG, "IN - CAReceiveHandler");
 
-    while (!caglobals.tcp.terminate)
+    while (true)
     {
+        oc_mutex_lock(g_mutexObjectList);
+        if (caglobals.tcp.terminate)
+        {
+            oc_mutex_unlock(g_mutexObjectList);
+            break;
+        }
+        oc_mutex_unlock(g_mutexObjectList);
         CAFindReadyMessage();
     }
 
-    ca_mutex_lock(g_mutexObjectList);
-    ca_cond_signal(g_condObjectList);
-    ca_mutex_unlock(g_mutexObjectList);
+    oc_mutex_lock(g_mutexObjectList);
+    oc_cond_signal(g_condObjectList);
+    oc_mutex_unlock(g_mutexObjectList);
 
     OIC_LOG(DEBUG, TAG, "OUT - CAReceiveHandler");
 }
@@ -239,11 +294,12 @@ static void CAFindReadyMessage()
     CA_FD_SET(ipv4s, &readFds);
     CA_FD_SET(ipv6, &readFds);
     CA_FD_SET(ipv6s, &readFds);
-
+#ifndef __TIZENRT__
     if (OC_INVALID_SOCKET != caglobals.tcp.shutdownFds[0])
     {
         FD_SET(caglobals.tcp.shutdownFds[0], &readFds);
     }
+#endif
     if (OC_INVALID_SOCKET != caglobals.tcp.connectionFds[0])
     {
         FD_SET(caglobals.tcp.connectionFds[0], &readFds);
@@ -262,20 +318,24 @@ static void CAFindReadyMessage()
 
     int ret = select(caglobals.tcp.maxfd + 1, &readFds, NULL, NULL, &timeout);
 
+    oc_mutex_lock(g_mutexObjectList);
     if (caglobals.tcp.terminate)
     {
-        OIC_LOG_V(DEBUG, TAG, "Packet receiver Stop request received.");
+        oc_mutex_unlock(g_mutexObjectList);
+        OIC_LOG_V(INFO, TAG, "Packet receiver Stop request received.");
         return;
     }
-
-    if (0 < ret)
-    {
-        CASelectReturned(&readFds);
-    }
-    else if (0 > ret)
+    oc_mutex_unlock(g_mutexObjectList);
+    if (0 >= ret)
     {
-        OIC_LOG_V(FATAL, TAG, "select error %s", strerror(errno));
+        if (0 > ret)
+        {
+            OIC_LOG_V(FATAL, TAG, "select error %s", strerror(errno));
+        }
+        return;
     }
+
+    CASelectReturned(&readFds);
 }
 
 static void CASelectReturned(fd_set *readFds)
@@ -314,12 +374,24 @@ static void CASelectReturned(fd_set *readFds)
             return;
         }
         OIC_LOG_V(DEBUG, TAG, "Received new connection event with [%s]", buf);
-        FD_CLR(caglobals.tcp.connectionFds[0], readFds);
         return;
     }
     else
     {
+        int *readFDList = NULL;
+        size_t readFDListSize = 0;
+
+        oc_mutex_lock(g_mutexObjectList);
         uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
+
+        readFDList = (int*) OICCalloc(length, sizeof(int));
+        if (NULL == readFDList)
+        {
+            OIC_LOG_V(ERROR, TAG, "Failed to allocate memory!");
+            oc_mutex_unlock(g_mutexObjectList);
+            return;
+        }
+
         for (size_t i = 0; i < length; i++)
         {
             CATCPSessionInfo_t *svritem =
@@ -328,21 +400,35 @@ static void CASelectReturned(fd_set *readFds)
             {
                 if (FD_ISSET(svritem->fd, readFds))
                 {
-                    CAReceiveMessage(svritem->fd);
-                    if (-1 != svritem->fd)
-                    {
-                        FD_CLR(svritem->fd, readFds);
-                    }
+                    readFDList[readFDListSize++] = svritem->fd;
                 }
             }
         }
+        oc_mutex_unlock(g_mutexObjectList);
+
+        // Read incomming messages from fds
+        for (size_t i = 0; i < readFDListSize; i++)
+        {
+            CAReceiveMessage(readFDList[i]);
+        }
+
+        OICFree(readFDList);
     }
 }
 
 static void CAAcceptConnection(CATransportFlags_t flag, CASocket_t *sock)
 {
+    OIC_LOG_V(INFO, TAG, "In %s", __func__);
     VERIFY_NON_NULL_VOID(sock, TAG, "sock is NULL");
 
+    if (MAX_CONNECTION_COUNTS == u_arraylist_length(caglobals.tcp.svrlist))
+    {
+        OIC_LOG_V(INFO, TAG, "Exceeding the max connection counts limit, close listening port");
+        close(sock->fd);
+        sock->fd = OC_INVALID_SOCKET;
+        return;
+    }
+
     struct sockaddr_storage clientaddr;
     socklen_t clientlen = sizeof (struct sockaddr_in);
     if (flag & CA_IPV6)
@@ -366,59 +452,44 @@ static void CAAcceptConnection(CATransportFlags_t flag, CASocket_t *sock)
         svritem->sep.endpoint.flags = flag;
         svritem->sep.endpoint.adapter = CA_ADAPTER_TCP;
         svritem->state = CONNECTED;
+        svritem->isClient = false;
         CAConvertAddrToName((struct sockaddr_storage *)&clientaddr, clientlen,
                             svritem->sep.endpoint.addr, &svritem->sep.endpoint.port);
 
-        ca_mutex_lock(g_mutexObjectList);
+        // Allocate message buffer
+        svritem->tlsdata = (unsigned char*) OICCalloc(TLS_DATA_MAX_SIZE, sizeof(unsigned char));
+        if (!svritem->tlsdata)
+        {
+            OIC_LOG(ERROR, TAG, "Out of memory");
+            close(sockfd);
+            OICFree(svritem);
+            return;
+        }
+
+        oc_mutex_lock(g_mutexObjectList);
         bool result = u_arraylist_add(caglobals.tcp.svrlist, svritem);
         if (!result)
         {
             OIC_LOG(ERROR, TAG, "u_arraylist_add failed.");
             close(sockfd);
+            OICFree(svritem->tlsdata);
             OICFree(svritem);
-            ca_mutex_unlock(g_mutexObjectList);
+            oc_mutex_unlock(g_mutexObjectList);
             return;
         }
-        ca_mutex_unlock(g_mutexObjectList);
+        oc_mutex_unlock(g_mutexObjectList);
 
         CHECKFD(sockfd);
 
         // pass the connection information to CA Common Layer.
         if (g_connectionCallback)
         {
-            g_connectionCallback(&(svritem->sep.endpoint), true);
+            g_connectionCallback(&(svritem->sep.endpoint), true, svritem->isClient);
         }
     }
+    OIC_LOG_V(INFO, TAG, "Out %s", __func__);
 }
 
-#ifdef __WITH_TLS__
-static bool CAIsTlsMessage(const unsigned char* data, size_t length)
-{
-    if (NULL == data || 0 == length)
-    {
-        OIC_LOG_V(ERROR, TAG, "%s: null input param", __func__);
-        return false;
-    }
-
-    unsigned char first_byte = data[0];
-
-    //TLS Plaintext has four types: change_cipher_spec = [14], alert = [15],
-    //handshake = [16], application_data = [17] in HEX
-    const uint8_t tls_head_type[] = {0x14, 0x15, 0x16, 0x17};
-    size_t i = 0;
-
-    for (i = 0; i < sizeof(tls_head_type); i++)
-    {
-        if(tls_head_type[i] == first_byte)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-#endif
-
 /**
  * Clean socket state data
  *
@@ -431,8 +502,11 @@ void CACleanData(CATCPSessionInfo_t *svritem)
         OICFree(svritem->data);
         svritem->data = NULL;
         svritem->len = 0;
+#ifdef __WITH_TLS__
         svritem->tlsLen = 0;
+#endif
         svritem->totalLen = 0;
+        svritem->bufLen = 0;
         svritem->protocol = UNKNOWN;
     }
 }
@@ -458,7 +532,7 @@ CAResult_t CAConstructCoAP(CATCPSessionInfo_t *svritem, unsigned char **data,
 
     unsigned char *inBuffer = *data;
     size_t inLen = *dataLength;
-    OIC_LOG_V(DEBUG, TAG, "before-datalength : %u", *dataLength);
+    OIC_LOG_V(DEBUG, TAG, "before-datalength : %zd", *dataLength);
 
     if (NULL == svritem->data && inLen > 0)
     {
@@ -473,6 +547,7 @@ CAResult_t CAConstructCoAP(CATCPSessionInfo_t *svritem, unsigned char **data,
         // copy 1 byte to parse coap header length
         memcpy(svritem->data, inBuffer, 1);
         svritem->len = 1;
+        svritem->bufLen = COAP_MAX_HEADER_SIZE;
         inBuffer++;
         inLen--;
     }
@@ -517,214 +592,74 @@ CAResult_t CAConstructCoAP(CATCPSessionInfo_t *svritem, unsigned char **data,
 
         //calculate CoAP message length
         svritem->totalLen = CAGetTotalLengthFromHeader(svritem->data);
-
-        // allocate required memory
-        unsigned char *buffer = OICRealloc(svritem->data, svritem->totalLen);
-        if (NULL == buffer)
-        {
-            OIC_LOG(ERROR, TAG, "OICRealloc - out of memory");
-            return CA_MEMORY_ALLOC_FAILED;
-        }
-        svritem->data = buffer;
     }
 
     // PAYLOAD
     if (inLen > 0)
     {
-        // read required bytes to have full CoAP payload
+        // Calculate length of data to be copied.
         copyLen = svritem->totalLen - svritem->len;
         if (inLen < copyLen)
         {
             copyLen = inLen;
         }
 
-        //read required bytes to have full CoAP header
-        memcpy(svritem->data + svritem->len, inBuffer, copyLen);
-        svritem->len += copyLen;
-        inBuffer += copyLen;
-        inLen -= copyLen;
-    }
-
-    *data = inBuffer;
-    *dataLength = inLen;
-
-    OIC_LOG_V(DEBUG, TAG, "after-datalength : %u", *dataLength);
-    OIC_LOG_V(DEBUG, TAG, "Out %s", __func__);
-    return CA_STATUS_OK;
-}
-
-/**
- * Read message header from socket item->fd
- *
- * @param[in/out] item - used socket, buffer, current received message length and protocol
- * @return             - CA_STATUS_OK or appropriate error code
- */
-static CAResult_t CAReadHeader(CATCPSessionInfo_t *svritem)
-{
-    CAResult_t res = CA_STATUS_OK;
-
-    if (NULL == svritem)
-    {
-        return CA_STATUS_INVALID_PARAM;
-    }
-
-    if (NULL == svritem->data)
-    {
-        // allocate memory for message header (CoAP header size because it is bigger)
-        svritem->data = (unsigned char *) OICCalloc(1, COAP_MAX_HEADER_SIZE);
-        if (NULL == svritem->data)
-        {
-            OIC_LOG(ERROR, TAG, "OICCalloc - out of memory");
-            return CA_MEMORY_ALLOC_FAILED;
-        }
-    }
-
-    //read data (assume TLS header) from remote device.
-    //use TLS_HEADER_SIZE - svritem->len because even header can be read partially
-    res = CARecv(svritem, TLS_HEADER_SIZE - svritem->len, 0);
-
-    //return if any error occurs
-    if (CA_STATUS_OK != res)
-    {
-        return res;
-    }
-
-    //if not enough data received - read them on next CAReceiveMessage() call
-    if (svritem->len < TLS_HEADER_SIZE)
-    {
-        OIC_LOG(DEBUG, TAG, "Header received partially. Wait for rest header data");
-        return CA_STATUS_OK;
-    }
-
-    //if enough data received - parse header
-#ifdef __WITH_TLS__
-    if (CAIsTlsMessage(svritem->data, svritem->len))
-    {
-        svritem->protocol = TLS;
-
-        //[3][4] bytes in tls header are tls payload length
-        unsigned int message_length = (unsigned int)((svritem->data[3] << 8) | svritem->data[4]);
-        OIC_LOG_V(DEBUG, TAG, "%s: message_length = %d", __func__, message_length);
-
-        svritem->totalLen = message_length + TLS_HEADER_SIZE;
-    }
-    else
-#endif
-    {
-        svritem->protocol = COAP;
-
-        //seems CoAP data received. read full coap header.
-        coap_transport_t transport = coap_get_tcp_header_type_from_initbyte(svritem->data[0] >> 4);
-
-        size_t headerLen = coap_get_tcp_header_length_for_transport(transport);
-
-        if (svritem->len < headerLen)
+        // Is buffer not big enough for remaining data ?
+        if (svritem->len + copyLen > svritem->bufLen)
         {
-            //read required bytes to have full CoAP header
-            //it should be 1 byte (COAP_MAX_HEADER_SIZE - TLS_HEADER_SIZE)
-            res = CARecv(svritem, headerLen - svritem->len, 0);
-
-            //return if any error occurs
-            if (CA_STATUS_OK != res)
+            // Resize buffer to accommodate enough space
+            size_t extLen = svritem->totalLen - svritem->bufLen;
+            if (extLen > COAP_TCP_MAX_BUFFER_CHUNK_SIZE)
             {
-                return res;
+                extLen = COAP_TCP_MAX_BUFFER_CHUNK_SIZE;
             }
 
-            //if not enough data received - read them on next CAReceiveMessage() call
-            if (svritem->len < headerLen)
+            // Allocate required memory
+            unsigned char *buffer = OICRealloc(svritem->data, svritem->bufLen + extLen);
+            if (NULL == buffer)
             {
-                OIC_LOG(DEBUG, TAG, "CoAP header received partially. Wait for rest header data");
-                return CA_STATUS_OK;
+                OIC_LOG(ERROR, TAG, "OICRealloc - out of memory");
+                return CA_MEMORY_ALLOC_FAILED;
             }
+
+            svritem->data = buffer;
+            svritem->bufLen += extLen;
         }
 
-        //calculate CoAP message length
-        svritem->totalLen = CAGetTotalLengthFromHeader(svritem->data);
+        // Read required bytes to have full CoAP payload
+        memcpy(svritem->data + svritem->len, inBuffer, copyLen);
+        svritem->len += copyLen;
+        inBuffer += copyLen;
+        inLen -= copyLen;
     }
 
-    unsigned char *buffer = OICRealloc(svritem->data, svritem->totalLen);
-    if (NULL == buffer)
-    {
-        OIC_LOG(ERROR, TAG, "OICRealloc - out of memory");
-        return CA_MEMORY_ALLOC_FAILED;
-    }
-    svritem->data = buffer;
+    *data = inBuffer;
+    *dataLength = inLen;
 
+    OIC_LOG_V(DEBUG, TAG, "after-datalength : %zd", *dataLength);
+    OIC_LOG_V(DEBUG, TAG, "Out %s", __func__);
     return CA_STATUS_OK;
 }
 
-/**
- * Read message payload from socket item->fd
-
- *
- * @param[in/out] item - used socket, buffer and to update received message length
- * @return             - CA_STATUS_OK or appropriate error code
- */
-static CAResult_t CAReadPayload(CATCPSessionInfo_t *svritem)
-{
-    if (NULL == svritem)
-    {
-        return CA_STATUS_INVALID_PARAM;
-    }
-
-    return CARecv(svritem, svritem->totalLen - svritem->len, 0);
-}
-
-/**
- * Pass received data to app layer depending on protocol
- *
- * @param[in/out] item - used buffer, received message length and protocol
- */
-static void CAExecuteRequest(CATCPSessionInfo_t *svritem)
-{
-    if (NULL == svritem)
-    {
-        return;
-    }
-
-    switch(svritem->protocol)
-    {
-        case COAP:
-        {
-            if (g_packetReceivedCallback)
-            {
-                g_packetReceivedCallback(&svritem->sep, svritem->data, svritem->len);
-            }
-        }
-        break;
-        case TLS:
-#ifdef __WITH_TLS__
-        {
-            int ret = CAdecryptSsl(&svritem->sep, (uint8_t *)svritem->data, svritem->len);
-
-            OIC_LOG_V(DEBUG, TAG, "%s: CAdecryptSsl returned %d", __func__, ret);
-        }
-        break;
-#endif
-        case UNKNOWN: /* pass through */
-        default:
-            OIC_LOG(ERROR, TAG, "unknown application protocol. Ignore it");
-        break;
-    }
-}
-
 static void CAReceiveMessage(int fd)
 {
     CAResult_t res = CA_STATUS_OK;
 
+    oc_mutex_lock(g_mutexObjectList);
+
     //get remote device information from file descriptor.
     size_t index = 0;
-    CATCPSessionInfo_t *svritem = CAGetSessionInfoFromFD(fd, &index);
+    CATCPSessionInfo_t *svritem = CAGetSessionInfoFromFDAsOwner(fd, &index);
     if (!svritem)
     {
         OIC_LOG(ERROR, TAG, "there is no connection information in list");
+        oc_mutex_unlock(g_mutexObjectList);
         return;
     }
 
-    // read data
+    CASecureEndpoint_t peerEP = svritem->sep;
     int len = 0;
-
-    if (svritem->sep.endpoint.flags & CA_SECURE)
+    if (svritem->sep.endpoint.flags & CA_SECURE) // Secure connection
     {
         svritem->protocol = TLS;
 
@@ -741,12 +676,14 @@ static void CAReceiveMessage(int fd)
             //[3][4] bytes in tls header are tls payload length
             tlsLength = TLS_HEADER_SIZE +
                             (size_t)((svritem->tlsdata[3] << 8) | svritem->tlsdata[4]);
-            OIC_LOG_V(DEBUG, TAG, "toal tls length = %u", tlsLength);
-            if (tlsLength > sizeof(svritem->tlsdata))
+            OIC_LOG_V(DEBUG, TAG, "total tls length = %zd", tlsLength);
+            if (tlsLength > TLS_DATA_MAX_SIZE)
             {
-                OIC_LOG_V(ERROR, TAG, "toal tls length is too big (buffer size : %u)",
-                                    sizeof(svritem->tlsdata));
-                return CA_STATUS_FAILED;
+                OIC_LOG_V(ERROR, TAG, "total tls length is too big (buffer size : %u)",
+                                    TLS_DATA_MAX_SIZE);
+                oc_mutex_unlock(g_mutexObjectList);
+                CATCPDisconnectSession(&peerEP.endpoint);
+                return;
             }
             nbRead = tlsLength - svritem->tlsLen;
         }
@@ -760,30 +697,50 @@ static void CAReceiveMessage(int fd)
         else if (0 == len)
         {
             OIC_LOG(INFO, TAG, "Received disconnect from peer. Close connection");
+            svritem->state = DISCONNECTED;
             res = CA_DESTINATION_DISCONNECTED;
         }
         else
         {
             svritem->tlsLen += len;
-            OIC_LOG_V(DEBUG, TAG, "nb_read : %u bytes , recv() : %d bytes, svritem->tlsLen : %u bytes",
+            OIC_LOG_V(DEBUG, TAG, "nb_read : %zd bytes , recv() : %d bytes, svritem->tlsLen : %zd bytes",
                                 nbRead, len, svritem->tlsLen);
             if (tlsLength > 0 && tlsLength == svritem->tlsLen)
             {
-                //when successfully read data - pass them to callback.
-                res = CAdecryptSsl(&svritem->sep, (uint8_t *)svritem->tlsdata, svritem->tlsLen);
-                svritem->tlsLen = 0;
-                OIC_LOG_V(DEBUG, TAG, "%s: CAdecryptSsl returned %d", __func__, res);
+                // When successfully read data - pass them to callback.
+                // Dont invoke callback locking mutex
+                unsigned char *mesBuf = svritem->tlsdata;
+                size_t mesBufLen = svritem->tlsLen;
+                svritem->tlsdata = NULL;
+                oc_mutex_unlock(g_mutexObjectList);
+
+                res = CAdecryptSsl(&peerEP, (uint8_t *)mesBuf, mesBufLen);
+                OIC_LOG_V(INFO, TAG, "%s: CAdecryptSsl returned %d", __func__, res);
+
+                // Check for the svritem and reset buffer
+                oc_mutex_lock(g_mutexObjectList);
+                svritem = CAGetSessionInfoFromFDAsOwner(fd, &index);
+                if (svritem)
+                {
+                    svritem->tlsdata = mesBuf;
+                    svritem->tlsLen = 0;
+                }
+                else
+                {
+                    // svritem does not exist, thus free the message buffer
+                    OIC_LOG(ERROR, TAG, "svritem not found. Freeing message buffer!");
+                    OICFree(mesBuf);
+                }
             }
         }
 #endif
-
     }
-    else
+    else // Non-Secure connection
     {
-        unsigned char buffer[65535] = {0,}; // 65535 is the maximum size of ip packet
         svritem->protocol = COAP;
 
-        len = recv(fd, buffer, sizeof(buffer), 0);
+        // svritem->tlsdata can also be used as receiving buffer in case of raw tcp
+        len = recv(fd, svritem->tlsdata, TLS_DATA_MAX_SIZE, 0);
         if (len < 0)
         {
             OIC_LOG_V(ERROR, TAG, "recv failed %s", strerror(errno));
@@ -796,26 +753,40 @@ static void CAReceiveMessage(int fd)
         }
         else
         {
-            OIC_LOG_V(DEBUG, TAG, "recv() : %d bytes", len);
             //when successfully read data - pass them to callback.
+            OIC_LOG_V(DEBUG, TAG, "recv() : %d bytes", len);
             if (g_packetReceivedCallback)
             {
-                g_packetReceivedCallback(&svritem->sep, buffer, len);
+                // Dont invoke callback locking mutex
+                unsigned char *mesBuf = svritem->tlsdata;
+                svritem->tlsdata = NULL;
+                oc_mutex_unlock(g_mutexObjectList);
+
+                res = g_packetReceivedCallback(&peerEP, mesBuf, len);
+
+                // Check for the svritem and reset buffer
+                oc_mutex_lock(g_mutexObjectList);
+                svritem = CAGetSessionInfoFromFDAsOwner(fd, &index);
+                if (svritem)
+                {
+                    svritem->tlsdata = mesBuf;
+                    svritem->tlsLen = 0;
+                }
+                else
+                {
+                    // svritem does not exist, thus free the message buffer
+                    OIC_LOG(ERROR, TAG, "svritem not found. Freeing message buffer!");
+                    OICFree(mesBuf);
+                }
             }
         }
     }
 
-    //disconnect session and clean-up data if any error occurs
+    oc_mutex_unlock(g_mutexObjectList);
+
     if (res != CA_STATUS_OK)
     {
-#ifdef __WITH_TLS__
-        if (CA_STATUS_OK != CAcloseSslConnection(&svritem->sep.endpoint))
-        {
-            OIC_LOG(ERROR, TAG, "Failed to close TLS session");
-        }
-#endif
-        CASearchAndDeleteTCPSession(&(svritem->sep.endpoint));
-        return;
+        CATCPDisconnectSession(&peerEP.endpoint);
     }
 }
 
@@ -877,11 +848,26 @@ static CAResult_t CATCPConvertNameToAddr(int family, const char *host, uint16_t
     return CA_STATUS_OK;
 }
 
+#if defined(__TIZEN__)
+static int CAGetHTTPStatusCode(char * response) {
+    char *resp, *code_plus, *ptrSave;
+    int ret = -1;
+
+    resp = strdup(response);
+    strtok_r(resp, " ", &ptrSave);  /* skip HTTP version */
+    code_plus = strtok_r(NULL, " ", &ptrSave);
+
+    ret = code_plus ? atoi(code_plus) : -1;
+    free(resp);
+    return ret;
+}
+#endif
+
 static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
 {
     VERIFY_NON_NULL(svritem, TAG, "svritem is NULL");
 
-    OIC_LOG_V(DEBUG, TAG, "try to connect with [%s:%u]",
+    OIC_LOG_V(INFO, TAG, "try to connect with [%s:%u]",
               svritem->sep.endpoint.addr, svritem->sep.endpoint.port);
 
     // #1. create tcp socket.
@@ -923,10 +909,12 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
     if (connect(fd, (struct sockaddr *)&sa, socklen) < 0)
     {
         OIC_LOG_V(ERROR, TAG, "failed to connect socket, %s", strerror(errno));
+        CALogSendStateInfo(svritem->sep.endpoint.adapter, svritem->sep.endpoint.addr,
+                           svritem->sep.endpoint.port, 0, false, strerror(errno));
         return CA_SOCKET_OPERATION_FAILED;
     }
 
-    OIC_LOG(DEBUG, TAG, "connect socket success");
+    OIC_LOG(INFO, TAG, "connect socket success");
     svritem->state = CONNECTED;
     CHECKFD(svritem->fd);
     ssize_t len = CAWakeUpForReadFdsUpdate(svritem->sep.endpoint.addr);
@@ -935,6 +923,54 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
         OIC_LOG(ERROR, TAG, "wakeup receive thread failed");
         return CA_SOCKET_OPERATION_FAILED;
     }
+
+#if defined(__TIZEN__)
+    // #5. Send HTTP CONNECT to proxy if proxy
+
+    const char *cloud_address = CAGetCloudAddressForProxy();
+    OIC_LOG_V(INFO, TAG, "Proxy : '%s'", cloud_address ? cloud_address : "(nil)");
+
+    if(cloud_address && *cloud_address)
+    {
+        char message[4096];
+        int len = sprintf(message,
+                "CONNECT %s HTTP/1.1\r\n"
+                "Host: %s\r\n\r\n", cloud_address, cloud_address
+        );
+
+        ssize_t l = send(fd, message, len, 0);
+        if(l != len)
+	{
+            OIC_LOG_V(ERROR, TAG, "failed to send HTTP CONNECT data (expected %d bytes, ret %d)", len, l);
+            close(fd);
+            svritem->fd = -1;
+            return CA_SOCKET_OPERATION_FAILED;
+        }
+
+        // maybe this should be called in other thread, it causes bottleneck.
+        OIC_LOG_V(INFO, TAG, "Message sent is : '%s'\n", message);
+
+        *message = '\0';
+        OIC_LOG_V(INFO, TAG, "Receiving response to CONNECT from proxy...");
+
+        l = recv(fd, message, 4096, 0);
+
+        OIC_LOG_V(INFO, TAG, "Received data : '%s'", message);
+        OIC_LOG_V(INFO, TAG, "Received len = %d", l);
+
+        int status_code = CAGetHTTPStatusCode(message);
+
+        OIC_LOG_V(INFO, TAG, "HTTP status_code : %d", status_code);
+        if(status_code < 200 || status_code > 299)
+	{
+            OIC_LOG_V(ERROR, TAG, "Error, Wrong status code: %d", status_code);
+            close(fd);
+            svritem->fd = -1;
+            return CA_SOCKET_OPERATION_FAILED;
+        }
+    }
+#endif
+
     return CA_STATUS_OK;
 }
 
@@ -962,11 +998,14 @@ static CASocketFd_t CACreateAcceptSocket(int family, CASocket_t *sock)
     {
         // the socket is restricted to sending and receiving IPv6 packets only.
         int on = 1;
+//TODO: enable once IPv6 is supported
+#ifndef __TIZENRT__
         if (-1 == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)))
         {
             OIC_LOG_V(ERROR, TAG, "IPV6_V6ONLY failed: %s", strerror(errno));
             goto exit;
         }
+#endif
         ((struct sockaddr_in6 *)&server)->sin6_port = htons(sock->port);
         socklen = sizeof (struct sockaddr_in6);
     }
@@ -995,7 +1034,17 @@ static CASocketFd_t CACreateAcceptSocket(int family, CASocket_t *sock)
         goto exit;
     }
 
-    if (!sock->port)  // return the assigned port
+    if (sock->port) // use the given port
+    {
+        int on = 1;
+        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, OPTVAL_T(&on), sizeof (on)))
+        {
+            OIC_LOG_V(ERROR, TAG, "SO_REUSEADDR failed: %s", strerror(errno));
+            close(fd);
+            return OC_INVALID_SOCKET;
+        }
+    }
+    else  // return the assigned port
     {
         if (-1 == getsockname(fd, (struct sockaddr *)&server, &socklen))
         {
@@ -1020,6 +1069,20 @@ exit:
 static void CAInitializePipe(int *fds)
 {
     int ret = pipe(fds);
+// TODO: Remove temporary workaround once F_GETFD / F_SETFD support is in TizenRT
+/* Temporary workaround: By pass F_GETFD / F_SETFD */
+#ifdef __TIZENRT__
+    if (-1 == ret)
+    {
+        close(fds[1]);
+        close(fds[0]);
+
+        fds[0] = -1;
+        fds[1] = -1;
+
+        OIC_LOG_V(ERROR, TAG, "pipe failed: %s", strerror(errno));
+    }
+#else
     if (-1 != ret)
     {
         ret = fcntl(fds[0], F_GETFD);
@@ -1046,8 +1109,10 @@ static void CAInitializePipe(int *fds)
             OIC_LOG_V(ERROR, TAG, "pipe failed: %s", strerror(errno));
         }
     }
+#endif
 }
 
+#ifndef DISABLE_TCP_SERVER
 #define NEWSOCKET(FAMILY, NAME) \
     caglobals.tcp.NAME.fd = CACreateAcceptSocket(FAMILY, &caglobals.tcp.NAME); \
     if (caglobals.tcp.NAME.fd == -1) \
@@ -1057,14 +1122,48 @@ static void CAInitializePipe(int *fds)
     } \
     CHECKFD(caglobals.tcp.NAME.fd);
 
+void CATCPInitializeSocket()
+{
+#ifndef __WITH_TLS__
+        NEWSOCKET(AF_INET, ipv4);
+#else
+        NEWSOCKET(AF_INET, ipv4s);
+#endif
+
+//TODO Enable once TizenRT supports IPv6
+#ifndef __TIZENRT__
+#ifndef __WITH_TLS__
+        NEWSOCKET(AF_INET6, ipv6);
+#else
+        NEWSOCKET(AF_INET6, ipv6s);
+#endif
+#endif
+#ifndef __WITH_TLS__
+        OIC_LOG_V(DEBUG, TAG, "IPv4 socket fd=%d, port=%d",
+                  caglobals.tcp.ipv4.fd, caglobals.tcp.ipv4.port);
+        OIC_LOG_V(DEBUG, TAG, "IPv6 socket fd=%d, port=%d",
+                  caglobals.tcp.ipv6.fd, caglobals.tcp.ipv6.port);
+#else
+        OIC_LOG_V(DEBUG, TAG, "IPv4 secure socket fd=%d, port=%d",
+                  caglobals.tcp.ipv4s.fd, caglobals.tcp.ipv4s.port);
+        OIC_LOG_V(DEBUG, TAG, "IPv6 secure socket fd=%d, port=%d",
+                  caglobals.tcp.ipv6s.fd, caglobals.tcp.ipv6s.port);
+#endif
+}
+#endif // DISABLE_TCP_SERVER
+
 CAResult_t CATCPStartServer(const ca_thread_pool_t threadPool)
 {
+    oc_mutex_lock(g_mutexObjectList);
     if (caglobals.tcp.started)
     {
-        OIC_LOG(DEBUG, TAG, "Adapter is started already");
+        oc_mutex_unlock(g_mutexObjectList);
+        OIC_LOG(INFO, TAG, "Adapter is started already");
         return CA_STATUS_OK;
     }
 
+    g_threadPool = threadPool;
+
     if (!caglobals.tcp.ipv4tcpenabled)
     {
         caglobals.tcp.ipv4tcpenabled = true;    // only needed to run CA tests
@@ -1074,109 +1173,120 @@ CAResult_t CATCPStartServer(const ca_thread_pool_t threadPool)
         caglobals.tcp.ipv6tcpenabled = true;    // only needed to run CA tests
     }
 
-    CAResult_t res = CATCPCreateMutex();
-    if (CA_STATUS_OK == res)
-    {
-        res = CATCPCreateCond();
-    }
-    if (CA_STATUS_OK != res)
-    {
-        OIC_LOG(ERROR, TAG, "failed to create mutex/cond");
-        return res;
-    }
-
-    ca_mutex_lock(g_mutexObjectList);
+    caglobals.tcp.terminate = false;
     if (!caglobals.tcp.svrlist)
     {
         caglobals.tcp.svrlist = u_arraylist_create();
     }
-    ca_mutex_unlock(g_mutexObjectList);
 
+#ifndef DISABLE_TCP_SERVER
     if (caglobals.server)
     {
-        NEWSOCKET(AF_INET, ipv4);
-        NEWSOCKET(AF_INET, ipv4s);
-        NEWSOCKET(AF_INET6, ipv6);
-        NEWSOCKET(AF_INET6, ipv6s);
-        OIC_LOG_V(DEBUG, TAG, "IPv4 socket fd=%d, port=%d",
-                  caglobals.tcp.ipv4.fd, caglobals.tcp.ipv4.port);
-        OIC_LOG_V(DEBUG, TAG, "IPv4 secure socket fd=%d, port=%d",
-                  caglobals.tcp.ipv4s.fd, caglobals.tcp.ipv4s.port);
-        OIC_LOG_V(DEBUG, TAG, "IPv6 socket fd=%d, port=%d",
-                  caglobals.tcp.ipv6.fd, caglobals.tcp.ipv6.port);
-        OIC_LOG_V(DEBUG, TAG, "IPv6 secure socket fd=%d, port=%d",
-                  caglobals.tcp.ipv6s.fd, caglobals.tcp.ipv6s.port);
+        CATCPInitializeSocket();
     }
+#endif
 
+#ifndef __TIZENRT__
     // create pipe for fast shutdown
     CAInitializePipe(caglobals.tcp.shutdownFds);
     CHECKFD(caglobals.tcp.shutdownFds[0]);
     CHECKFD(caglobals.tcp.shutdownFds[1]);
-
+#endif
     // create pipe for connection event
     CAInitializePipe(caglobals.tcp.connectionFds);
     CHECKFD(caglobals.tcp.connectionFds[0]);
     CHECKFD(caglobals.tcp.connectionFds[1]);
 
-    caglobals.tcp.terminate = false;
-    res = ca_thread_pool_add_task(threadPool, CAReceiveHandler, NULL);
+    CAResult_t res = CA_STATUS_OK;
+#ifndef __TIZENRT__
+    res = ca_thread_pool_add_task(g_threadPool, CAReceiveHandler, NULL, NULL);
+#else
+    res = ca_thread_pool_add_task(g_threadPool, CAReceiveHandler, NULL, NULL,
+                                 "IoT_TCPReceive", CONFIG_IOTIVITY_TCPRECEIVE_PTHREAD_STACKSIZE);
+#endif
     if (CA_STATUS_OK != res)
     {
+        oc_mutex_unlock(g_mutexObjectList);
         OIC_LOG(ERROR, TAG, "thread_pool_add_task failed");
+        CATCPStopServer();
         return res;
     }
-    OIC_LOG(DEBUG, TAG, "CAReceiveHandler thread started successfully.");
 
     caglobals.tcp.started = true;
+    oc_mutex_unlock(g_mutexObjectList);
+
+    OIC_LOG(INFO, TAG, "CAReceiveHandler thread started successfully.");
     return CA_STATUS_OK;
 }
 
 void CATCPStopServer()
 {
+    oc_mutex_lock(g_mutexObjectList);
     if (caglobals.tcp.terminate)
     {
-        OIC_LOG(DEBUG, TAG, "Adapter is not enabled");
+        oc_mutex_unlock(g_mutexObjectList);
+        OIC_LOG(INFO, TAG, "Adapter is not enabled");
         return;
     }
 
-    // mutex lock
-    ca_mutex_lock(g_mutexObjectList);
-
     // set terminate flag.
     caglobals.tcp.terminate = true;
 
-    if (caglobals.tcp.shutdownFds[1] != -1)
-    {
-        close(caglobals.tcp.shutdownFds[1]);
-        caglobals.tcp.shutdownFds[1] = OC_INVALID_SOCKET;
-        // receive thread will stop immediately
-    }
-    if (caglobals.tcp.connectionFds[1] != -1)
+    oc_mutex_lock(g_mutexSend);
+    oc_cond_signal(g_condSend);
+    oc_mutex_unlock(g_mutexSend);
+
+#ifdef __TIZENRT__
+    if (caglobals.tcp.started)
     {
-        close(caglobals.tcp.connectionFds[1]);
-        caglobals.tcp.connectionFds[1] = OC_INVALID_SOCKET;
+        oc_cond_wait(g_condObjectList, g_mutexObjectList);
+        caglobals.tcp.started = false;
     }
+#endif
 
     // close accept socket.
+#ifndef __WITH_TLS__
     CLOSE_SOCKET(ipv4);
-    CLOSE_SOCKET(ipv4s);
     CLOSE_SOCKET(ipv6);
+#else
+    CLOSE_SOCKET(ipv4s);
     CLOSE_SOCKET(ipv6s);
+#endif
 
+    if (caglobals.tcp.connectionFds[1] != OC_INVALID_SOCKET)
+    {
+    	close(caglobals.tcp.connectionFds[1]);
+	caglobals.tcp.connectionFds[1] = OC_INVALID_SOCKET;
+    }
+    if (caglobals.tcp.connectionFds[0] != OC_INVALID_SOCKET)
+    {
+	close(caglobals.tcp.connectionFds[0]);
+	caglobals.tcp.connectionFds[0] = OC_INVALID_SOCKET;
+    }
+#ifndef __TIZENRT__
+    if (caglobals.tcp.shutdownFds[1] != OC_INVALID_SOCKET)
+    {
+        close(caglobals.tcp.shutdownFds[1]);
+        caglobals.tcp.shutdownFds[1] = OC_INVALID_SOCKET;
+        // receive thread will stop immediately
+    }
     if (caglobals.tcp.started)
     {
-        ca_cond_wait(g_condObjectList, g_mutexObjectList);
+        oc_cond_wait(g_condObjectList, g_mutexObjectList);
+        caglobals.tcp.started = false;
     }
-    caglobals.tcp.started = false;
-
-    // mutex unlock
-    ca_mutex_unlock(g_mutexObjectList);
+    if (caglobals.tcp.shutdownFds[0] != OC_INVALID_SOCKET)
+    {
+        close(caglobals.tcp.shutdownFds[0]);
+        caglobals.tcp.shutdownFds[0] = OC_INVALID_SOCKET;
+    }
+#endif
+    oc_mutex_unlock(g_mutexObjectList);
 
     CATCPDisconnectAll();
-    CATCPDestroyMutex();
-    CATCPDestroyCond();
+    sleep(1);
 
-    OIC_LOG(DEBUG, TAG, "Adapter terminated successfully");
+    OIC_LOG(INFO, TAG, "Adapter terminated successfully");
 }
 
 void CATCPSetPacketReceiveCallback(CATCPPacketReceivedCallback callback)
@@ -1200,6 +1310,7 @@ size_t CACheckPayloadLengthFromHeader(const void *data, size_t dlen)
     if (!pdu)
     {
         OIC_LOG(ERROR, TAG, "outpdu is null");
+        OIC_LOG_V(ERROR, TAG, "data length: %zu", dlen);
         return 0;
     }
 
@@ -1245,18 +1356,50 @@ static ssize_t sendData(const CAEndpoint_t *endpoint, const void *data,
 
     // #2. send data to remote device.
     ssize_t remainLen = dlen;
+    unsigned int sendRetryTime = 1;
     do
     {
-        ssize_t len = send(sockFd, data, remainLen, 0);
+#ifdef MSG_NOSIGNAL
+        ssize_t len = send(sockFd, data, remainLen, MSG_DONTWAIT | MSG_NOSIGNAL);
+#else
+        ssize_t len = send(sockFd, data, remainLen, MSG_DONTWAIT);
+#endif
         if (-1 == len)
         {
-            if (EWOULDBLOCK != errno)
+            if (EWOULDBLOCK != errno && EAGAIN != errno)
             {
                 OIC_LOG_V(ERROR, TAG, "unicast ipv4tcp sendTo failed: %s", strerror(errno));
+                CALogSendStateInfo(endpoint->adapter, endpoint->addr, endpoint->port,
+                                   len, false, strerror(errno));
+                return len;
+            }
+
+            // re-trying send after 10, 20, 40, 80, 160 and 320 milliseconds
+            if (sendRetryTime > 32)
+            {
+                return len;
+            }
+
+            unsigned int waitTime = sendRetryTime * 10 * MILLISECONDS_PER_SECOND;
+            OIC_LOG_V(WARNING, TAG, "send blocked. trying send after %u microseconds", waitTime);
+
+            oc_mutex_lock(g_mutexSend);
+            oc_cond_wait_for(g_condSend, g_mutexSend, waitTime);
+            oc_mutex_unlock(g_mutexSend);
+
+            oc_mutex_lock(g_mutexObjectList);
+            if (caglobals.tcp.terminate)
+            {
+                oc_mutex_unlock(g_mutexObjectList);
                 return len;
             }
+            oc_mutex_unlock(g_mutexObjectList);
+
+            sendRetryTime = (sendRetryTime << 1);
+
             continue;
         }
+        sendRetryTime = 1;
         data += len;
         remainLen -= len;
     } while (remainLen > 0);
@@ -1265,6 +1408,8 @@ static ssize_t sendData(const CAEndpoint_t *endpoint, const void *data,
     (void)fam;
 #endif
     OIC_LOG_V(INFO, TAG, "unicast %stcp sendTo is successful: %zu bytes", fam, dlen);
+    CALogSendStateInfo(endpoint->adapter, endpoint->addr, endpoint->port,
+                       dlen, true, NULL);
     return dlen;
 }
 
@@ -1311,9 +1456,19 @@ CASocketFd_t CAConnectTCPSession(const CAEndpoint_t *endpoint)
     svritem->sep.endpoint.flags = endpoint->flags;
     svritem->sep.endpoint.ifindex = endpoint->ifindex;
     svritem->state = CONNECTING;
+    svritem->isClient = true;
+
+    // Allocate message buffer
+    svritem->tlsdata = (unsigned char*) OICCalloc(TLS_DATA_MAX_SIZE, sizeof(unsigned char));
+    if (!svritem->tlsdata)
+    {
+        OIC_LOG(ERROR, TAG, "Out of memory");
+        OICFree(svritem);
+        return OC_INVALID_SOCKET;
+    }
 
     // #2. add TCP connection info to list
-    ca_mutex_lock(g_mutexObjectList);
+    oc_mutex_lock(g_mutexObjectList);
     if (caglobals.tcp.svrlist)
     {
         bool res = u_arraylist_add(caglobals.tcp.svrlist, svritem);
@@ -1321,12 +1476,13 @@ CASocketFd_t CAConnectTCPSession(const CAEndpoint_t *endpoint)
         {
             OIC_LOG(ERROR, TAG, "u_arraylist_add failed.");
             close(svritem->fd);
+            OICFree(svritem->tlsdata);
             OICFree(svritem);
-            ca_mutex_unlock(g_mutexObjectList);
+            oc_mutex_unlock(g_mutexObjectList);
             return OC_INVALID_SOCKET;
         }
     }
-    ca_mutex_unlock(g_mutexObjectList);
+    oc_mutex_unlock(g_mutexObjectList);
 
     // #3. create the socket and connect to TCP server
     int family = (svritem->sep.endpoint.flags & CA_IPV6) ? AF_INET6 : AF_INET;
@@ -1338,7 +1494,7 @@ CASocketFd_t CAConnectTCPSession(const CAEndpoint_t *endpoint)
     // #4. pass the connection information to CA Common Layer.
     if (g_connectionCallback)
     {
-        g_connectionCallback(&(svritem->sep.endpoint), true);
+        g_connectionCallback(&(svritem->sep.endpoint), true, svritem->isClient);
     }
 
     return svritem->fd;
@@ -1365,22 +1521,35 @@ CAResult_t CADisconnectTCPSession(size_t index)
         // pass the connection information to CA Common Layer.
         if (g_connectionCallback && DISCONNECTED == removedData->state)
         {
-            g_connectionCallback(&(removedData->sep.endpoint), false);
+            g_connectionCallback(&(removedData->sep.endpoint), false, removedData->isClient);
         }
     }
     OICFree(removedData->data);
     removedData->data = NULL;
 
+    OICFree(removedData->tlsdata);
+    removedData->tlsdata = NULL;
+
     OICFree(removedData);
     removedData = NULL;
 
     OIC_LOG(DEBUG, TAG, "data is removed from session list");
+
+#ifndef DISABLE_TCP_SERVER
+    if (caglobals.server && MAX_CONNECTION_COUNTS == u_arraylist_length(caglobals.tcp.svrlist) + 1)
+    {
+        CATCPInitializeSocket();
+    }
+#endif
+
     return CA_STATUS_OK;
 }
 
 void CATCPDisconnectAll()
 {
-    ca_mutex_lock(g_mutexObjectList);
+    OIC_LOG(DEBUG, TAG, "IN - CATCPDisconnectAll");
+
+    oc_mutex_lock(g_mutexObjectList);
 
     uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
     for (ssize_t index = length; index > 0; index--)
@@ -1392,12 +1561,13 @@ void CATCPDisconnectAll()
     u_arraylist_destroy(caglobals.tcp.svrlist);
     caglobals.tcp.svrlist = NULL;
 
-    ca_mutex_unlock(g_mutexObjectList);
+    oc_mutex_unlock(g_mutexObjectList);
 
 #ifdef __WITH_TLS__
-    CAcloseSslConnectionAll();
+    CAcloseSslConnectionAll(CA_ADAPTER_TCP);
 #endif
 
+    OIC_LOG(DEBUG, TAG, "OUT - CATCPDisconnectAll");
 }
 
 CATCPSessionInfo_t *CAGetTCPSessionInfoFromEndpoint(const CAEndpoint_t *endpoint, size_t *index)
@@ -1440,7 +1610,7 @@ CASocketFd_t CAGetSocketFDFromEndpoint(const CAEndpoint_t *endpoint)
     OIC_LOG_V(DEBUG, TAG, "Looking for [%s:%d]", endpoint->addr, endpoint->port);
 
     // get connection info from list.
-    ca_mutex_lock(g_mutexObjectList);
+    oc_mutex_lock(g_mutexObjectList);
     uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
     for (size_t i = 0; i < length; i++)
     {
@@ -1456,20 +1626,19 @@ CASocketFd_t CAGetSocketFDFromEndpoint(const CAEndpoint_t *endpoint)
                 && (svritem->sep.endpoint.port == endpoint->port)
                 && (svritem->sep.endpoint.flags & endpoint->flags))
         {
-            ca_mutex_unlock(g_mutexObjectList);
+            oc_mutex_unlock(g_mutexObjectList);
             OIC_LOG(DEBUG, TAG, "Found in session list");
             return svritem->fd;
         }
     }
 
-    ca_mutex_unlock(g_mutexObjectList);
+    oc_mutex_unlock(g_mutexObjectList);
     OIC_LOG(DEBUG, TAG, "Session not found");
     return OC_INVALID_SOCKET;
 }
 
 CATCPSessionInfo_t *CAGetSessionInfoFromFD(int fd, size_t *index)
 {
-    ca_mutex_lock(g_mutexObjectList);
 
     // check from the last item.
     CATCPSessionInfo_t *svritem = NULL;
@@ -1481,19 +1650,36 @@ CATCPSessionInfo_t *CAGetSessionInfoFromFD(int fd, size_t *index)
         if (svritem && svritem->fd == fd)
         {
             *index = i;
-            ca_mutex_unlock(g_mutexObjectList);
+            oc_mutex_unlock(g_mutexObjectList);
             return svritem;
         }
     }
 
-    ca_mutex_unlock(g_mutexObjectList);
+
+    return NULL;
+}
+
+static CATCPSessionInfo_t *CAGetSessionInfoFromFDAsOwner(int fd, size_t *index)
+{
+    CATCPSessionInfo_t *svritem = NULL;
+    uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
+    for (size_t i = 0; i < length; i++)
+    {
+        svritem = (CATCPSessionInfo_t *) u_arraylist_get(caglobals.tcp.svrlist, i);
+
+        if (svritem && svritem->fd == fd)
+        {
+            *index = i;
+            return svritem;
+        }
+    }
 
     return NULL;
 }
 
 CAResult_t CASearchAndDeleteTCPSession(const CAEndpoint_t *endpoint)
 {
-    ca_mutex_lock(g_mutexObjectList);
+    oc_mutex_lock(g_mutexObjectList);
 
     CAResult_t result = CA_STATUS_OK;
     size_t index = 0;
@@ -1507,10 +1693,41 @@ CAResult_t CASearchAndDeleteTCPSession(const CAEndpoint_t *endpoint)
         }
     }
 
-    ca_mutex_unlock(g_mutexObjectList);
+    oc_mutex_unlock(g_mutexObjectList);
     return result;
 }
 
+void CATCPCloseInProgressConnections()
+{
+    OIC_LOG(INFO, TAG, "IN - CATCPCloseInProgressConnections");
+
+    oc_mutex_lock(g_mutexObjectList);
+
+    uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
+    for (size_t index = 0; index < length; index++)
+    {
+        CATCPSessionInfo_t *svritem = (CATCPSessionInfo_t *) u_arraylist_get(
+                caglobals.tcp.svrlist, index);
+        if (!svritem)
+        {
+            continue;
+        }
+
+        // Session which are connecting state
+        if (svritem->fd >= 0 && svritem->state == CONNECTING)
+        {
+            shutdown(svritem->fd, SHUT_RDWR);
+            close(svritem->fd);
+            svritem->fd = -1;
+            svritem->state = DISCONNECTED;
+        }
+    }
+
+    oc_mutex_unlock(g_mutexObjectList);
+
+    OIC_LOG(INFO, TAG, "OUT - CATCPCloseInProgressConnections");
+}
+
 size_t CAGetTotalLengthFromHeader(const unsigned char *recvBuffer)
 {
     OIC_LOG(DEBUG, TAG, "IN - CAGetTotalLengthFromHeader");
@@ -1533,4 +1750,3 @@ void CATCPSetErrorHandler(CATCPErrorHandleCallback errorHandleCallback)
 {
     g_tcpErrorHandler = errorHandleCallback;
 }
-