X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Fcainterfacecontroller.c;h=64b3f68bdfa8c1b53aae39feb3baf825908f6324;hb=705120561e5ffb4788f36ad27f62dd46c45ab470;hp=9b1f8d467355fe9cf0fe60a52bc2b95686f93545;hpb=b2e13cb430aeee5eca38253a454a0665eb6a68b6;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c index 9b1f8d4..64b3f68 100644 --- a/resource/csdk/connectivity/src/cainterfacecontroller.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller.c @@ -30,6 +30,7 @@ #include "cainterfacecontroller.h" #include "caedradapter.h" #include "caleadapter.h" +#include "canfcadapter.h" #include "caremotehandler.h" #include "cathreadpool.h" #include "caipadapter.h" @@ -39,57 +40,44 @@ #include "caraadapter.h" #endif -#define TAG "CA_INTRFC_CNTRLR" -#ifdef RA_ADAPTER -#include "caraadapter.h" +#ifdef TCP_ADAPTER +#include "catcpadapter.h" #endif +#define TAG "OIC_CA_INF_CTR" #define CA_MEMORY_ALLOC_CHECK(arg) {if (arg == NULL) \ {OIC_LOG(ERROR, TAG, "memory error");goto memory_error_exit;} } -#ifdef RA_ADAPTER -#define CA_TRANSPORT_TYPE_NUM 4 -#else -#define CA_TRANSPORT_TYPE_NUM 3 -#endif +static CAConnectivityHandler_t *g_adapterHandler = NULL; -static CAConnectivityHandler_t g_adapterHandler[CA_TRANSPORT_TYPE_NUM] = {}; +static uint32_t g_numberOfAdapters = 0; static CANetworkPacketReceivedCallback g_networkPacketReceivedCallback = NULL; -static CANetworkChangeCallback g_networkChangeCallback = NULL; +static CAAdapterChangeCallback g_adapterChangeCallback = NULL; + +static CAConnectionChangeCallback g_connChangeCallback = NULL; static CAErrorHandleCallback g_errorHandleCallback = NULL; static int CAGetAdapterIndex(CATransportAdapter_t cType) { - switch (cType) + for (uint32_t index=0 ; index < g_numberOfAdapters ; index++) { - case CA_ADAPTER_IP: - return 0; - case CA_ADAPTER_GATT_BTLE: - return 1; - case CA_ADAPTER_RFCOMM_BTEDR: - return 2; - - #ifdef RA_ADAPTER - case CA_ADAPTER_REMOTE_ACCESS: - return 3; - #endif - - default: - break; + if (cType == g_adapterHandler[index].cType ) + { + return index; + } } return -1; } -static void CARegisterCallback(CAConnectivityHandler_t handler, CATransportAdapter_t cType) +static void CARegisterCallback(CAConnectivityHandler_t handler) { - OIC_LOG(DEBUG, TAG, "IN"); - if(handler.startAdapter == NULL || handler.startListenServer == NULL || + handler.stopListenServer == NULL || handler.startDiscoveryServer == NULL || handler.sendData == NULL || handler.sendDataToAll == NULL || @@ -101,19 +89,19 @@ static void CARegisterCallback(CAConnectivityHandler_t handler, CATransportAdapt OIC_LOG(ERROR, TAG, "connectivity handler is not enough to be used!"); return; } - - int index = CAGetAdapterIndex(cType); - - if (index == -1) + uint32_t numberofAdapters = g_numberOfAdapters + 1; + CAConnectivityHandler_t *adapterHandler = OICRealloc(g_adapterHandler, + (numberofAdapters) * sizeof(*adapterHandler)); + if (NULL == adapterHandler) { - OIC_LOG(ERROR, TAG, "unknown connectivity type!"); + OIC_LOG(ERROR, TAG, "Memory allocation failed during registration"); return; } + g_adapterHandler = adapterHandler; + g_numberOfAdapters = numberofAdapters; + g_adapterHandler[g_numberOfAdapters-1] = handler; - g_adapterHandler[index] = handler; - - OIC_LOG_V(DEBUG, TAG, "%d type adapter, register complete!", cType); - OIC_LOG(DEBUG, TAG, "OUT"); + OIC_LOG_V(DEBUG, TAG, "%d type adapter, register complete!", handler.cType); } #ifdef RA_ADAPTER @@ -126,8 +114,6 @@ CAResult_t CASetAdapterRAInfo(const CARAInfo_t *caraInfo) static void CAReceivedPacketCallback(const CASecureEndpoint_t *sep, const void *data, uint32_t dataLen) { - OIC_LOG(DEBUG, TAG, "IN"); - if (g_networkPacketReceivedCallback != NULL) { g_networkPacketReceivedCallback(sep, data, dataLen); @@ -136,21 +122,26 @@ static void CAReceivedPacketCallback(const CASecureEndpoint_t *sep, { OIC_LOG(ERROR, TAG, "network packet received callback is NULL!"); } - - OIC_LOG(DEBUG, TAG, "OUT"); } -static void CANetworkChangedCallback(const CAEndpoint_t *info, CANetworkStatus_t status) +static void CAAdapterChangedCallback(CATransportAdapter_t adapter, CANetworkStatus_t status) { - OIC_LOG(DEBUG, TAG, "IN"); - // Call the callback. - if (g_networkChangeCallback != NULL) + if (g_adapterChangeCallback != NULL) { - g_networkChangeCallback(info, status); + g_adapterChangeCallback(adapter, status); } + OIC_LOG_V(DEBUG, TAG, "[%d]adapter status is changed to [%d]", adapter, status); +} - OIC_LOG(DEBUG, TAG, "OUT"); +static void CAConnectionChangedCallback(const CAEndpoint_t *info, bool isConnected) +{ + // Call the callback. + if (g_connChangeCallback != NULL) + { + g_connChangeCallback(info, isConnected); + } + OIC_LOG_V(DEBUG, TAG, "[%s] connection status is changed to [%d]", info->addr, isConnected); } static void CAAdapterErrorHandleCallback(const CAEndpoint_t *endpoint, @@ -170,48 +161,52 @@ void CAInitializeAdapters(ca_thread_pool_t handle) { OIC_LOG(DEBUG, TAG, "initialize adapters.."); - memset(g_adapterHandler, 0, sizeof(CAConnectivityHandler_t) * CA_TRANSPORT_TYPE_NUM); - // Initialize adapters and register callback. #ifdef IP_ADAPTER - CAInitializeIP(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback, + CAInitializeIP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, CAAdapterErrorHandleCallback, handle); #endif /* IP_ADAPTER */ #ifdef EDR_ADAPTER - CAInitializeEDR(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback, - CAAdapterErrorHandleCallback, handle); + CAInitializeEDR(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); #endif /* EDR_ADAPTER */ #ifdef LE_ADAPTER - CAInitializeLE(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback, - CAAdapterErrorHandleCallback, handle); + CAInitializeLE(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); #endif /* LE_ADAPTER */ #ifdef RA_ADAPTER - CAInitializeRA(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback, + CAInitializeRA(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, handle); #endif /* RA_ADAPTER */ +#ifdef TCP_ADAPTER + CAInitializeTCP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); +#endif /* TCP_ADAPTER */ +#ifdef NFC_ADAPTER + CAInitializeNFC(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAAdapterErrorHandleCallback, handle); +#endif /* NFC_ADAPTER */ } void CASetPacketReceivedCallback(CANetworkPacketReceivedCallback callback) { - OIC_LOG(DEBUG, TAG, "IN"); + OIC_LOG(DEBUG, TAG, "Set Receiver handle callback"); g_networkPacketReceivedCallback = callback; - - OIC_LOG(DEBUG, TAG, "OUT"); } -void CASetNetworkChangeCallback(CANetworkChangeCallback callback) +void CASetNetworkMonitorCallbacks(CAAdapterChangeCallback adapterCB, + CAConnectionChangeCallback connCB) { - OIC_LOG(DEBUG, TAG, "IN"); - - g_networkChangeCallback = callback; + OIC_LOG(DEBUG, TAG, "Set network monitoring callback"); - OIC_LOG(DEBUG, TAG, "OUT"); + g_adapterChangeCallback = adapterCB; + g_connChangeCallback = connCB; } void CASetErrorHandleCallback(CAErrorHandleCallback errorCallback) @@ -225,19 +220,19 @@ CAResult_t CAStartAdapter(CATransportAdapter_t transportType) OIC_LOG_V(DEBUG, TAG, "Start the adapter of CAConnectivityType[%d]", transportType); int index = CAGetAdapterIndex(transportType); - - if (index == -1) + if (0 > index) { OIC_LOG(ERROR, TAG, "unknown connectivity type!"); return CA_STATUS_FAILED; } + CAResult_t res = CA_STATUS_FAILED; if (g_adapterHandler[index].startAdapter != NULL) { - g_adapterHandler[index].startAdapter(); + res = g_adapterHandler[index].startAdapter(); } - return CA_STATUS_OK; + return res; } void CAStopAdapter(CATransportAdapter_t transportType) @@ -245,8 +240,7 @@ void CAStopAdapter(CATransportAdapter_t transportType) OIC_LOG_V(DEBUG, TAG, "Stop the adapter of CATransportType[%d]", transportType); int index = CAGetAdapterIndex(transportType); - - if (index == -1) + if (0 > index) { OIC_LOG(ERROR, TAG, "unknown transport type!"); return; @@ -265,12 +259,23 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, uint32_t *size) return CA_STATUS_INVALID_PARAM; } - CAEndpoint_t *tempInfo[CA_TRANSPORT_TYPE_NUM] = { 0 }; - uint32_t tempSize[CA_TRANSPORT_TYPE_NUM] = { 0 }; + CAEndpoint_t **tempInfo = (CAEndpoint_t**) OICCalloc(g_numberOfAdapters, sizeof(*tempInfo)); + if (!tempInfo) + { + OIC_LOG(ERROR, TAG, "Out of memory!"); + return CA_MEMORY_ALLOC_FAILED; + } + uint32_t *tempSize =(uint32_t*) OICCalloc(g_numberOfAdapters, sizeof(*tempSize)); + if (!tempSize) + { + OIC_LOG(ERROR, TAG, "Out of memory!"); + OICFree(tempInfo); + return CA_MEMORY_ALLOC_FAILED; + } CAResult_t res = CA_STATUS_FAILED; - uint32_t resSize = 0; - for (int index = 0; index < CA_TRANSPORT_TYPE_NUM; index++) + size_t resSize = 0; + for (uint32_t index = 0; index < g_numberOfAdapters; index++) { if (g_adapterHandler[index].GetnetInfo != NULL) { @@ -286,17 +291,19 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, uint32_t *size) OIC_LOG_V(DEBUG, TAG, - "%d adapter network info size is %" PRIu32 " res:%d", + "%zu adapter network info size is %" PRIu32 " res:%d", index, tempSize[index], res); } } - OIC_LOG_V(DEBUG, TAG, "network info total size is %d!", resSize); + OIC_LOG_V(DEBUG, TAG, "network info total size is %zu!", resSize); if (resSize == 0) { + OICFree(tempInfo); + OICFree(tempSize); if (res == CA_ADAPTER_NOT_ENABLED || res == CA_NOT_SUPPORTED) { return res; @@ -313,7 +320,7 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, uint32_t *size) *info = resInfo; *size = resSize; - for (int index = 0; index < CA_TRANSPORT_TYPE_NUM; index++) + for (uint32_t index = 0; index < g_numberOfAdapters; index++) { // check information if (tempSize[index] == 0) @@ -331,6 +338,8 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, uint32_t *size) OICFree(tempInfo[index]); tempInfo[index] = NULL; } + OICFree(tempInfo); + OICFree(tempSize); OIC_LOG(DEBUG, TAG, "each network info save success!"); return CA_STATUS_OK; @@ -338,60 +347,81 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, uint32_t *size) // memory error label. memory_error_exit: - for (int index = 0; index < CA_TRANSPORT_TYPE_NUM; index++) + for (uint32_t index = 0; index < g_numberOfAdapters; index++) { - OICFree(tempInfo[index]); tempInfo[index] = NULL; } + OICFree(tempInfo); + OICFree(tempSize); return CA_MEMORY_ALLOC_FAILED; } CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uint32_t length) { - OIC_LOG(DEBUG, TAG, "IN"); - if (endpoint == NULL) { OIC_LOG(DEBUG, TAG, "Invalid endpoint"); return CA_STATUS_INVALID_PARAM; } - CATransportAdapter_t type = endpoint->adapter; - int index = CAGetAdapterIndex(type); - - if (index == -1) + u_arraylist_t *list = CAGetSelectedNetworkList(); + if (!list) { - OIC_LOG(ERROR, TAG, "unknown transport type!"); - return CA_STATUS_INVALID_PARAM; + OIC_LOG(ERROR, TAG, "No selected network"); + return CA_SEND_FAILED; } + CATransportAdapter_t requestedAdapter = endpoint->adapter ? endpoint->adapter : CA_ALL_ADAPTERS; - int32_t sentDataLen = 0; - - if (g_adapterHandler[index].sendData != NULL) + for (uint32_t i = 0; i < u_arraylist_length(list); i++) { - sentDataLen = g_adapterHandler[index].sendData(endpoint, data, length); - } + void* ptrType = u_arraylist_get(list, i); - if (sentDataLen != (int)length) - { - OIC_LOG(ERROR, TAG, "error in sending data. Error will be reported in adapter"); + if (NULL == ptrType) + { + continue; + } + + CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType; + if (0 == (connType & requestedAdapter)) + { + continue; + } + + int index = CAGetAdapterIndex(connType); + + if (-1 == index) + { + OIC_LOG(ERROR, TAG, "unknown transport type!"); + return CA_STATUS_INVALID_PARAM; + } + + int32_t sentDataLen = 0; + + if (NULL != g_adapterHandler[index].sendData) + { + OIC_LOG(DEBUG, TAG, "unicast message to adapter"); + sentDataLen = g_adapterHandler[index].sendData(endpoint, data, length); + } + + if (sentDataLen != (int32_t)length) + { + OIC_LOG(ERROR, TAG, "error in sending data. Error will be reported in adapter"); #ifdef SINGLE_THREAD - //in case of single thread, no error handler. Report error immediately - return CA_SEND_FAILED; + //in case of single thread, no error handler. Report error immediately + return CA_SEND_FAILED; #endif + } + } - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t length) { - OIC_LOG(DEBUG, TAG, "IN"); - u_arraylist_t *list = CAGetSelectedNetworkList(); if (!list) { @@ -399,26 +429,26 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u return CA_SEND_FAILED; } - CATransportFlags_t requestedAdapter = endpoint->adapter ? endpoint->adapter : CA_ALL_ADAPTERS; - - for (uint32_t i = 0; i < u_arraylist_length(list); i++) + CATransportAdapter_t requestedAdapter = endpoint->adapter ? endpoint->adapter : CA_ALL_ADAPTERS; + size_t selectedLength = u_arraylist_length(list); + for (size_t i = 0; i < selectedLength; i++) { void* ptrType = u_arraylist_get(list, i); - if(ptrType == NULL) + if(NULL == ptrType) { continue; } CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType; - if ((connType & requestedAdapter) == 0) + if (0 == (connType & requestedAdapter)) { continue; } int index = CAGetAdapterIndex(connType); - - if (index == -1) + if (0 > index) + if (-1 == index) { OIC_LOG(DEBUG, TAG, "unknown connectivity type!"); continue; @@ -426,7 +456,7 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u uint32_t sentDataLen = 0; - if (g_adapterHandler[index].sendDataToAll != NULL) + if (NULL != g_adapterHandler[index].sendDataToAll) { void *payload = (void *) OICMalloc(length); if (!payload) @@ -449,23 +479,22 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u } } - OIC_LOG(DEBUG, TAG, "OUT"); - return CA_STATUS_OK; } CAResult_t CAStartListeningServerAdapters() { - OIC_LOG(DEBUG, TAG, "IN"); + CAResult_t result = CA_STATUS_FAILED; u_arraylist_t *list = CAGetSelectedNetworkList(); if (!list) { OIC_LOG(ERROR, TAG, "No selected network"); - return CA_STATUS_FAILED; + return result; } - for (uint32_t i = 0; i < u_arraylist_length(list); i++) + size_t length = u_arraylist_length(list); + for (size_t i = 0; i < length; i++) { void* ptrType = u_arraylist_get(list, i); @@ -477,7 +506,7 @@ CAResult_t CAStartListeningServerAdapters() CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType; int index = CAGetAdapterIndex(connType); - if (index == -1) + if (0 > index) { OIC_LOG(ERROR, TAG, "unknown connectivity type!"); continue; @@ -485,27 +514,70 @@ CAResult_t CAStartListeningServerAdapters() if (g_adapterHandler[index].startListenServer != NULL) { - g_adapterHandler[index].startListenServer(); + const CAResult_t tmp = + g_adapterHandler[index].startListenServer(); + + // Successful listen if at least one adapter started. + if (CA_STATUS_OK == tmp) + { + result = tmp; + } + } + } + + return result; +} + +CAResult_t CAStopListeningServerAdapters() +{ + u_arraylist_t *list = CAGetSelectedNetworkList(); + if (!list) + { + OIC_LOG(ERROR, TAG, "No selected network"); + return CA_STATUS_FAILED; + } + + size_t length = u_arraylist_length(list); + for (size_t i = 0; i < length; i++) + { + void* ptrType = u_arraylist_get(list, i); + if(ptrType == NULL) + { + continue; + } + + CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType; + + int index = CAGetAdapterIndex(connType); + if (0 > index) + { + OIC_LOG(ERROR, TAG, "unknown connectivity type!"); + continue; + } + + if (g_adapterHandler[index].stopListenServer != NULL) + { + g_adapterHandler[index].stopListenServer(); } } - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } CAResult_t CAStartDiscoveryServerAdapters() { - OIC_LOG(DEBUG, TAG, "IN"); + CAResult_t result = CA_STATUS_FAILED; u_arraylist_t *list = CAGetSelectedNetworkList(); if (!list) { OIC_LOG(ERROR, TAG, "No selected network"); - return CA_STATUS_FAILED; + return result; } - for (uint32_t i = 0; i < u_arraylist_length(list); i++) + size_t length = u_arraylist_length(list); + for (size_t i = 0; i < length; i++) { void* ptrType = u_arraylist_get(list, i); @@ -517,8 +589,7 @@ CAResult_t CAStartDiscoveryServerAdapters() CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType; int index = CAGetAdapterIndex(connType); - - if (index == -1) + if (0 > index) { OIC_LOG(DEBUG, TAG, "unknown connectivity type!"); continue; @@ -526,20 +597,23 @@ CAResult_t CAStartDiscoveryServerAdapters() if (g_adapterHandler[index].startDiscoveryServer != NULL) { - g_adapterHandler[index].startDiscoveryServer(); + const CAResult_t tmp = + g_adapterHandler[index].startDiscoveryServer(); + + // Successful discovery if at least one adapter started. + if (CA_STATUS_OK == tmp) + { + result = tmp; + } } } - OIC_LOG(DEBUG, TAG, "OUT"); - return CA_STATUS_OK; + return result; } void CATerminateAdapters() { - OIC_LOG(DEBUG, TAG, "IN"); - - uint32_t index; - for (index = 0; index < CA_TRANSPORT_TYPE_NUM; index++) + for (uint32_t index = 0; index < g_numberOfAdapters; index++) { if (g_adapterHandler[index].terminate != NULL) { @@ -547,13 +621,14 @@ void CATerminateAdapters() } } - OIC_LOG(DEBUG, TAG, "OUT"); + OICFree(g_adapterHandler); + g_adapterHandler = NULL; + g_numberOfAdapters = 0; } #ifdef SINGLE_THREAD CAResult_t CAReadData() { - OIC_LOG(DEBUG, TAG, "IN"); u_arraylist_t *list = CAGetSelectedNetworkList(); if (!list) @@ -574,8 +649,7 @@ CAResult_t CAReadData() CATransportAdapter_t connType = *(CATransportAdapter_t *) ptrType; int index = CAGetAdapterIndex(connType); - - if (-1 == index) + if (0 > index) { OIC_LOG(DEBUG, TAG, "unknown connectivity type!"); continue; @@ -587,7 +661,6 @@ CAResult_t CAReadData() } } - OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } #endif