uint32_t totalDataLen;
uint8_t *defragData;
CAEndpoint_t *remoteEndpoint;
- } CABLESenderInfo_t;
+} CABLESenderInfo_t;
typedef enum
{
static oc_mutex g_bleIsServerMutex = NULL;
/**
- * Mutex to synchronize the callback to be called for the network
- * changes.
- */
-static oc_mutex g_bleNetworkCbMutex = NULL;
-
-/**
* Mutex to synchronize the updates of the local LE address of the
* adapter.
*/
static ca_thread_pool_t g_bleAdapterThreadPool = NULL;
/**
- * Mutex to synchronize the task to be pushed to thread pool.
- */
-static oc_mutex g_bleAdapterThreadPoolMutex = NULL;
-
-/**
- * Mutex to synchronize the queing of the data from SenderQueue.
- */
-static oc_mutex g_bleClientSendDataMutex = NULL;
-
-/**
* Mutex to synchronize the queing of the data from ReceiverQueue.
*/
static oc_mutex g_bleClientReceiveDataMutex = NULL;
/**
- * Mutex to synchronize the queing of the data from SenderQueue.
- */
-static oc_mutex g_bleServerSendDataMutex = NULL;
-
-/**
* Mutex to synchronize the queing of the data from ReceiverQueue.
*/
static oc_mutex g_bleServerReceiveDataMutex = NULL;
-/**
- * Mutex to synchronize the callback to be called for the
- * adapterReqResponse.
- */
-static oc_mutex g_bleAdapterReqRespCbMutex = NULL;
/**
* Callback to be called when network packet received from either
static CAErrorHandleCallback g_errorHandler = NULL;
#ifdef __WITH_DTLS__
-static void CALESecureReceiveDataCB(const CASecureEndpoint_t *endpoint,
+static CAResult_t CALESecureReceiveDataCB(const CASecureEndpoint_t *endpoint,
const void *data, size_t dataLength);
static ssize_t CALESecureSendDataCB(CAEndpoint_t *endpoint,
* @param[in] address target address to remove data in queue.
*/
static void CALERemoveSendQueueData(CAQueueingThread_t *queueHandle,
- oc_mutex mutex,
const char* address);
/**
* for client / server which is matched same leAddress and port.
*
* @param[in] leAddress target address to get serderInfo.
- * @param[in] port target port to get serderInfo.
+ * @param[in] port target port to get senderInfo.
* @param[in] senderInfoList received data list for client / server.
* @param[out] senderInfo Pointer to contain matched(leAddress and port)
* received data info.
static CAResult_t CAInitLEServerQueues()
{
- oc_mutex_lock(g_bleAdapterThreadPoolMutex);
-
+
CAResult_t result = CAInitLEServerSenderQueue();
if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleServerSenderQueue failed");
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
+
return CA_STATUS_FAILED;
}
if (!g_bleServerSenderInfo)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "memory allocation failed!");
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_MEMORY_ALLOC_FAILED;
}
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitLEServerReceiverQueue failed");
u_arraylist_free(&g_bleServerSenderInfo);
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_STATUS_FAILED;
}
g_dataBleServerReceiverHandlerState = true;
-
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_STATUS_OK;
}
static CAResult_t CAInitLEClientQueues()
{
- oc_mutex_lock(g_bleAdapterThreadPoolMutex);
-
CAResult_t result = CAInitLEClientSenderQueue();
if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitBleClientSenderQueue failed");
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_STATUS_FAILED;
}
if (!g_bleClientSenderInfo)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "memory allocation failed!");
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_MEMORY_ALLOC_FAILED;
}
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "CAInitLEClientReceiverQueue failed");
u_arraylist_free(&g_bleClientSenderInfo);
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_STATUS_FAILED;
}
g_dataBleClientReceiverHandlerState = true;
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
return CA_STATUS_OK;
}
return CA_STATUS_OK;
}
-static void CALEClearSenderInfoImpl(u_arraylist_t ** list)
+static void CALEClearSenderInfoImpl(u_arraylist_t **list)
{
const size_t length = u_arraylist_length(*list);
for (size_t i = 0; i < length; ++i)
if (senderInfo->totalDataLen == senderInfo->recvDataLen)
{
- oc_mutex_lock(g_bleAdapterReqRespCbMutex);
if (NULL == g_networkPacketReceivedCallback)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "gReqRespCallback is NULL!");
u_arraylist_remove(bleData->senderInfo, senderIndex);
OICFree(senderInfo->defragData);
OICFree(senderInfo);
- oc_mutex_unlock(g_bleAdapterReqRespCbMutex);
oc_mutex_unlock(bleReceiveDataMutex);
return;
}
break;
default:
OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Unsupported rcvr type:%d",receiverType);
- oc_mutex_unlock(g_bleAdapterReqRespCbMutex);
u_arraylist_remove(bleData->senderInfo, senderIndex);
senderInfo->remoteEndpoint = NULL;
senderInfo->defragData = NULL;
}
#endif
- oc_mutex_unlock(g_bleAdapterReqRespCbMutex);
u_arraylist_remove(bleData->senderInfo, senderIndex);
senderInfo->remoteEndpoint = NULL;
senderInfo->defragData = NULL;
#if defined(__TIZEN__) || defined(__ANDROID__)
// get MTU size
+ OIC_LOG_V(INFO, CALEADAPTER_TAG, "Get MTU size using API");
+
+
g_mtuSize = CALEServerGetMtuSize(bleData->remoteEndpoint->addr);
#endif
OIC_LOG_V(INFO, CALEADAPTER_TAG, "MTU size [%d]", g_mtuSize);
"CAGenerateVariableForFragmentation failed, result [%d]", result);
if (g_errorHandler)
{
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
- }
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
return;
}
uint32_t dataLen = 0;
if (g_mtuSize > totalLength)
{
- length = totalLength;
+ length = (uint32_t)totalLength;
dataLen = bleData->dataLen;
}
else
return;
}
-#if defined(__TIZEN__) || defined(__ANDROID__)
+#if defined(__ANDROID__)
// get MTU size
if (false == CALEClientIsConnected(bleData->remoteEndpoint->addr))
{
CALEADAPTER_TAG,
"CALEClientSendNegotiationMessage has failed, result [%d]",
res);
- if (g_errorHandler)
+ if (g_errorHandler)
{
g_errorHandler(bleData->remoteEndpoint,
bleData->data,
uint32_t dataLen = 0;
if (g_mtuSize > totalLength)
{
- length = totalLength;
+ length = (uint32_t)totalLength;
dataLen = bleData->dataLen;
}
else
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
- if (g_errorHandler)
+ if (g_errorHandler)
{
g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
}
}
}
- if (NULL == g_bleNetworkCbMutex)
- {
- g_bleNetworkCbMutex = oc_mutex_new();
- if (NULL == g_bleNetworkCbMutex)
- {
- OIC_LOG(ERROR, CALEADAPTER_TAG, "oc_mutex_new failed");
- CATerminateLEAdapterMutex();
- return CA_STATUS_FAILED;
- }
- }
-
if (NULL == g_bleLocalAddressMutex)
{
g_bleLocalAddressMutex = oc_mutex_new();
}
}
- if (NULL == g_bleAdapterThreadPoolMutex)
- {
- g_bleAdapterThreadPoolMutex = oc_mutex_new();
- if (NULL == g_bleAdapterThreadPoolMutex)
- {
- OIC_LOG(ERROR, CALEADAPTER_TAG, "oc_mutex_new failed");
- CATerminateLEAdapterMutex();
- return CA_STATUS_FAILED;
- }
- }
-
- if (NULL == g_bleClientSendDataMutex)
- {
- g_bleClientSendDataMutex = oc_mutex_new();
- if (NULL == g_bleClientSendDataMutex)
- {
- OIC_LOG(ERROR, CALEADAPTER_TAG, "oc_mutex_new failed");
- CATerminateLEAdapterMutex();
- return CA_STATUS_FAILED;
- }
- }
-
- if (NULL == g_bleServerSendDataMutex)
- {
- g_bleServerSendDataMutex = oc_mutex_new();
- if (NULL == g_bleServerSendDataMutex)
- {
- OIC_LOG(ERROR, CALEADAPTER_TAG, "oc_mutex_new failed");
- CATerminateLEAdapterMutex();
- return CA_STATUS_FAILED;
- }
- }
-
- if (NULL == g_bleAdapterReqRespCbMutex)
- {
- g_bleAdapterReqRespCbMutex = oc_mutex_new();
- if (NULL == g_bleAdapterReqRespCbMutex)
- {
- OIC_LOG(ERROR, CALEADAPTER_TAG, "oc_mutex_new failed");
- CATerminateLEAdapterMutex();
- return CA_STATUS_FAILED;
- }
- }
+
if (NULL == g_bleServerReceiveDataMutex)
{
oc_mutex_free(g_bleIsServerMutex);
g_bleIsServerMutex = NULL;
- oc_mutex_free(g_bleNetworkCbMutex);
- g_bleNetworkCbMutex = NULL;
-
+
oc_mutex_free(g_bleLocalAddressMutex);
g_bleLocalAddressMutex = NULL;
- oc_mutex_free(g_bleAdapterThreadPoolMutex);
- g_bleAdapterThreadPoolMutex = NULL;
-
- oc_mutex_free(g_bleClientSendDataMutex);
- g_bleClientSendDataMutex = NULL;
-
- oc_mutex_free(g_bleServerSendDataMutex);
- g_bleServerSendDataMutex = NULL;
-
- oc_mutex_free(g_bleAdapterReqRespCbMutex);
- g_bleAdapterReqRespCbMutex = NULL;
+
oc_mutex_free(g_bleServerReceiveDataMutex);
g_bleServerReceiveDataMutex = NULL;
*/
if (CA_STATUS_OK == result)
{
- oc_mutex_lock(g_bleServerSendDataMutex);
result = CAQueueingThreadStart(g_bleServerSendQueueHandle);
- oc_mutex_unlock(g_bleServerSendDataMutex);
-
if (CA_STATUS_OK != result)
{
OIC_LOG_V(ERROR,
#ifndef SINGLE_THREAD
- oc_mutex_lock(g_bleServerSendDataMutex);
CAResult_t res = CAQueueingThreadStop(g_bleServerSendQueueHandle);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "CAQueueingThreadStop has failed");
}
- oc_mutex_unlock(g_bleServerSendDataMutex);
-
res = CAStopLEGattServer();
if (CA_STATUS_OK != res)
{
*/
if (CA_STATUS_OK == result)
{
- oc_mutex_lock(g_bleClientSendDataMutex);
result = CAQueueingThreadStart(g_bleClientSendQueueHandle);
- oc_mutex_unlock(g_bleClientSendDataMutex);
-
if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR,
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "%s", __func__);
CAStopLEGattClient();
- oc_mutex_lock(g_bleClientSendDataMutex);
CAResult_t result = CAQueueingThreadStop(g_bleClientSendQueueHandle);
- oc_mutex_unlock(g_bleClientSendDataMutex);
-
+
return result;
#else
CAStopLEGattClient();
return ret;
}
-void CALESecureReceiveDataCB(const CASecureEndpoint_t *sep, const void *data,
+CAResult_t CALESecureReceiveDataCB(const CASecureEndpoint_t *sep, const void *data,
size_t dataLen)
{
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "%s", __func__);
- VERIFY_NON_NULL_VOID(sep, CALEADAPTER_TAG, "sep is NULL");
- VERIFY_NON_NULL_VOID(data, CALEADAPTER_TAG, "data is NULL");
+ VERIFY_NON_NULL(sep, CALEADAPTER_TAG, "sep is NULL");
+ VERIFY_NON_NULL(data, CALEADAPTER_TAG, "data is NULL");
OIC_LOG_V(DEBUG, CALEADAPTER_TAG,
"Secure Data Receive - decrypted datalen = %d", dataLen);
if (dataLen <= 0)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "incorrect dataLen, derecypt fail !");
- return;
+ return CA_STATUS_INVALID_PARAM;
}
OIC_LOG_BUFFER(DEBUG, CALEADAPTER_TAG, data, dataLen);
+ CAResult_t res = CA_STATUS_OK;
if (g_networkPacketReceivedCallback)
{
OIC_LOG_V(DEBUG, CALEADAPTER_TAG,
sep->endpoint.flags, sep->endpoint.flags);
OIC_LOG(DEBUG, CALEADAPTER_TAG,
"[CALESecureReceiveDataCB] Received data up !");
- g_networkPacketReceivedCallback(sep, data, dataLen);
+ res = g_networkPacketReceivedCallback(sep, data, dataLen);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Error parsing CoAP data, res = %d", res);
+ }
}
+ return res;
}
#endif
static CAResult_t CAStopLE()
{
-#ifdef __WITH_DTLS__
- CAdeinitSslAdapter();
-#endif
#ifndef SINGLE_THREAD
CAStopLEQueues();
g_dataType = dataType;
oc_mutex_unlock(g_bleIsServerMutex);
- result = CAencryptSsl(endpoint, data, dataLen);
+ result = CAencryptSsl(endpoint, (void *)data, dataLen);
if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "caadapternetdtlsencrypt failed!");
g_dataType = dataType;
oc_mutex_unlock(g_bleIsServerMutex);
- result = CAencryptSsl(endpoint, data, dataLen);
+ result = CAencryptSsl(endpoint, (void *)data, dataLen);
if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR, CALEADAPTER_TAG, "caadapternetdtlsencrypt failed!");
{
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "IN %s", __func__);
- oc_mutex_lock(g_bleNetworkCbMutex);
g_networkCallback = netCallback;
g_connectionCallback = connCallback;
- oc_mutex_unlock(g_bleNetworkCbMutex);
CAResult_t res = CA_STATUS_OK;
if (netCallback)
{
// remove data of send queue.
if (g_bleClientSendQueueHandle)
{
- CALERemoveSendQueueData(g_bleClientSendQueueHandle,
- g_bleClientSendDataMutex,
- address);
+ CALERemoveSendQueueData(g_bleClientSendQueueHandle, address);
}
if (g_bleServerSendQueueHandle)
{
- CALERemoveSendQueueData(g_bleServerSendQueueHandle,
- g_bleServerSendDataMutex,
- address);
+ CALERemoveSendQueueData(g_bleServerSendQueueHandle, address);
}
#endif
VERIFY_NON_NULL_RET(g_bleClientSendQueueHandle, CALEADAPTER_TAG,
"g_bleClientSendQueueHandle is NULL",
CA_STATUS_FAILED);
- VERIFY_NON_NULL_RET(g_bleClientSendDataMutex, CALEADAPTER_TAG,
- "g_bleClientSendDataMutex is NULL",
- CA_STATUS_FAILED);
-
+
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Data Sending to LE layer [%u]", dataLen);
CALEData_t *bleData = CACreateLEData(remoteEndpoint, data, dataLen, NULL);
return CA_MEMORY_ALLOC_FAILED;
}
// Add message to send queue
- oc_mutex_lock(g_bleClientSendDataMutex);
- CAQueueingThreadAddData(g_bleClientSendQueueHandle, bleData, sizeof(CALEData_t));
- oc_mutex_unlock(g_bleClientSendDataMutex);
+
+ CAResult_t res = CAQueueingThreadAddData(g_bleClientSendQueueHandle, bleData,
+ sizeof(CALEData_t));
+ if (CA_STATUS_OK != res)
+ {
+ CALEDataDestroyer(bleData, sizeof(CALEData_t));
+ }
#endif
return CA_STATUS_OK;
}
}
#else
VERIFY_NON_NULL_RET(g_bleServerSendQueueHandle, CALEADAPTER_TAG,
- "BleClientReceiverQueue is NULL",
- CA_STATUS_FAILED);
- VERIFY_NON_NULL_RET(g_bleServerSendDataMutex, CALEADAPTER_TAG,
- "BleClientSendDataMutex is NULL",
- CA_STATUS_FAILED);
-
- VERIFY_NON_NULL_RET(g_bleServerSendQueueHandle, CALEADAPTER_TAG, "sendQueueHandle",
+ "g_bleServerSendQueueHandle is NULL",
CA_STATUS_FAILED);
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Data Sending to LE layer [%d]", dataLen);
}
// Add message to send queue
- oc_mutex_lock(g_bleServerSendDataMutex);
- CAQueueingThreadAddData(g_bleServerSendQueueHandle,
- bleData,
- sizeof(CALEData_t));
- oc_mutex_unlock(g_bleServerSendDataMutex);
+
+ CAResult_t res = CAQueueingThreadAddData(g_bleServerSendQueueHandle,
+ bleData,
+ sizeof(CALEData_t));
+ if (CA_STATUS_OK != res)
+ {
+ CALEDataDestroyer(bleData, sizeof(CALEData_t));
+ }
#endif
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "OUT %s", __func__);
return CA_STATUS_OK;
static void CASetLEAdapterThreadPoolHandle(ca_thread_pool_t handle)
{
- oc_mutex_lock(g_bleAdapterThreadPoolMutex);
g_bleAdapterThreadPool = handle;
- oc_mutex_unlock(g_bleAdapterThreadPoolMutex);
+
}
static void CASetLEReqRespAdapterCallback(CANetworkPacketReceivedCallback callback)
{
- oc_mutex_lock(g_bleAdapterReqRespCbMutex);
-
g_networkPacketReceivedCallback = callback;
- oc_mutex_unlock(g_bleAdapterReqRespCbMutex);
}
static void CALEErrorHandler(const char *remoteAddress,
}
#ifndef SINGLE_THREAD
-static void CALERemoveSendQueueData(CAQueueingThread_t *queueHandle, oc_mutex mutex,
- const char* address)
+static bool CALEClearQueueAddressDataContext(void *data, uint32_t size, void *ctx)
+{
+ if (NULL == data || NULL == ctx)
+ {
+ return false;
+ }
+
+ CALEData_t *caLeData = (CALEData_t *)data;
+ const char *address = (const char *)ctx;
+
+ if (NULL != caLeData && NULL != caLeData->remoteEndpoint)
+ {
+ if (!strcasecmp(caLeData->remoteEndpoint->addr, address))
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
+static void CALERemoveSendQueueData(CAQueueingThread_t *queueHandle, const char* address)
{
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "%s", __func__);
VERIFY_NON_NULL_VOID(queueHandle, CALEADAPTER_TAG, "queueHandle");
VERIFY_NON_NULL_VOID(address, CALEADAPTER_TAG, "address");
- oc_mutex_lock(mutex);
- while (u_queue_get_size(queueHandle->dataQueue) > 0)
+ CAResult_t res = CAQueueingThreadClearContextData(queueHandle,
+ CALEClearQueueAddressDataContext,
+ address);
+ if (CA_STATUS_OK != res)
{
- OIC_LOG(DEBUG, CALEADAPTER_TAG, "get data from queue");
- u_queue_message_t *message = u_queue_get_element(queueHandle->dataQueue);
- if (NULL != message)
- {
- CALEData_t *bleData = (CALEData_t *) message->msg;
- if (bleData && bleData->remoteEndpoint)
- {
- if (!strcasecmp(bleData->remoteEndpoint->addr, address))
- {
- OIC_LOG(DEBUG, CALEADAPTER_TAG, "found the message of disconnected device");
- if (NULL != queueHandle->destroy)
- {
- queueHandle->destroy(message->msg, message->size);
- }
- else
- {
- OICFree(message->msg);
- }
-
- OICFree(message);
- }
- }
- }
+
+ OIC_LOG(ERROR, CALEADAPTER_TAG, "Could not clear the send queue");
}
- oc_mutex_unlock(mutex);
+
}
static void CALERemoveReceiveQueueData(u_arraylist_t *dataInfoList, const char* address)
projects / platform / upstream / iotivity.git / blobdiff