X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Ftcp_adapter%2Fcatcpadapter.c;h=ac6f6d71b355c909b63851dc74d7a1c11b72a636;hb=6018efac19eee094d340d353673df673ad4f1c4e;hp=cec1f42df962c0bf5e7249fed0044b86b1b99091;hpb=bf72b57c4f5711f045c34288566c078ef72df990;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 cec1f42..ac6f6d7 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c @@ -29,17 +29,18 @@ #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" #ifdef __WITH_TLS__ -#include "ca_adapter_net_tls.h" +#include "ca_adapter_net_ssl.h" #endif /** @@ -87,14 +88,17 @@ 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(); @@ -151,37 +155,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, "%u bytes required for complete CoAP", + svritem->totalLen - svritem->len); + } + } +#endif + return res; } #ifdef __WITH_TLS__ -static void CATCPPacketSendCB(CAEndpoint_t *endpoint, const void *data, uint32_t dataLength) +static ssize_t CATCPPacketSendCB(CAEndpoint_t *endpoint, const void *data, size_t dataLength) { OIC_LOG_V(DEBUG, TAG, "In %s", __func__); - VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint is NULL"); - VERIFY_NON_NULL_VOID(data, TAG, "data is NULL"); + 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); - CATCPSendData(endpoint, data, dataLength, false); - OIC_LOG_V(DEBUG, TAG, "Out %s", __func__); + ssize_t ret = CATCPSendData(endpoint, data, dataLength); + OIC_LOG_V(DEBUG, TAG, "Out %s : %d bytes sent", __func__, ret); + return ret; } #endif -void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data, - uint32_t dataLength, CAResult_t result) +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"); @@ -192,12 +253,12 @@ void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data, } } -static void CATCPConnectionHandler(const CAEndpoint_t *endpoint, bool isConnected) +static void CATCPConnectionHandler(const CAEndpoint_t *endpoint, bool isConnected, bool isClient) { // 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. @@ -212,10 +273,55 @@ 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); + } + + CATCPStopServer(); + } + 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; @@ -254,6 +360,20 @@ CAResult_t CAInitializeTCP(CARegisterConnectivityCallback registerCallback, g_errorCallback = errorCallback; CAInitializeTCPGlobals(); + + 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; + } + #ifndef SINGLE_THREAD caglobals.tcp.threadpool = handle; #endif @@ -263,8 +383,7 @@ CAResult_t CAInitializeTCP(CARegisterConnectivityCallback registerCallback, CATCPSetErrorHandler(CATCPErrorHandler); #ifdef __WITH_TLS__ - CAinitTlsAdapter(); - CAsetTlsAdapterCallbacks(CATCPPacketReceivedCB, CATCPPacketSendCB, 0); + CAsetSslAdapterCallbacks(CATCPPacketReceivedCB, CATCPPacketSendCB, CA_ADAPTER_TCP); #endif CAConnectivityHandler_t tcpHandler = { @@ -290,10 +409,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()) { @@ -303,12 +418,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) @@ -318,9 +436,70 @@ 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) +{ + 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 = CA_STATUS_OK; +#ifdef __WITH_TLS__ + res = CAcloseSslConnection(endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to close TLS session"); + res = CAQueueingThreadClearContextData(g_sendQueueHandle, + CAClearQueueEndpointDataContext, + endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to clear context data"); + } + + return res; + } +#endif + + res = CASearchAndDeleteTCPSession(endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to close TCP session"); + } + + res = CAQueueingThreadClearContextData(g_sendQueueHandle, + CAClearQueueEndpointDataContext, + endpoint); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "failed to clear context data"); + } + + return res; +} + CAResult_t CAStartTCPListeningServer() { #ifndef SINGLE_THREAD @@ -398,8 +577,7 @@ int32_t CASendTCPUnicastData(const CAEndpoint_t *endpoint, #ifndef SINGLE_THREAD return CAQueueTCPData(false, endpoint, data, dataLength); #else - CATCPSendData(endpoint, data, dataLength, false); - return dataLength; + return CATCPSendData(endpoint, data, dataLength); #endif } @@ -422,11 +600,14 @@ CAResult_t CAReadTCPData() CAResult_t CAStopTCP() { + CAIPStopNetworkMonitor(CA_ADAPTER_TCP); + #ifndef SINGLE_THREAD if (g_sendQueueHandle && g_sendQueueHandle->threadMutex) { CAQueueingThreadStop(g_sendQueueHandle); } + CATCPDeinitializeQueueHandles(); #endif CATCPStopServer(); @@ -434,10 +615,6 @@ CAResult_t CAStopTCP() //Re-initializing the Globals to start them again CAInitializeTCPGlobals(); -#ifdef __WITH_TLS__ - CAdeinitTlsAdapter(); -#endif - return CA_STATUS_OK; } @@ -445,9 +622,8 @@ void CATerminateTCP() { CATCPSetPacketReceiveCallback(NULL); -#ifndef SINGLE_THREAD - CATCPDeinitializeQueueHandles(); -#endif + CATCPDestroyMutex(); + CATCPDestroyCond(); } void CATCPSendDataThread(void *threadData) @@ -459,6 +635,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 @@ -468,23 +652,33 @@ 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, "CAencryptTls called!"); - result = CAencryptTls(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen); - - if (CA_STATUS_OK != result) - { - OIC_LOG(ERROR, TAG, "CAAdapterNetDtlsEncrypt failed!"); - } - OIC_LOG_V(DEBUG, TAG, - "CAAdapterNetDtlsEncrypt returned with result[%d]", result); + 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); + } } } @@ -531,7 +725,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; @@ -549,7 +745,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); @@ -563,7 +759,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)