X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Ftcp_adapter%2Fcatcpadapter.c;h=ea55c74b397474618b75ed3b97759b0cad233208;hb=03ae7cd73e2e10a8de75da40a0e476cc955b46b2;hp=1b5e0f5f7d990aebb646cd5b4bba01e20bf25f20;hpb=8031c99214e4213a202edef846de68ad5f080fa0;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c index 1b5e0f5..ea55c74 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c @@ -29,16 +29,19 @@ #include #include "cainterface.h" +#include "caipnwmonitor.h" #include "catcpadapter.h" #include "catcpinterface.h" #include "caqueueingthread.h" #include "caadapterutils.h" -#include "camutex.h" +#include "octhread.h" #include "uarraylist.h" #include "caremotehandler.h" #include "logger.h" #include "oic_malloc.h" -#include "oic_string.h" +#ifdef __WITH_TLS__ +#include "ca_adapter_net_ssl.h" +#endif /** * Logging tag for module name. @@ -61,6 +64,16 @@ typedef struct #define CA_TCP_SELECT_TIMEOUT 10 /** + * Mutex to synchronize TCP adapter access. + */ +static oc_mutex g_mutexAdapter = NULL; + +/** + * State to control closing of TCP servers on interface down event. + */ +static bool g_skipCloseOnIFDown; + +/** * Queue handle for Send Data. */ static CAQueueingThread_t *g_sendQueueHandle = NULL; @@ -85,17 +98,20 @@ static CAConnectionChangeCallback g_connectionChangeCallback = NULL; */ static CAErrorHandleCallback g_errorCallback = NULL; -static void CATCPPacketReceivedCB(const CASecureEndpoint_t *sep, - const void *data, uint32_t dataLength); - /** * KeepAlive Connected or Disconnected Callback to CA adapter. */ static CAKeepAliveConnectionCallback g_connKeepAliveCallback = NULL; +static CAResult_t CATCPPacketReceivedCB(const CASecureEndpoint_t *sep, + const void *data, uint32_t dataLength); + +static void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data, + size_t dataLength, CAResult_t result); + static CAResult_t CATCPInitializeQueueHandles(); -static void CATCPDeinitializeQueueHandles(); +static void CATCPDeinitializeQueueHandles(CAQueueingThread_t *queueHandle); static void CATCPSendDataThread(void *threadData); @@ -136,11 +152,10 @@ CAResult_t CATCPInitializeQueueHandles() return CA_STATUS_OK; } -void CATCPDeinitializeQueueHandles() +void CATCPDeinitializeQueueHandles(CAQueueingThread_t *queueHandle) { - CAQueueingThreadDestroy(g_sendQueueHandle); - OICFree(g_sendQueueHandle); - g_sendQueueHandle = NULL; + CAQueueingThreadDestroy(queueHandle); + OICFree(queueHandle); } void CATCPConnectionStateCB(const char *ipAddress, CANetworkStatus_t status) @@ -149,22 +164,94 @@ void CATCPConnectionStateCB(const char *ipAddress, CANetworkStatus_t status) (void)status; } -void CATCPPacketReceivedCB(const CASecureEndpoint_t *sep, const void *data, - uint32_t dataLength) +CAResult_t CATCPPacketReceivedCB(const CASecureEndpoint_t *sep, const void *data, + uint32_t dataLength) { - VERIFY_NON_NULL_VOID(sep, TAG, "sep is NULL"); - VERIFY_NON_NULL_VOID(data, TAG, "data is NULL"); + VERIFY_NON_NULL(sep, TAG, "sep is NULL"); + VERIFY_NON_NULL(data, TAG, "data is NULL"); OIC_LOG_V(DEBUG, TAG, "Address: %s, port:%d", sep->endpoint.addr, sep->endpoint.port); + CAResult_t res = CA_STATUS_OK; +#ifdef SINGLE_THREAD if (g_networkPacketCallback) { - g_networkPacketCallback(sep, data, dataLength); + res = g_networkPacketCallback(sep, data, dataLength); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "Error parsing CoAP data"); + } + } +#else + unsigned char *buffer = (unsigned char*)data; + size_t bufferLen = dataLength; + size_t index = 0; + + //get remote device information from file descriptor. + CATCPSessionInfo_t *svritem = CAGetTCPSessionInfoFromEndpoint(&sep->endpoint, &index); + if (!svritem) + { + OIC_LOG(ERROR, TAG, "there is no connection information in list"); + return CA_STATUS_INVALID_PARAM; + } + if (UNKNOWN == svritem->protocol) + { + OIC_LOG(ERROR, TAG, "invalid protocol type"); + return CA_STATUS_INVALID_PARAM; + } + + //totalLen filled only when header fully read and parsed + while (0 != bufferLen) + { + res = CAConstructCoAP(svritem, &buffer, &bufferLen); + if (CA_STATUS_OK != res) + { + OIC_LOG_V(ERROR, TAG, "CAConstructCoAP return error : %d", res); + return res; + } + + //when successfully read all required data - pass them to upper layer. + if (svritem->len == svritem->totalLen) + { + if (g_networkPacketCallback) + { + res = g_networkPacketCallback(sep, svritem->data, svritem->totalLen); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "Error parsing CoAP data"); + return res; + } + } + CACleanData(svritem); + } + else + { + OIC_LOG_V(DEBUG, TAG, "%zd bytes required for complete CoAP", + svritem->totalLen - svritem->len); + } } +#endif + return res; } -void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data, - uint32_t dataLength, CAResult_t result) +#ifdef __WITH_TLS__ +static ssize_t CATCPPacketSendCB(CAEndpoint_t *endpoint, const void *data, size_t dataLength) +{ + OIC_LOG_V(DEBUG, TAG, "In %s", __func__); + VERIFY_NON_NULL_RET(endpoint, TAG, "endpoint is NULL", -1); + VERIFY_NON_NULL_RET(data, TAG, "data is NULL", -1); + + OIC_LOG_V(DEBUG, TAG, "Address: %s, port:%d", endpoint->addr, endpoint->port); + OIC_LOG_BUFFER(DEBUG, TAG, data, dataLength); + + ssize_t ret = CATCPSendData(endpoint, data, dataLength); + OIC_LOG_V(DEBUG, TAG, "Out %s : %zd bytes sent", __func__, ret); + return ret; +} +#endif + +static void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data, + size_t dataLength, CAResult_t result) { VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint is NULL"); VERIFY_NON_NULL_VOID(data, TAG, "data is NULL"); @@ -175,22 +262,18 @@ void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data, } } -static void CATCPConnectionHandler(const char *addr, uint16_t port, bool isConnected) +static void CATCPConnectionHandler(const CAEndpoint_t *endpoint, bool isConnected, bool isClient) { - CAEndpoint_t endpoint = { .adapter = CA_ADAPTER_TCP, - .port = port }; - OICStrcpy(endpoint.addr, sizeof(endpoint.addr), addr); - // Pass the changed connection status to RI Layer for keepalive. if (g_connKeepAliveCallback) { - g_connKeepAliveCallback(&endpoint, isConnected); + g_connKeepAliveCallback(endpoint, isConnected, isClient); } // Pass the changed connection status to CAUtil. if (g_connectionChangeCallback) { - g_connectionChangeCallback(&endpoint, isConnected); + g_connectionChangeCallback(endpoint, isConnected); } } @@ -199,10 +282,64 @@ void CATCPSetKeepAliveCallbacks(CAKeepAliveConnectionCallback ConnHandler) g_connKeepAliveCallback = ConnHandler; } +void CATCPAdapterHandler(CATransportAdapter_t adapter, CANetworkStatus_t status) +{ + if (g_networkChangeCallback) + { + g_networkChangeCallback(adapter, status); + } + + if (CA_INTERFACE_DOWN == status) + { + OIC_LOG(INFO, TAG, "Network status is down, close all session"); + + CAResult_t res = CAQueueingThreadClearData(g_sendQueueHandle); + if (res != CA_STATUS_OK) + { + OIC_LOG_V(ERROR, TAG, "CAQueueingThreadClearData failed[%d]", res); + } + + oc_mutex_lock(g_mutexAdapter); + if (!g_skipCloseOnIFDown) + { + CATCPStopServer(); + } + else + { + OIC_LOG(INFO, TAG, "Skip closing servers!"); + } + oc_mutex_unlock(g_mutexAdapter); + } + else if (CA_INTERFACE_UP == status) + { + OIC_LOG(INFO, TAG, "Network status is up, create new socket for listening"); + + CAResult_t ret = CA_STATUS_FAILED; +#ifndef SINGLE_THREAD + ret = CATCPStartServer((const ca_thread_pool_t)caglobals.tcp.threadpool); +#else + ret = CATCPStartServer(); +#endif + if (CA_STATUS_OK != ret) + { + OIC_LOG_V(ERROR, TAG, "CATCPStartServer failed[%d]", ret); + } + } +} + static void CAInitializeTCPGlobals() { caglobals.tcp.ipv4.fd = -1; + caglobals.tcp.ipv4s.fd = -1; caglobals.tcp.ipv6.fd = -1; + caglobals.tcp.ipv6s.fd = -1; + + // Set the port number received from application. + caglobals.tcp.ipv4.port = caglobals.ports.tcp.u4; + caglobals.tcp.ipv4s.port = caglobals.ports.tcp.u4s; + caglobals.tcp.ipv6.port = caglobals.ports.tcp.u6; + caglobals.tcp.ipv6s.port = caglobals.ports.tcp.u6s; + caglobals.tcp.selectTimeout = CA_TCP_SELECT_TIMEOUT; caglobals.tcp.listenBacklog = CA_TCP_LISTEN_BACKLOG; caglobals.tcp.svrlist = NULL; @@ -212,10 +349,13 @@ static void CAInitializeTCPGlobals() { flags |= caglobals.clientFlags; } + +#ifndef DISABLE_TCP_SERVER if (caglobals.server) { flags |= caglobals.serverFlags; } +#endif caglobals.tcp.ipv4tcpenabled = flags & CA_IPV4; caglobals.tcp.ipv6tcpenabled = flags & CA_IPV6; @@ -241,6 +381,48 @@ CAResult_t CAInitializeTCP(CARegisterConnectivityCallback registerCallback, g_errorCallback = errorCallback; CAInitializeTCPGlobals(); + + // Create Mutex for synchronize access at adapter level + if (!g_mutexAdapter) + { + g_mutexAdapter = oc_mutex_new(); + if (!g_mutexAdapter) + { + OIC_LOG(ERROR, TAG, "Failed to create mutex!"); + return CA_STATUS_FAILED; + } + } + + g_skipCloseOnIFDown = false; + + 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"); + CATCPDestroyMutex(); + CATCPDestroyCond(); + return res; + } + + res = CATCPCreateSendMutex(); + if (CA_STATUS_OK == res) + { + res = CATCPCreateSendCond(); + } + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to create send data mutex/cond"); + CATCPDestroyMutex(); + CATCPDestroyCond(); + CATCPDestroySendMutex(); + CATCPDestroySendCond(); + return res; + } + #ifndef SINGLE_THREAD caglobals.tcp.threadpool = handle; #endif @@ -249,6 +431,10 @@ CAResult_t CAInitializeTCP(CARegisterConnectivityCallback registerCallback, CATCPSetPacketReceiveCallback(CATCPPacketReceivedCB); CATCPSetErrorHandler(CATCPErrorHandler); +#ifdef __WITH_TLS__ + CAsetSslAdapterCallbacks(CATCPPacketReceivedCB, CATCPPacketSendCB, CA_ADAPTER_TCP); +#endif + CAConnectivityHandler_t tcpHandler = { .startAdapter = CAStartTCP, .startListenServer = CAStartTCPListeningServer, @@ -272,10 +458,6 @@ CAResult_t CAStartTCP() { OIC_LOG(DEBUG, TAG, "IN"); - // Specific the port number received from application. - caglobals.tcp.ipv4.port = caglobals.ports.tcp.u4; - caglobals.tcp.ipv6.port = caglobals.ports.tcp.u6; - #ifndef SINGLE_THREAD if (CA_STATUS_OK != CATCPInitializeQueueHandles()) { @@ -285,12 +467,15 @@ CAResult_t CAStartTCP() } // Start send queue thread +#ifndef __TIZENRT__ if (CA_STATUS_OK != CAQueueingThreadStart(g_sendQueueHandle)) +#else + if (CA_STATUS_OK != CAQueueingThreadStart(g_sendQueueHandle, "IoT_TCPSendQueue")) +#endif { OIC_LOG(ERROR, TAG, "Failed to Start Send Data Thread"); return CA_STATUS_FAILED; } - #else CAResult_t ret = CATCPStartServer(); if (CA_STATUS_OK != ret) @@ -300,12 +485,72 @@ CAResult_t CAStartTCP() } #endif + // Start network monitoring to receive adapter status changes. + CAIPStartNetworkMonitor(CATCPAdapterHandler, CA_ADAPTER_TCP); + return CA_STATUS_OK; } +static bool CAClearQueueEndpointDataContext(void *data, uint32_t size, void *ctx) +{ + (void)size; + + if (NULL == data || NULL == ctx) + { + return false; + } + + CATCPData *tcpData = (CATCPData *)data; + CAEndpoint_t *endpoint = (CAEndpoint_t *)ctx; + + if (NULL != tcpData && NULL != tcpData->remoteEndpoint) + { + if (strcmp(tcpData->remoteEndpoint->addr, endpoint->addr) == 0 + && tcpData->remoteEndpoint->port == endpoint->port) + { + return true; + } + } + return false; +} + +CAResult_t CATCPDisconnectSession(const CAEndpoint_t *endpoint) +{ + CAResult_t res = CAQueueingThreadClearContextData(g_sendQueueHandle, + CAClearQueueEndpointDataContext, + endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to clear context data"); + } + +#ifdef __WITH_TLS__ + res = CAcloseSslConnection(endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to close TLS session"); + } +#endif + + res = CASearchAndDeleteTCPSession(endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to close TCP session"); + } + + return res; +} + +void CATCPSkipCloseOnInterfaceDown(bool state) +{ + oc_mutex_lock(g_mutexAdapter); + g_skipCloseOnIFDown = state; + oc_mutex_unlock(g_mutexAdapter); +} + CAResult_t CAStartTCPListeningServer() { -#ifndef SINGLE_THREAD +#if !defined(SINGLE_THREAD) && !defined(DISABLE_TCP_SERVER) if (!caglobals.server) { caglobals.server = true; // only needed to run CA tests @@ -372,21 +617,29 @@ static size_t CAQueueTCPData(bool isMulticast, const CAEndpoint_t *endpoint, } int32_t CASendTCPUnicastData(const CAEndpoint_t *endpoint, - const void *data, uint32_t dataLength) + const void *data, uint32_t dataLength, + CADataType_t dataType) { OIC_LOG(DEBUG, TAG, "IN"); + (void)dataType; #ifndef SINGLE_THREAD return CAQueueTCPData(false, endpoint, data, dataLength); #else - CATCPSendData(endpoint, data, dataLength, false); - return dataLength; + return CATCPSendData(endpoint, data, dataLength); #endif } int32_t CASendTCPMulticastData(const CAEndpoint_t *endpoint, - const void *data, uint32_t dataLength) + const void *data, uint32_t dataLength, + CADataType_t dataType) { - return CAQueueTCPData(true, endpoint, data, dataLength); + (void)endpoint; + (void)data; + (void)dataLength; + (void)dataType; + + OIC_LOG(ERROR, TAG, "TCP adapter does not support multicast sending!"); + return 0; } CAResult_t CAReadTCPData() @@ -400,16 +653,35 @@ CAResult_t CAReadTCPData() CAResult_t CAStopTCP() { + CAIPStopNetworkMonitor(CA_ADAPTER_TCP); + + /* Some times send queue thread fails to terminate as it's worker + thread gets blocked at TCP session's socket connect operation. + So closing sockets which are in connect operation at the time + of termination of adapter would save send queue thread from + getting blocked. */ + CATCPCloseInProgressConnections(); + #ifndef SINGLE_THREAD - if (g_sendQueueHandle && g_sendQueueHandle->threadMutex) + // Stop send queue thread. + if (g_sendQueueHandle != NULL) { - CAQueueingThreadStop(g_sendQueueHandle); + // g_sendQueueHandle is set to NULL to prevent new requests from being enqueued. + CAQueueingThread_t *queueHandle = g_sendQueueHandle; + g_sendQueueHandle = NULL; + + if (queueHandle->threadMutex) + { + CAQueueingThreadStop(queueHandle); + } + CATCPDeinitializeQueueHandles(queueHandle); } #endif + // Close TCP servers and established connections. CATCPStopServer(); - //Re-initializing the Globals to start them again + // Re-initializing the Globals to start them again. CAInitializeTCPGlobals(); return CA_STATUS_OK; @@ -419,9 +691,20 @@ void CATerminateTCP() { CATCPSetPacketReceiveCallback(NULL); -#ifndef SINGLE_THREAD - CATCPDeinitializeQueueHandles(); -#endif + CATCPDestroyMutex(); + CATCPDestroyCond(); + + CATCPDestroySendMutex(); + CATCPDestroySendCond(); + + g_skipCloseOnIFDown = false; + + // Free adapter mutex + if (g_mutexAdapter) + { + oc_mutex_free(g_mutexAdapter); + g_mutexAdapter = NULL; + } } void CATCPSendDataThread(void *threadData) @@ -433,6 +716,14 @@ void CATCPSendDataThread(void *threadData) return; } + if (caglobals.tcp.terminate) + { + OIC_LOG(DEBUG, TAG, "Adapter is not enabled"); + CATCPErrorHandler(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen, + CA_SEND_FAILED); + return; + } + if (tcpData->isMulticast) { //Processing for sending multicast @@ -441,8 +732,34 @@ void CATCPSendDataThread(void *threadData) } else { +#ifdef __WITH_TLS__ + if (tcpData->remoteEndpoint && tcpData->remoteEndpoint->flags & CA_SECURE) + { + CAResult_t result = CA_STATUS_OK; + OIC_LOG(DEBUG, TAG, "CAencryptSsl called!"); + result = CAencryptSsl(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen); + + if (CA_STATUS_OK != result) + { + OIC_LOG(ERROR, TAG, "CAAdapterNetDtlsEncrypt failed!"); + CASearchAndDeleteTCPSession(tcpData->remoteEndpoint); + CATCPErrorHandler(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen, + CA_SEND_FAILED); + } + OIC_LOG_V(DEBUG, TAG, + "CAAdapterNetDtlsEncrypt returned with result[%d]", result); + return; + } +#endif //Processing for sending unicast - CATCPSendData(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen, false); + ssize_t dlen = CATCPSendData(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen); + if (-1 == dlen) + { + OIC_LOG(ERROR, TAG, "CATCPSendData failed"); + CASearchAndDeleteTCPSession(tcpData->remoteEndpoint); + CATCPErrorHandler(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen, + CA_SEND_FAILED); + } } } @@ -489,7 +806,9 @@ void CADataDestroyer(void *data, uint32_t size) { if (size < sizeof(CATCPData)) { +#ifndef __TIZENRT__ OIC_LOG_V(ERROR, TAG, "Destroy data too small %p %" PRIu32, data, size); +#endif } CATCPData *TCPData = (CATCPData *) data; @@ -507,7 +826,7 @@ size_t CAGetTotalLengthFromPacketHeader(const unsigned char *recvBuffer, size_t return 0; } - coap_transport_type transport = coap_get_tcp_header_type_from_initbyte( + coap_transport_t transport = coap_get_tcp_header_type_from_initbyte( ((unsigned char *)recvBuffer)[0] >> 4); size_t optPaylaodLen = coap_get_length_from_header((unsigned char *)recvBuffer, transport); @@ -521,7 +840,7 @@ size_t CAGetTotalLengthFromPacketHeader(const unsigned char *recvBuffer, size_t return headerLen + optPaylaodLen; } -void CAGetTCPHeaderDetails(unsigned char* recvBuffer, coap_transport_type *transport, +void CAGetTCPHeaderDetails(unsigned char* recvBuffer, coap_transport_t *transport, size_t *headerlen) { if (NULL == recvBuffer)