#else
#define CA_MAX_RT_ARRAY_SIZE 3
-#endif /* SINGLE_THREAD */
+#endif // SINGLE_THREAD
-#define TAG "CA_MSG_HNDLR"
+#define TAG "OIC_CA_MSG_HANDLE"
static CARetransmission_t g_retransmissionContext;
#ifdef WITH_BWT
void CAAddDataToSendThread(CAData_t *data)
{
- OIC_LOG(DEBUG, TAG, "IN");
VERIFY_NON_NULL_VOID(data, TAG, "data");
// add thread
CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
-
- OIC_LOG(DEBUG, TAG, "OUT");
}
void CAAddDataToReceiveThread(CAData_t *data)
{
- OIC_LOG(DEBUG, TAG, "IN - CAAddDataToReceiveThread");
VERIFY_NON_NULL_VOID(data, TAG, "data");
// add thread
CAQueueingThreadAddData(&g_receiveThread, data, sizeof(CAData_t));
-
- OIC_LOG(DEBUG, TAG, "OUT - CAAddDataToReceiveThread");
}
#endif
cadata->remoteEndpoint = ep;
cadata->dataType = dataType;
- return cadata;
-
OIC_LOG(DEBUG, TAG, "CAGenerateHandlerData OUT");
+ return cadata;
}
static void CATimeoutCallback(const CAEndpoint_t *endpoint, const void *pdu, uint32_t size)
{
- OIC_LOG(DEBUG, TAG, "IN");
VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint");
VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
#else
CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
#endif
-
- OIC_LOG(DEBUG, TAG, "OUT");
}
static void CADestroyData(void *data, uint32_t size)
g_errorHandler(rep, data->errorInfo);
}
-#ifdef SINGLE_THREAD
CADestroyData(data, sizeof(CAData_t));
-#endif
OIC_LOG(DEBUG, TAG, "CAProcessReceivedData OUT");
}
#endif
#ifndef SINGLE_THREAD
-
static void CAReceiveThreadProcess(void *threadData)
{
- OIC_LOG(DEBUG, TAG, "IN");
#ifndef SINGLE_HANDLE
CAData_t *data = (CAData_t *) threadData;
CAProcessReceivedData(data);
#else
(void)threadData;
#endif
- OIC_LOG(DEBUG, TAG, "OUT");
}
-#endif
+#endif // SINGLE_THREAD
static CAResult_t CAProcessSendData(const CAData_t *data)
{
- OIC_LOG(DEBUG, TAG, "IN");
VERIFY_NON_NULL(data, TAG, "data");
VERIFY_NON_NULL(data->remoteEndpoint, TAG, "remoteEndpoint");
coap_pdu_t *pdu = NULL;
CAInfo_t *info = NULL;
+ coap_list_t *options = NULL;
+ coap_transport_type transport;
if (SEND_TYPE_UNICAST == type)
{
#ifdef ROUTING_GATEWAY
skipRetransmission = data->requestInfo->info.skipRetransmission;
#endif
- pdu = CAGeneratePDU(data->requestInfo->method, info, data->remoteEndpoint);
+ pdu = CAGeneratePDU(data->requestInfo->method, info, data->remoteEndpoint,
+ &options, &transport);
}
else if (NULL != data->responseInfo)
{
#ifdef ROUTING_GATEWAY
skipRetransmission = data->responseInfo->info.skipRetransmission;
#endif
- pdu = CAGeneratePDU(data->responseInfo->result, info, data->remoteEndpoint);
+ pdu = CAGeneratePDU(data->responseInfo->result, info, data->remoteEndpoint,
+ &options, &transport);
}
else
{
if (NULL != info)
{
CAResult_t res = CAAddBlockOption(&pdu, info,
- data->remoteEndpoint);
+ data->remoteEndpoint,
+ &options);
if (CA_STATUS_OK != res)
{
OIC_LOG(INFO, TAG, "to write block option has failed");
CAErrorHandler(data->remoteEndpoint, pdu->hdr, pdu->length, res);
+ coap_delete_list(options);
coap_delete_pdu(pdu);
return res;
}
}
}
-#endif
+#endif // WITH_BWT
CALogPDUInfo(pdu, data->remoteEndpoint);
res = CASendUnicastData(data->remoteEndpoint, pdu->hdr, pdu->length);
{
OIC_LOG_V(ERROR, TAG, "send failed:%d", res);
CAErrorHandler(data->remoteEndpoint, pdu->hdr, pdu->length, res);
+ coap_delete_list(options);
coap_delete_pdu(pdu);
return res;
}
{
//when retransmission not supported this will return CA_NOT_SUPPORTED, ignore
OIC_LOG_V(INFO, TAG, "retransmission is not enabled due to error, res : %d", res);
+ coap_delete_list(options);
coap_delete_pdu(pdu);
return res;
}
}
+ coap_delete_list(options);
coap_delete_pdu(pdu);
}
else
OIC_LOG(DEBUG, TAG, "requestInfo is available..");
info = &data->requestInfo->info;
- pdu = CAGeneratePDU(CA_GET, info, data->remoteEndpoint);
+ pdu = CAGeneratePDU(CA_GET, info, data->remoteEndpoint, &options, &transport);
+
if (NULL != pdu)
{
#ifdef WITH_BWT
)
{
// Blockwise transfer
- CAResult_t res = CAAddBlockOption(&pdu, &data->requestInfo->info,
- data->remoteEndpoint);
+ CAResult_t res = CAAddBlockOption(&pdu, info,
+ data->remoteEndpoint,
+ &options);
if (CA_STATUS_OK != res)
{
OIC_LOG(DEBUG, TAG, "CAAddBlockOption has failed");
CAErrorHandler(data->remoteEndpoint, pdu->hdr, pdu->length, res);
+ coap_delete_list(options);
coap_delete_pdu(pdu);
return res;
}
}
-#endif
+#endif // WITH_BWT
}
else
{
OIC_LOG(DEBUG, TAG, "responseInfo is available..");
info = &data->responseInfo->info;
- pdu = CAGeneratePDU(data->responseInfo->result, info, data->remoteEndpoint);
+ pdu = CAGeneratePDU(data->responseInfo->result, info, data->remoteEndpoint,
+ &options, &transport);
if (NULL != pdu)
{
if (NULL != info)
{
CAResult_t res = CAAddBlockOption(&pdu, info,
- data->remoteEndpoint);
+ data->remoteEndpoint,
+ &options);
if (CA_STATUS_OK != res)
{
OIC_LOG(INFO, TAG, "to write block option has failed");
CAErrorHandler(data->remoteEndpoint, pdu->hdr, pdu->length, res);
+ coap_delete_list(options);
coap_delete_pdu(pdu);
return res;
}
}
}
-#endif
+#endif // WITH_BWT
}
else
{
CALogPDUInfo(pdu, data->remoteEndpoint);
OIC_LOG(DEBUG, TAG, "pdu to send :");
- OIC_LOG_BUFFER(DEBUG, TAG, pdu->hdr, pdu->length);
+ OIC_LOG_BUFFER(DEBUG, TAG, (uint8_t*)pdu->hdr, pdu->length);
res = CASendMulticastData(data->remoteEndpoint, pdu->hdr, pdu->length);
if (CA_STATUS_OK != res)
{
OIC_LOG_V(ERROR, TAG, "send failed:%d", res);
CAErrorHandler(data->remoteEndpoint, pdu->hdr, pdu->length, res);
+ coap_delete_list(options);
coap_delete_pdu(pdu);
return res;
}
+ coap_delete_list(options);
coap_delete_pdu(pdu);
}
CAData_t *data = (CAData_t *) threadData;
CAProcessSendData(data);
}
-
#endif
/*
if ((familyFlags ^ item->flags) == CA_IPFAMILY_MASK)
{
OIC_LOG_V(INFO, TAG, "IPv%c duplicate message ignored",
- familyFlags & CA_IPV6 ? '6' : '4');
+ familyFlags & CA_IPV6 ? '6' : '4');
ret = true;
break;
}
static void CAReceivedPacketCallback(const CASecureEndpoint_t *sep,
const void *data, uint32_t dataLen)
{
- OIC_LOG(DEBUG, TAG, "IN");
VERIFY_NON_NULL_VOID(sep, TAG, "remoteEndpoint");
VERIFY_NON_NULL_VOID(data, TAG, "data");
)
{
CAResult_t res = CAReceiveBlockWiseData(pdu, &(sep->endpoint), cadata, dataLen);
- if (CA_NOT_SUPPORTED == res)
+ if (CA_NOT_SUPPORTED == res || CA_REQUEST_TIMEOUT == res)
{
OIC_LOG(ERROR, TAG, "this message does not have block option");
CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
{
CAQueueingThreadAddData(&g_receiveThread, cadata, sizeof(CAData_t));
}
-#endif
+#endif // SINGLE_THREAD
coap_delete_pdu(pdu);
-
- OIC_LOG(DEBUG, TAG, "OUT");
}
static void CANetworkChangedCallback(const CAEndpoint_t *info, CANetworkStatus_t status)
ca_mutex_unlock(g_receiveThread.threadMutex);
- if (NULL == item)
- {
- return;
- }
-
- // get values
- void *msg = item->msg;
-
- if (NULL == msg)
+ if (NULL == item || NULL == item->msg)
{
return;
}
// get endpoint
- CAData_t *td = (CAData_t *) msg;
+ CAData_t *td = (CAData_t *) item->msg;
if (td->requestInfo && g_requestHandler)
{
g_errorHandler(td->remoteEndpoint, td->errorInfo);
}
- CADestroyData(msg, sizeof(CAData_t));
+ CADestroyData(item->msg, sizeof(CAData_t));
OICFree(item);
-#endif /* SINGLE_HANDLE */
-#endif
+#endif // SINGLE_HANDLE
+#endif // SINGLE_THREAD
}
static CAData_t* CAPrepareSendData(const CAEndpoint_t *endpoint, const void *sendData,
return cadata;
}
-CAResult_t CADetachRequestMessage(const CAEndpoint_t *object, const CARequestInfo_t *request)
+CAResult_t CADetachSendMessage(const CAEndpoint_t *endpoint, const void *sendMsg,
+ CADataType_t dataType)
{
- OIC_LOG(DEBUG, TAG, "IN");
-
- VERIFY_NON_NULL(object, TAG, "object");
- VERIFY_NON_NULL(request, TAG, "request");
+ VERIFY_NON_NULL(endpoint, TAG, "endpoint");
+ VERIFY_NON_NULL(sendMsg, TAG, "sendMsg");
if (false == CAIsSelectedNetworkAvailable())
{
OIC_LOG(ERROR, TAG, "max RT queue size reached!");
return CA_SEND_FAILED;
}
-#endif /* ARDUINO */
+#endif // ARDUINO
- CAData_t *data = CAPrepareSendData(object, request, CA_REQUEST_DATA);
+ CAData_t *data = CAPrepareSendData(endpoint, sendMsg, dataType);
if(!data)
{
OIC_LOG(ERROR, TAG, "CAPrepareSendData failed");
if(CA_STATUS_OK != result)
{
OIC_LOG(ERROR, TAG, "CAProcessSendData failed");
+ CADestroyData(data, sizeof(CAData_t));
return result;
}
CADestroyData(data, sizeof(CAData_t));
#else
#ifdef WITH_BWT
- if (CA_ADAPTER_GATT_BTLE != object->adapter
+ if (CA_ADAPTER_GATT_BTLE != endpoint->adapter
#ifdef TCP_ADAPTER
- && CA_ADAPTER_TCP != object->adapter
+ && CA_ADAPTER_TCP != endpoint->adapter
#endif
)
{
return res;
}
else
-#endif
+#endif // WITH_BWT
{
CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
}
-#endif
+#endif // SINGLE_THREAD
- OIC_LOG(DEBUG, TAG, "OUT");
- return CA_STATUS_OK;
-}
-
-CAResult_t CADetachResponseMessage(const CAEndpoint_t *object,
- const CAResponseInfo_t *response)
-{
- OIC_LOG(DEBUG, TAG, "IN");
- VERIFY_NON_NULL(object, TAG, "object");
- VERIFY_NON_NULL(response, TAG, "response");
-
- if (false == CAIsSelectedNetworkAvailable())
- {
- return CA_STATUS_FAILED;
- }
-
- CAData_t *data = CAPrepareSendData(object, response, CA_RESPONSE_DATA);
- if(!data)
- {
- OIC_LOG(ERROR, TAG, "CAPrepareSendData failed");
- return CA_MEMORY_ALLOC_FAILED;
- }
-
-#ifdef SINGLE_THREAD
- CAResult_t result = CAProcessSendData(data);
- if(result != CA_STATUS_OK)
- {
- OIC_LOG(ERROR, TAG, "CAProcessSendData failed");
- return result;
- }
-
- CADestroyData(data, sizeof(CAData_t));
-#else
-#ifdef WITH_BWT
- if (CA_ADAPTER_GATT_BTLE != object->adapter
-#ifdef TCP_ADAPTER
- && CA_ADAPTER_TCP != object->adapter
-#endif
- )
- {
- // send block data
- CAResult_t res = CASendBlockWiseData(data);
- if(CA_NOT_SUPPORTED == res)
- {
- OIC_LOG(DEBUG, TAG, "normal msg will be sent");
- CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
- return CA_STATUS_OK;
- }
- else
- {
- CADestroyData(data, sizeof(CAData_t));
- }
- return res;
- }
- else
-#endif
- {
- CAQueueingThreadAddData(&g_sendThread, data, sizeof(CAData_t));
- }
-#endif
-
- OIC_LOG(DEBUG, TAG, "OUT");
return CA_STATUS_OK;
}
void CASetInterfaceCallbacks(CARequestCallback ReqHandler, CAResponseCallback RespHandler,
CAErrorCallback errorHandler)
{
- OIC_LOG(DEBUG, TAG, "IN");
g_requestHandler = ReqHandler;
g_responseHandler = RespHandler;
g_errorHandler = errorHandler;
- OIC_LOG(DEBUG, TAG, "OUT");
}
CAResult_t CAInitializeMessageHandler()
{
- OIC_LOG(DEBUG, TAG, "IN");
CASetPacketReceivedCallback(CAReceivedPacketCallback);
CASetNetworkChangeCallback(CANetworkChangedCallback);
#ifndef SINGLE_THREAD
// create thread pool
CAResult_t res = ca_thread_pool_init(MAX_THREAD_POOL_SIZE, &g_threadPoolHandle);
-
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "thread pool initialize error.");
}
// send thread initialize
- if (CA_STATUS_OK != CAQueueingThreadInitialize(&g_sendThread, g_threadPoolHandle,
- CASendThreadProcess, CADestroyData))
+ res = CAQueueingThreadInitialize(&g_sendThread, g_threadPoolHandle,
+ CASendThreadProcess, CADestroyData);
+ if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "Failed to Initialize send queue thread");
- return CA_STATUS_FAILED;
+ ca_thread_pool_free(g_threadPoolHandle);
+ g_threadPoolHandle = NULL;
+ return res;
}
// start send thread
res = CAQueueingThreadStart(&g_sendThread);
-
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "thread start error(send thread).");
ca_thread_pool_free(g_threadPoolHandle);
g_threadPoolHandle = NULL;
+ CAQueueingThreadDestroy(&g_sendThread);
return res;
}
// receive thread initialize
- if (CA_STATUS_OK != CAQueueingThreadInitialize(&g_receiveThread, g_threadPoolHandle,
- CAReceiveThreadProcess, CADestroyData))
+ res = CAQueueingThreadInitialize(&g_receiveThread, g_threadPoolHandle,
+ CAReceiveThreadProcess, CADestroyData);
+ if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "Failed to Initialize receive queue thread");
- return CA_STATUS_FAILED;
+ ca_thread_pool_free(g_threadPoolHandle);
+ g_threadPoolHandle = NULL;
+ CAQueueingThreadDestroy(&g_sendThread);
+ return res;
}
#ifndef SINGLE_HANDLE // This will be enabled when RI supports multi threading
// start receive thread
- res = CAQueueingThreadStart(&gReceiveThread);
-
- if (res != CA_STATUS_OK)
+ res = CAQueueingThreadStart(&g_receiveThread);
+ if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "thread start error(receive thread).");
+ ca_thread_pool_free(g_threadPoolHandle);
+ g_threadPoolHandle = NULL;
+ CAQueueingThreadDestroy(&g_sendThread);
+ CAQueueingThreadDestroy(&g_receiveThread);
return res;
}
-#endif /* SINGLE_HANDLE */
+#endif // SINGLE_HANDLE
// retransmission initialize
- CARetransmissionInitialize(&g_retransmissionContext, g_threadPoolHandle, CASendUnicastData,
- CATimeoutCallback, NULL);
+ res = CARetransmissionInitialize(&g_retransmissionContext, g_threadPoolHandle,
+ CASendUnicastData, CATimeoutCallback, NULL);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "Failed to Initialize Retransmission.");
+ ca_thread_pool_free(g_threadPoolHandle);
+ g_threadPoolHandle = NULL;
+ CAQueueingThreadDestroy(&g_sendThread);
+ CAQueueingThreadDestroy(&g_receiveThread);
+ return res;
+ }
#ifdef WITH_BWT
// block-wise transfer initialize
- CAInitializeBlockWiseTransfer(CAAddDataToSendThread, CAAddDataToReceiveThread);
+ res = CAInitializeBlockWiseTransfer(CAAddDataToSendThread, CAAddDataToReceiveThread);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "Failed to Initialize BlockWiseTransfer.");
+ ca_thread_pool_free(g_threadPoolHandle);
+ g_threadPoolHandle = NULL;
+ CAQueueingThreadDestroy(&g_sendThread);
+ CAQueueingThreadDestroy(&g_receiveThread);
+ CARetransmissionDestroy(&g_retransmissionContext);
+ return res;
+ }
#endif
// start retransmission
res = CARetransmissionStart(&g_retransmissionContext);
-
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "thread start error(retransmission thread).");
+ ca_thread_pool_free(g_threadPoolHandle);
+ g_threadPoolHandle = NULL;
+ CAQueueingThreadDestroy(&g_sendThread);
+ CAQueueingThreadDestroy(&g_receiveThread);
+ CARetransmissionDestroy(&g_retransmissionContext);
return res;
}
CAInitializeAdapters(g_threadPoolHandle);
#else
// retransmission initialize
- CARetransmissionInitialize(&g_retransmissionContext, NULL, CASendUnicastData,
- CATimeoutCallback, NULL);
+ CAResult_t res = CARetransmissionInitialize(&g_retransmissionContext, NULL, CASendUnicastData,
+ CATimeoutCallback, NULL);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "Failed to Initialize Retransmission.");
+ return res;
+ }
+
CAInitializeAdapters();
-#endif
+#endif // SINGLE_THREAD
- OIC_LOG(DEBUG, TAG, "OUT");
return CA_STATUS_OK;
}
void CATerminateMessageHandler()
{
- OIC_LOG(DEBUG, TAG, "IN");
#ifndef SINGLE_THREAD
CATransportAdapter_t connType;
u_arraylist_t *list = CAGetSelectedNetworkList();
if (NULL != g_receiveThread.threadMutex)
{
#ifndef SINGLE_HANDLE // This will be enabled when RI supports multi threading
- CAQueueingThreadStop(&gReceiveThread);
-#endif /* SINGLE_HANDLE */
+ CAQueueingThreadStop(&g_receiveThread);
+#endif
}
// destroy thread pool
// stop retransmission
CARetransmissionStop(&g_retransmissionContext);
CARetransmissionDestroy(&g_retransmissionContext);
-#endif
-
- OIC_LOG(DEBUG, TAG, "OUT");
+#endif // SINGLE_THREAD
}
void CALogPDUInfo(coap_pdu_t *pdu, const CAEndpoint_t *endpoint)
{
VERIFY_NON_NULL_VOID(pdu, TAG, "pdu");
+ VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint");
OIC_LOG_V(DEBUG, TAG, "PDU Maker - payload : %s", pdu->data);
if (CA_ADAPTER_TCP == endpoint->adapter)
{
OIC_LOG(DEBUG, TAG, "pdu header data :");
- OIC_LOG_BUFFER(DEBUG, TAG, pdu->hdr, pdu->length);
+ OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) pdu->hdr, pdu->length);
}
else
+#else
+ (void) endpoint;
#endif
{
OIC_LOG_V(DEBUG, TAG, "PDU Maker - type : %d", pdu->hdr->coap_hdr_udp_t.type);
{
for (uint32_t i = 0; i < info->numOptions; i++)
{
- OIC_LOG_V(DEBUG, TAG, "optionID: %d", info->options[i].optionID);
+ OIC_LOG_V(DEBUG, TAG, "optionID: %u", info->options[i].optionID);
OIC_LOG_V(DEBUG, TAG, "list: %s", info->options[i].optionData);
}
if (info->payload)
{
- OIC_LOG_V(DEBUG, TAG, "payload: %p(%u)", info->payload,
+ OIC_LOG_V(DEBUG, TAG, "payload: %p(%zu)", info->payload,
info->payloadSize);
}
OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) info->token,
info->tokenLength);
}
- OIC_LOG_V(DEBUG, TAG, "msgID: %d", info->messageId);
+ OIC_LOG_V(DEBUG, TAG, "msgID: %u", info->messageId);
}
else
{
OIC_LOG(DEBUG, TAG, "CAErrorHandler IN");
#ifndef SINGLE_THREAD
-
VERIFY_NON_NULL_VOID(endpoint, TAG, "remoteEndpoint");
VERIFY_NON_NULL_VOID(data, TAG, "data");
CAData_t *cadata = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
if (!cadata)
{
- OIC_LOG(ERROR, TAG, "memory allocation failed");
+ OIC_LOG(ERROR, TAG, "cadata memory allocation failed");
return;
}
CAErrorInfo_t *errorInfo = (CAErrorInfo_t *)OICCalloc(1, sizeof (CAErrorInfo_t));
if (!errorInfo)
{
+ OIC_LOG(ERROR, TAG, "errorInfo memory allocation failed");
OICFree(cadata);
CAFreeEndpoint(ep);
return;
CAResult_t res = CACloneInfo(info, &errorInfo->info);
if (CA_STATUS_OK != res)
{
+ OIC_LOG(ERROR, TAG, "info clone failed");
OICFree(cadata);
+ OICFree(errorInfo);
CAFreeEndpoint(ep);
return;
}
projects / platform / upstream / iotivity.git / blobdiff