X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Fcainterfacecontroller.c;h=525f79f605e9eaee7f3f1d9d90ea658f083c2865;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=9b1729c5cefa95b6821078310c35c151625ce2d1;hpb=23b1b22ba0e068c217fedd3e95e50ad536a16667;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c old mode 100644 new mode 100755 index 9b1729c..525f79f --- a/resource/csdk/connectivity/src/cainterfacecontroller.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller.c @@ -35,6 +35,8 @@ #include "cathreadpool.h" #include "caipadapter.h" #include "cainterface.h" +#include "caipinterface.h" +#include #ifdef RA_ADAPTER #include "caraadapter.h" @@ -44,6 +46,10 @@ #include "catcpadapter.h" #endif +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) +#include "ca_adapter_net_ssl.h" +#endif + #define TAG "OIC_CA_INF_CTR" #define CA_MEMORY_ALLOC_CHECK(arg) {if (arg == NULL) \ @@ -55,11 +61,26 @@ static uint32_t g_numberOfAdapters = 0; static CANetworkPacketReceivedCallback g_networkPacketReceivedCallback = NULL; -static CAAdapterStateChangedCB g_adapterChangeCallback = NULL; +static CAErrorHandleCallback g_errorHandleCallback = NULL; + +static struct CANetworkCallback_t * g_networkChangeCallbackList = NULL; -static CAConnectionStateChangedCB g_connChangeCallback = NULL; +/** + * network callback structure is handling + * for adapter state changed and connection state changed event. + */ +typedef struct CANetworkCallback_t { -static CAErrorHandleCallback g_errorHandleCallback = NULL; + /** Linked list; for multiple callback list.*/ + struct CANetworkCallback_t * next; + + /** Adapter state changed event callback. */ + CAAdapterStateChangedCB adapter; + + /** Connection state changed event callback. */ + CAConnectionStateChangedCB conn; + +} CANetworkCallback_t; static int CAGetAdapterIndex(CATransportAdapter_t cType) { @@ -70,6 +91,7 @@ static int CAGetAdapterIndex(CATransportAdapter_t cType) return index; } } + OIC_LOG_V(ERROR, TAG, "adapter info [%d]", g_numberOfAdapters); return -1; } @@ -104,6 +126,79 @@ static void CARegisterCallback(CAConnectivityHandler_t handler) OIC_LOG_V(DEBUG, TAG, "%d type adapter, register complete!", handler.cType); } +/** + * Add a network callback from caller to the network callback list + * + * @param adapterCB adapter state changed callback + * @param connCB connection state changed callback + * + * @return + * CAResult_t + */ +static CAResult_t AddNetworkStateChangedCallback(CAAdapterStateChangedCB adapterCB, + CAConnectionStateChangedCB connCB) +{ + OIC_LOG(DEBUG, TAG, "Add NetworkStateChanged Callback"); + + if (!adapterCB || !connCB) + { + OIC_LOG(ERROR, TAG, "parameter is null"); + return CA_STATUS_INVALID_PARAM; + } + + CANetworkCallback_t* callback = NULL; + LL_FOREACH(g_networkChangeCallbackList, callback) + { + if (callback && adapterCB == callback->adapter && connCB == callback->conn) + { + OIC_LOG(DEBUG, TAG, "this callback is already added"); + return CA_STATUS_OK; + } + } + + callback = (CANetworkCallback_t *) OICCalloc(1, sizeof(CANetworkCallback_t)); + if (NULL == callback) + { + OIC_LOG(ERROR, TAG, "Memory allocation failed during registration"); + return CA_MEMORY_ALLOC_FAILED; + } + + callback->adapter = adapterCB; + callback->conn = connCB; + LL_APPEND(g_networkChangeCallbackList, callback); + OIC_LOG_V(INFO, TAG, "Added NetworkStateChanged Callback [%p]", callback); + + return CA_STATUS_OK; +} + +/** + * Remove a network callback from the network callback list + * + * @param adapterCB adapter state changed callback + * @param connCB connection state changed callback + * + * @return + * CAResult_t + */ +static CAResult_t RemoveNetworkStateChangedCallback(CAAdapterStateChangedCB adapterCB, + CAConnectionStateChangedCB connCB) +{ + OIC_LOG(DEBUG, TAG, "Remove NetworkStateChanged Callback"); + + CANetworkCallback_t* callback = NULL; + LL_FOREACH(g_networkChangeCallbackList, callback) + { + if (callback && adapterCB == callback->adapter && connCB == callback->conn) + { + OIC_LOG(DEBUG, TAG, "remove specific callback"); + LL_DELETE(g_networkChangeCallbackList, callback); + OICFree(callback); + return CA_STATUS_OK; + } + } + return CA_STATUS_OK; +} + #ifdef RA_ADAPTER CAResult_t CASetAdapterRAInfo(const CARAInfo_t *caraInfo) { @@ -111,45 +206,58 @@ CAResult_t CASetAdapterRAInfo(const CARAInfo_t *caraInfo) } #endif -static void CAReceivedPacketCallback(const CASecureEndpoint_t *sep, - const void *data, uint32_t dataLen) +static CAResult_t CAReceivedPacketCallback(const CASecureEndpoint_t *sep, + const void *data, uint32_t dataLen) { if (g_networkPacketReceivedCallback != NULL) { - g_networkPacketReceivedCallback(sep, data, dataLen); + return g_networkPacketReceivedCallback(sep, data, dataLen); } else { - OIC_LOG(ERROR, TAG, "network packet received callback is NULL!"); + OIC_LOG(INFO, TAG, "network packet received callback is NULL!"); + return CA_STATUS_OK; } } static void CAAdapterChangedCallback(CATransportAdapter_t adapter, CANetworkStatus_t status) { // Call the callback. - if (g_adapterChangeCallback != NULL) + CANetworkCallback_t* callback = NULL; + LL_FOREACH(g_networkChangeCallbackList, callback) { - if (CA_INTERFACE_UP == status) - { - g_adapterChangeCallback(adapter, true); - } - else if (CA_INTERFACE_DOWN == status) + if (callback && callback->adapter) { - g_adapterChangeCallback(adapter, false); + OIC_LOG_V(INFO, TAG, "IN application adapter changed callback [%p]", callback); + if (CA_INTERFACE_UP == status) + { + callback->adapter(adapter, true); + } + else if (CA_INTERFACE_DOWN == status) + { + callback->adapter(adapter, false); + } + OIC_LOG_V(INFO, TAG, "OUT application adapter changed callback [%p]", callback); } } - OIC_LOG_V(DEBUG, TAG, "[%d]adapter status is changed to [%d]", adapter, status); + OIC_LOG_V(DEBUG, TAG, "[%d] adapter status is changed to [%d]", adapter, status); } +#if defined(TCP_ADAPTER) || defined(EDR_ADAPTER) || defined(LE_ADAPTER) static void CAConnectionChangedCallback(const CAEndpoint_t *info, bool isConnected) { // Call the callback. - if (g_connChangeCallback != NULL) + CANetworkCallback_t* callback = NULL; + LL_FOREACH(g_networkChangeCallbackList, callback) { - g_connChangeCallback(info, isConnected); + if (callback && callback->conn) + { + callback->conn(info, isConnected); + } } OIC_LOG_V(DEBUG, TAG, "[%s] connection status is changed to [%d]", info->addr, isConnected); } +#endif static void CAAdapterErrorHandleCallback(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLen, @@ -164,39 +272,71 @@ static void CAAdapterErrorHandleCallback(const CAEndpoint_t *endpoint, } } -void CAInitializeAdapters(ca_thread_pool_t handle) +void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transportType) { - OIC_LOG(DEBUG, TAG, "initialize adapters.."); + OIC_LOG_V(DEBUG, TAG, "initialize adapters %d", transportType); + + // Initialize ssl adapter. +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + if (CA_STATUS_OK != CAinitSslAdapter()) + { + OIC_LOG(ERROR, TAG, "Failed to init SSL adapter"); + } +#endif // Initialize adapters and register callback. #ifdef IP_ADAPTER - CAInitializeIP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, - CAAdapterErrorHandleCallback, handle); + if ((transportType & CA_ADAPTER_IP) || (CA_DEFAULT_ADAPTER == transportType) + || (transportType == CA_ALL_ADAPTERS)) + { + CAInitializeIP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAAdapterErrorHandleCallback, handle); + } #endif /* IP_ADAPTER */ #ifdef EDR_ADAPTER - CAInitializeEDR(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, - CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); + if ((transportType & CA_ADAPTER_RFCOMM_BTEDR) || (CA_DEFAULT_ADAPTER == transportType) + || (transportType == CA_ALL_ADAPTERS)) + { + CAInitializeEDR(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); + } #endif /* EDR_ADAPTER */ #ifdef LE_ADAPTER - CAInitializeLE(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, - CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); + if ((transportType & CA_ADAPTER_GATT_BTLE) || (CA_DEFAULT_ADAPTER == transportType) + || (transportType == CA_ALL_ADAPTERS)) + { + CAInitializeLE(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); + } #endif /* LE_ADAPTER */ #ifdef RA_ADAPTER - CAInitializeRA(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, - handle); + if ((transportType & CA_ADAPTER_REMOTE_ACCESS) || (CA_DEFAULT_ADAPTER == transportType) + || (transportType == CA_ALL_ADAPTERS)) + { + CAInitializeRA(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + handle); + } #endif /* RA_ADAPTER */ #ifdef TCP_ADAPTER - CAInitializeTCP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, - CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); + if ((transportType & CA_ADAPTER_TCP) || (CA_DEFAULT_ADAPTER == transportType) + || (transportType == CA_ALL_ADAPTERS)) + { + CAInitializeTCP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle); + } #endif /* TCP_ADAPTER */ #ifdef NFC_ADAPTER - CAInitializeNFC(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, - CAAdapterErrorHandleCallback, handle); + if ((transportType & CA_ADAPTER_NFC) || (CA_DEFAULT_ADAPTER == transportType) + || (transportType == CA_ALL_ADAPTERS)) + { + CAInitializeNFC(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback, + CAAdapterErrorHandleCallback, handle); + } #endif /* NFC_ADAPTER */ } @@ -211,9 +351,23 @@ void CASetNetworkMonitorCallbacks(CAAdapterStateChangedCB adapterCB, CAConnectionStateChangedCB connCB) { OIC_LOG(DEBUG, TAG, "Set network monitoring callback"); + CAResult_t res = AddNetworkStateChangedCallback(adapterCB, connCB); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "AddNetworkStateChangedCallback has failed"); + } +} - g_adapterChangeCallback = adapterCB; - g_connChangeCallback = connCB; +CAResult_t CAUnsetNetworkMonitorCallbacks(CAAdapterStateChangedCB adapterCB, + CAConnectionStateChangedCB connCB) +{ + OIC_LOG(DEBUG, TAG, "Unset network monitoring callback"); + CAResult_t res = RemoveNetworkStateChangedCallback(adapterCB, connCB); + if (CA_STATUS_OK != res) + { + OIC_LOG(ERROR, TAG, "RemoveNetworkStateChangedCallback has failed"); + } + return res; } void CASetErrorHandleCallback(CAErrorHandleCallback errorCallback) @@ -296,12 +450,14 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, uint32_t *size) resSize += tempSize[index]; } +#ifndef __TIZENRT__ OIC_LOG_V(DEBUG, TAG, - "%zu adapter network info size is %" PRIu32 " res:%d", + "%" PRIu32 " adapter network info size is %" PRIu32 " res:%d", index, tempSize[index], res); +#endif } } @@ -405,7 +561,7 @@ CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uin if (-1 == index) { - OIC_LOG(ERROR, TAG, "unknown transport type!"); + OIC_LOG_V(ERROR, TAG, "unknown transport type[%d]", connType); return CA_STATUS_INVALID_PARAM; } @@ -632,6 +788,10 @@ void CATerminateAdapters() } } +#if defined(__WITH_DTLS__) || defined(__WITH_TLS__) + CAdeinitSslAdapter(); +#endif + OICFree(g_adapterHandler); g_adapterHandler = NULL; g_numberOfAdapters = 0; @@ -676,3 +836,33 @@ CAResult_t CAReadData() } #endif +#ifdef IP_ADAPTER +CAResult_t CASetMulticastTTL(size_t ttl) +{ + return CAIPSetMulticastTTL(ttl); +} + +CAResult_t CAGetMulticastTTL(size_t *ttl) +{ + return CAIPGetMulticastTTL(ttl); +} +#endif + +#ifdef TCP_ADAPTER +CAResult_t CADisconnectSession(const CAEndpoint_t *endpoint) +{ + return CATCPDisconnectSession(endpoint); +} +#endif + +#ifdef LE_ADAPTER +void CAStartGattServer() +{ + CALEStartGattServer(); +} + +void CAStopGattServer() +{ + CALEStopGattServer(); +} +#endif