#include "camutex.h"
#include "logger.h"
-#define TAG "CA_BWT"
+#define TAG "OIC_CA_BWT"
-#define BLOCKWISE_OPTION_BUFFER 3
+#define BLOCKWISE_OPTION_BUFFER (sizeof(unsigned int))
#define BLOCK_NUMBER_IDX 4
#define BLOCK_M_BIT_IDX 3
+#define PORT_LENGTH 2
#define BLOCK_SIZE(arg) (1 << ((arg) + 4))
// context for block-wise transfer
-static CABlockWiseContext_t g_context = { 0 };
+static CABlockWiseContext_t g_context = { .sendThreadFunc = NULL,
+ .receivedThreadFunc = NULL,
+ .dataList = NULL };
+
+static bool CACheckPayloadLength(const CAData_t *sendData)
+{
+ size_t payloadLen = 0;
+ CAGetPayloadInfo(sendData, &payloadLen);
+
+ // check if message has to be transfered to a block
+ size_t maxBlockSize = BLOCK_SIZE(CA_DEFAULT_BLOCK_SIZE);
+ OIC_LOG_V(DEBUG, TAG, "payloadLen=%zu, maxBlockSize=%zu", payloadLen, maxBlockSize);
+
+ if (payloadLen <= maxBlockSize)
+ {
+ return false;
+ }
+
+ return true;
+}
CAResult_t CAInitializeBlockWiseTransfer(CASendThreadFunc sendThreadFunc,
CAReceiveThreadFunc receivedThreadFunc)
CAResult_t res = CAInitBlockWiseMutexVariables();
if (CA_STATUS_OK != res)
{
+ u_arraylist_free(&g_context.dataList);
+ g_context.dataList = NULL;
OIC_LOG(ERROR, TAG, "init has failed");
}
CAResult_t CAInitBlockWiseMutexVariables()
{
- OIC_LOG(DEBUG, TAG, "IN");
-
- if (NULL == g_context.blockDataListMutex)
+ if (!g_context.blockDataListMutex)
{
g_context.blockDataListMutex = ca_mutex_new();
- if (NULL == g_context.blockDataListMutex)
+ if (!g_context.blockDataListMutex)
{
OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
- if (NULL == g_context.blockDataSenderMutex)
+ if (!g_context.blockDataSenderMutex)
{
g_context.blockDataSenderMutex = ca_mutex_new();
- if (NULL == g_context.blockDataSenderMutex)
+ if (!g_context.blockDataSenderMutex)
{
OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
CATerminateBlockWiseMutexVariables();
void CATerminateBlockWiseMutexVariables()
{
- OIC_LOG(DEBUG, TAG, "IN");
-
if (g_context.blockDataListMutex)
{
ca_mutex_free(g_context.blockDataListMutex);
VERIFY_NON_NULL(sendData, TAG, "sendData");
// check if message type is CA_MSG_RESET
- if (NULL != sendData->responseInfo)
+ if (sendData->requestInfo)
+ {
+ if (CA_MSG_RESET == sendData->requestInfo->info.type)
+ {
+ OIC_LOG(DEBUG, TAG, "reset message can't be sent to the block");
+ return CA_NOT_SUPPORTED;
+ }
+ }
+ else if (sendData->responseInfo)
{
if (CA_MSG_RESET == sendData->responseInfo->info.type)
{
if (CA_STATUS_OK != res)
{
// #2. if it is not included, add the data into list
- if (NULL == currData)
+ if (!currData)
{
OIC_LOG(DEBUG, TAG, "There is no block data");
+
+ bool isBlock = CACheckPayloadLength(sendData);
+ if (!isBlock)
+ {
+ if (sendData->requestInfo)
+ {
+ currData = CACreateNewBlockData(sendData);
+ if (!currData)
+ {
+ OIC_LOG(ERROR, TAG, "failed to create block data");
+ return CA_MEMORY_ALLOC_FAILED;
+ }
+ }
+ return CA_NOT_SUPPORTED;
+ }
currData = CACreateNewBlockData(sendData);
- if (NULL == currData)
+ if (!currData)
{
OIC_LOG(ERROR, TAG, "failed to create block data");
return CA_MEMORY_ALLOC_FAILED;
{
// #4. send block message
OIC_LOG(DEBUG, TAG, "send first block msg");
- CALogBlockInfo(&currData->block);
-
res = CAAddSendThreadQueue(currData->sentData,
- (const unsigned char*) currData->token);
+ (const CABlockDataID_t *)&currData->blockDataId);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
return res;
}
-CAResult_t CAAddSendThreadQueue(const CAData_t *sendData, const unsigned char* token)
+CAResult_t CAAddSendThreadQueue(const CAData_t *sendData, const CABlockDataID_t *blockID)
{
VERIFY_NON_NULL(sendData, TAG, "sendData");
- VERIFY_NON_NULL(token, TAG, "token");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
CAData_t *cloneData = CACloneCAData(sendData);
- if (NULL == cloneData)
+ if (!cloneData)
{
OIC_LOG(ERROR, TAG, "clone has failed");
- CARemoveBlockDataFromList(token);
+ CARemoveBlockDataFromList(blockID);
return CA_STATUS_FAILED;
}
g_context.sendThreadFunc(cloneData);
ca_mutex_unlock(g_context.blockDataSenderMutex);
}
+ else
+ {
+ CADestroyDataSet(cloneData);
+ }
return CA_STATUS_OK;
}
VERIFY_NON_NULL(currData, TAG, "currData");
VERIFY_NON_NULL(currData->sentData, TAG, "currData->sentData");
- size_t payloadLen = 0;
- CAGetPayloadInfo(currData->sentData, &payloadLen);
-
- // check if message has to be transfered to a block
- size_t maxBlockSize = BLOCK_SIZE(CA_DEFAULT_BLOCK_SIZE);
- if (payloadLen <= maxBlockSize)
+ bool isBlock = CACheckPayloadLength(currData->sentData);
+ if (!isBlock)
{
- OIC_LOG_V(DEBUG, TAG, "payloadLen=%d, maxBlockSize=%d", payloadLen, maxBlockSize);
return CA_NOT_SUPPORTED;
}
- // check if next block are required to transfer
- CAGetMoreBitFromBlock(payloadLen, &currData->block);
-
// set block option (COAP_OPTION_BLOCK2 or COAP_OPTION_BLOCK1)
- if (NULL != currData->sentData->requestInfo) // request message
+ if (currData->sentData->requestInfo) // request message
{
- if (currData->block.m)
- {
- OIC_LOG(DEBUG, TAG, "no ACK, option1");
- currData->type = COAP_OPTION_BLOCK1;
- }
- else
- {
- OIC_LOG(DEBUG, TAG, "no ACK, normal req");
- }
+ currData->type = COAP_OPTION_BLOCK1;
}
else // response message
{
- if (currData->block.m)
- {
- OIC_LOG(DEBUG, TAG, "ACK, option2");
- currData->type = COAP_OPTION_BLOCK2;
- }
- else
- {
- OIC_LOG(DEBUG, TAG, "ACK, normal res");
- }
+ currData->type = COAP_OPTION_BLOCK2;
}
return CA_STATUS_OK;
}
-CAResult_t CAReceiveBlockWiseData(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+// TODO make pdu const after libcoap is updated to support that.
+CAResult_t CAReceiveBlockWiseData(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, size_t dataLen)
{
OIC_LOG(DEBUG, TAG, "CAReceiveBlockWiseData");
VERIFY_NON_NULL(receivedData, TAG, "receivedData");
// check if received message type is CA_MSG_RESET
- if (CA_EMPTY == pdu->hdr->code)
+ if (CA_EMPTY == pdu->hdr->coap_hdr_udp_t.code)
{
OIC_LOG(DEBUG, TAG, "code is CA_EMPTY..");
return res;
}
- CARemoveBlockDataFromList((const unsigned char*) receivedData->responseInfo->info.token);
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ receivedData->responseInfo->info.token,
+ receivedData->responseInfo->info.tokenLength,
+ endpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
+ {
+ // if retransmission is timeout, callback msg will be send without token.
+ if (NULL == blockDataID && !receivedData->responseInfo->info.token)
+ {
+ OIC_LOG(INFO, TAG, "retransmission was stopped");
+ return CA_REQUEST_TIMEOUT;
+ }
+ else
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+ }
+
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return CA_NOT_SUPPORTED;
}
// check if block option is set and get block data
- coap_block_t block = {0};
- if (coap_get_block(pdu, COAP_OPTION_BLOCK2, &block))
+ coap_block_t block = {0, 0, 0};
+
+ // get block1 option
+ int isBlock1 = coap_get_block(pdu, COAP_OPTION_BLOCK1, &block);
+ if (isBlock1)
{
- CAResult_t res = CASetNextBlockOption2(pdu, endpoint, receivedData, block, dataLen);
+ CAResult_t res = CASetNextBlockOption1(pdu, endpoint, receivedData, block, dataLen);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "setting has failed");
return res;
}
}
- else if (coap_get_block(pdu, COAP_OPTION_BLOCK1, &block)) // block1 option
+
+ // get block2 option
+ int isBlock2 = coap_get_block(pdu, COAP_OPTION_BLOCK2, &block);
+ if (isBlock2)
{
- CAResult_t res = CASetNextBlockOption1(pdu, endpoint, receivedData, block, dataLen);
+ CAResult_t res = CASetNextBlockOption2(pdu, endpoint, receivedData, block, dataLen);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "setting has failed");
return res;
}
}
- else
+
+ // check if there is error code
+ if (!isBlock1 && !isBlock2)
{
- uint32_t code = CA_RESPONSE_CODE(pdu->hdr->code);
+ uint32_t code = CA_RESPONSE_CODE(pdu->hdr->coap_hdr_udp_t.code);
if (CA_REQUEST_ENTITY_INCOMPLETE == code)
{
- CABlockData_t *data = CAGetBlockDataFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->coap_hdr_udp_t.token,
+ pdu->hdr->coap_hdr_udp_t.token_length,
+ endpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
{
- OIC_LOG(ERROR, TAG, "getting has failed");
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
- coap_block_t *block = CAGetBlockOption(pdu->hdr->token);
- if (NULL == block)
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockDataID);
+ if (!data)
{
- OIC_LOG(ERROR, TAG, "block is null");
+ OIC_LOG(ERROR, TAG, "getting has failed");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
if (COAP_OPTION_BLOCK2 == data->type)
{
- CAResult_t res = CASetNextBlockOption2(pdu, endpoint, receivedData, *block,
+ coap_block_t *block2 = CAGetBlockOption(blockDataID, COAP_OPTION_BLOCK2);
+ if (!block2)
+ {
+ OIC_LOG(ERROR, TAG, "block is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ CAResult_t res = CASetNextBlockOption2(pdu, endpoint, receivedData, *block2,
dataLen);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "setting has failed");
+ CADestroyBlockID(blockDataID);
return res;
}
}
else if (COAP_OPTION_BLOCK1 == data->type)
{
- CAResult_t res = CASetNextBlockOption1(pdu, endpoint, receivedData, *block,
+ coap_block_t *block1 = CAGetBlockOption(blockDataID, COAP_OPTION_BLOCK1);
+ if (!block1)
+ {
+ OIC_LOG(ERROR, TAG, "block is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ CAResult_t res = CASetNextBlockOption1(pdu, endpoint, receivedData, *block1,
dataLen);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "setting has failed");
+ CADestroyBlockID(blockDataID);
return res;
}
}
{
// normal pdu data
OIC_LOG(DEBUG, TAG, "it's normal pdu");
+
+ // if received data is response message
+ // and sent data remain in block data list, remove block data
+ if (receivedData->responseInfo)
+ {
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->coap_hdr_udp_t.token,
+ pdu->hdr->coap_hdr_udp_t.token_length,
+ endpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
+ }
return CA_NOT_SUPPORTED;
}
}
}
CAResult_t CAProcessNextStep(const coap_pdu_t *pdu, const CAData_t *receivedData,
- uint8_t blockWiseStatus)
+ uint8_t blockWiseStatus, const CABlockDataID_t *blockID)
{
VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL(pdu->hdr, TAG, "pdu->hdr");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
CAResult_t res = CA_STATUS_OK;
CAData_t *data = NULL;
switch (blockWiseStatus)
{
case CA_OPTION2_FIRST_BLOCK:
- res = CAAddSendThreadQueue(receivedData, pdu->hdr->token);
+ res = CAAddSendThreadQueue(receivedData, blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
case CA_OPTION2_CON:
// add data to send thread
- data = CAGetDataSetFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
+ data = CAGetDataSetFromBlockDataList(blockID);
+ if (!data)
{
OIC_LOG(ERROR, TAG, "it's unavailable");
return CA_STATUS_FAILED;
if (data->requestInfo)
{
- data->requestInfo->info.messageId = pdu->hdr->id;
+ data->requestInfo->info.messageId = pdu->hdr->coap_hdr_udp_t.id;
}
if (data->responseInfo)
{
- data->responseInfo->info.messageId = pdu->hdr->id;
+ data->responseInfo->info.messageId = pdu->hdr->coap_hdr_udp_t.id;
}
- res = CAAddSendThreadQueue(data, pdu->hdr->token);
+ res = CAAddSendThreadQueue(data, blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
case CA_OPTION1_ACK:
case CA_OPTION2_ACK:
case CA_SENT_PREVIOUS_NON_MSG:
- res = CASendBlockMessage(pdu, CA_MSG_CONFIRM, blockWiseStatus);
+ res = CASendBlockMessage(pdu, CA_MSG_CONFIRM, blockWiseStatus,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "send has failed");
case CA_OPTION2_LAST_BLOCK:
// process last block and send upper layer
- res = CAReceiveLastBlock(pdu, receivedData);
+ res = CAReceiveLastBlock(blockID, receivedData);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "receive has failed");
}
// remove data from list
- res = CARemoveBlockDataFromList(pdu->hdr->token);
+ res = CARemoveBlockDataFromList(blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "remove has failed");
case CA_OPTION1_NO_ACK_LAST_BLOCK:
// process last block and send upper layer
- res = CAReceiveLastBlock(pdu, receivedData);
+ res = CAReceiveLastBlock(blockID, receivedData);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "receive has failed");
return res;
}
- if (CA_MSG_CONFIRM == pdu->hdr->type)
+ if (CA_MSG_NONCONFIRM == pdu->hdr->coap_hdr_udp_t.type)
{
- // send ack message to remote device
- res = CASendBlockMessage(pdu, CA_MSG_ACKNOWLEDGE, blockWiseStatus);
+ // remove data from list
+ res = CARemoveBlockDataFromList(blockID);
if (CA_STATUS_OK != res)
{
- OIC_LOG(ERROR, TAG, "send has failed");
+ OIC_LOG(ERROR, TAG, "remove has failed");
return res;
}
}
break;
case CA_OPTION1_NO_ACK_BLOCK:
- if (CA_MSG_CONFIRM == pdu->hdr->type)
+ if (CA_MSG_CONFIRM == pdu->hdr->coap_hdr_udp_t.type)
{
// add data to send thread
- res = CASendBlockMessage(pdu, CA_MSG_ACKNOWLEDGE, blockWiseStatus);
+ res = CASendBlockMessage(pdu, CA_MSG_ACKNOWLEDGE, blockWiseStatus,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "send has failed");
break;
case CA_BLOCK_INCOMPLETE:
- if (CA_MSG_CONFIRM == pdu->hdr->type || CA_MSG_ACKNOWLEDGE == pdu->hdr->type)
+ if (CA_MSG_CONFIRM == pdu->hdr->coap_hdr_udp_t.type ||
+ CA_MSG_ACKNOWLEDGE == pdu->hdr->coap_hdr_udp_t.type)
{
// add data to send thread
- res = CASendErrorMessage(pdu, blockWiseStatus, CA_REQUEST_ENTITY_INCOMPLETE);
+ res = CASendErrorMessage(pdu, blockWiseStatus,
+ CA_REQUEST_ENTITY_INCOMPLETE,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "send has failed");
break;
case CA_BLOCK_TOO_LARGE:
- if (CA_MSG_ACKNOWLEDGE == pdu->hdr->type)
+ if (CA_MSG_ACKNOWLEDGE == pdu->hdr->coap_hdr_udp_t.type)
{
- res = CASendBlockMessage(pdu, CA_MSG_CONFIRM, blockWiseStatus);
+ res = CASendBlockMessage(pdu, CA_MSG_CONFIRM, blockWiseStatus,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "send has failed");
return res;
}
}
- else if (CA_MSG_CONFIRM == pdu->hdr->type)
+ else if (CA_MSG_CONFIRM == pdu->hdr->coap_hdr_udp_t.type)
{
- res = CASendErrorMessage(pdu, blockWiseStatus, CA_REQUEST_ENTITY_TOO_LARGE);
+ res = CASendErrorMessage(pdu, blockWiseStatus,
+ CA_REQUEST_ENTITY_TOO_LARGE,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "send has failed");
return CA_STATUS_OK;
}
-CAResult_t CASendBlockMessage(const coap_pdu_t *pdu, CAMessageType_t msgType, uint8_t status)
+CAResult_t CASendBlockMessage(const coap_pdu_t *pdu, CAMessageType_t msgType,
+ uint8_t status, const CABlockDataID_t *blockID)
{
VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL(pdu->hdr, TAG, "pdu->hdr");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
- CAData_t *data = CAGetDataSetFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
+ CAData_t *data = CAGetDataSetFromBlockDataList(blockID);
+ if (!data)
{
OIC_LOG(ERROR, TAG, "CAData is unavailable");
return CA_STATUS_FAILED;
if (data->responseInfo)
{
OIC_LOG(DEBUG, TAG, "set ACK message");
- data->responseInfo->info.messageId = pdu->hdr->id;
+ data->responseInfo->info.messageId = pdu->hdr->coap_hdr_udp_t.id;
data->responseInfo->info.type = CA_MSG_ACKNOWLEDGE;
if (CA_OPTION1_NO_ACK_LAST_BLOCK == status)
{
}
// add data to send thread
- CAResult_t res = CAAddSendThreadQueue(data, pdu->hdr->token);
+ CAResult_t res = CAAddSendThreadQueue(data, blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
}
CAResult_t CASendErrorMessage(const coap_pdu_t *pdu, uint8_t status,
- CAResponseResult_t responseResult)
+ CAResponseResult_t responseResult,
+ const CABlockDataID_t *blockID)
{
VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL(pdu->hdr, TAG, "pdu->hdr");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
// create error responseInfo
- CABlockData_t *data = CAGetBlockDataFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockID);
+ if (!data)
{
OIC_LOG(ERROR, TAG, "data is unavailable");
return CA_STATUS_FAILED;
CAData_t *cloneData = NULL;
if (data->sentData && data->sentData->responseInfo)
{
- data->sentData->responseInfo->info.messageId = pdu->hdr->id;
+ data->sentData->responseInfo->info.messageId = pdu->hdr->coap_hdr_udp_t.id;
data->sentData->responseInfo->info.type = CA_MSG_ACKNOWLEDGE;
data->sentData->responseInfo->result = responseResult;
cloneData = CACloneCAData(data->sentData);
- if (NULL == cloneData)
+ if (!cloneData)
{
OIC_LOG(ERROR, TAG, "clone has failed");
return CA_MEMORY_ALLOC_FAILED;
}
OIC_LOG(DEBUG, TAG, "set ACK message");
}
- else
+ else if (data->sentData)
{
- cloneData = CACreateNewDataSet(pdu, CACloneEndpoint(data->sentData->remoteEndpoint));
+ cloneData = CACreateNewDataSet(pdu, data->sentData->remoteEndpoint);
+ if(!cloneData)
+ {
+ OIC_LOG(ERROR, TAG, PCF("CACreateNewDataSet failed"));
+ return CA_MEMORY_ALLOC_FAILED;
+ }
+
cloneData->responseInfo->info.type = CA_MSG_CONFIRM;
cloneData->responseInfo->result = responseResult;
OIC_LOG(DEBUG, TAG, "set CON message");
}
+ else
+ {
+ OIC_LOG(ERROR, TAG, "data has no sent-data");
+ return CA_MEMORY_ALLOC_FAILED;
+ }
// add data to send thread
if (g_context.sendThreadFunc)
g_context.sendThreadFunc(cloneData);
ca_mutex_unlock(g_context.blockDataSenderMutex);
}
+ else
+ {
+ CADestroyDataSet(cloneData);
+ }
// if error code is 4.08, remove the stored payload and initialize block number
if (CA_BLOCK_INCOMPLETE == status)
OICFree(data->payload);
data->payload = NULL;
data->payloadLength = 0;
- data->block.num = 0;
+ data->receivedPayloadLen = 0;
+ data->block1.num = 0;
+ data->block2.num = 0;
}
return CA_STATUS_OK;
}
-CAResult_t CAReceiveLastBlock(const coap_pdu_t *pdu, const CAData_t *receivedData)
+CAResult_t CAReceiveLastBlock(const CABlockDataID_t *blockID,
+ const CAData_t *receivedData)
{
- VERIFY_NON_NULL(pdu, TAG, "pdu");
- VERIFY_NON_NULL(pdu->hdr, TAG, "pdu->hdr");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
VERIFY_NON_NULL(receivedData, TAG, "receivedData");
// total block data have to notify to Application
CAData_t *cloneData = CACloneCAData(receivedData);
- if (NULL == cloneData)
+ if (!cloneData)
{
OIC_LOG(ERROR, TAG, "clone has failed");
return CA_MEMORY_ALLOC_FAILED;
// update payload
size_t fullPayloadLen = 0;
- CAPayload_t fullPayload = CAGetPayloadFromBlockDataList(pdu->hdr->token, &fullPayloadLen);
- if (NULL != fullPayload)
+ CAPayload_t fullPayload = CAGetPayloadFromBlockDataList(blockID,
+ &fullPayloadLen);
+ if (fullPayload)
{
CAResult_t res = CAUpdatePayloadToCAData(cloneData, fullPayload, fullPayloadLen);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- return CA_STATUS_FAILED;
+ CADestroyDataSet(cloneData);
+ return res;
}
}
{
g_context.receivedThreadFunc(cloneData);
}
+ else
+ {
+ CADestroyDataSet(cloneData);
+ }
return CA_STATUS_OK;
}
-CAResult_t CASetNextBlockOption1(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+// TODO make pdu const after libcoap is updated to support that.
+CAResult_t CASetNextBlockOption1(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, coap_block_t block,
size_t dataLen)
{
OIC_LOG_V(INFO, TAG, "num:%d, M:%d, sze:%d", block.num, block.m, block.szx);
- // BlockData data is created if it not existed
- if (!CAIsBlockDataInList(pdu))
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->coap_hdr_udp_t.token,
+ pdu->hdr->coap_hdr_udp_t.token_length,
+ endpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
{
- OIC_LOG(DEBUG, TAG, "no message in list");
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ // Get BlockData data. If does not exist, create a new data
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockDataID);
+ if (!data)
+ {
+ OIC_LOG(DEBUG, TAG, "block data doesn't exist in list. create new one");
- CAData_t *data = CACreateNewDataSet(pdu, endpoint);
- if (NULL == data)
+ CAData_t *cadata = CACreateNewDataSet(pdu, endpoint);
+ if (!cadata)
{
OIC_LOG(ERROR, TAG, "data is null");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
- CABlockData_t *currData = CACreateNewBlockData(data);
- if (NULL == currData)
+ CABlockData_t *currData = CACreateNewBlockData(cadata);
+ if (!currData)
{
- OIC_LOG(ERROR, TAG, "currData is null");
- CADestroyDataSet(data);
+ OIC_LOG(ERROR, TAG, "failed to create a new block data");
+ CADestroyDataSet(cadata);
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
+ CADestroyDataSet(cadata);
}
// update BLOCK OPTION1 type
- CAResult_t res = CAUpdateBlockOptionType(pdu->hdr->token, COAP_OPTION_BLOCK1);
+ CAResult_t res = CAUpdateBlockOptionType(blockDataID,
+ COAP_OPTION_BLOCK1);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
- CABlockData_t *data = CAGetBlockDataFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
- {
- OIC_LOG(ERROR, TAG, "getting has failed");
- return CA_STATUS_FAILED;
- }
-
uint8_t blockWiseStatus = CA_BLOCK_UNKNOWN;
// received type from remote device
- if (CA_MSG_ACKNOWLEDGE == pdu->hdr->type)
+ if (CA_MSG_ACKNOWLEDGE == pdu->hdr->coap_hdr_udp_t.type)
{
- uint32_t code = CA_RESPONSE_CODE(pdu->hdr->code);
+ uint32_t code = CA_RESPONSE_CODE(pdu->hdr->coap_hdr_udp_t.code);
if (0 == block.m &&
(CA_REQUEST_ENTITY_INCOMPLETE != code && CA_REQUEST_ENTITY_TOO_LARGE != code))
{
- OIC_LOG(INFO, TAG, "Data has sent");
- // initialize block number for response message
- data->block.num = 0;
+ int isBlock2 = coap_get_block(pdu, COAP_OPTION_BLOCK2, &block);
+ if (isBlock2)
+ {
+ OIC_LOG(INFO, TAG, "received data is combining block1 and block2");
+ // initialize block number for response message
+ data->block1.num = 0;
+ }
+ else
+ {
+ OIC_LOG(INFO, TAG, "received data is not bulk data");
+ CAReceiveLastBlock(blockDataID, receivedData);
+ CARemoveBlockDataFromList(blockDataID);
+ }
+
+ CADestroyBlockID(blockDataID);
return CA_STATUS_OK;
}
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
+ CADestroyBlockID(blockDataID);
return res;
}
- res = CAUpdateBlockData(data, block);
+ res = CAUpdateBlockData(data, block, COAP_OPTION_BLOCK1);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
}
&(data->payloadLength));
// check if received payload is exact
- if (CA_MSG_CONFIRM == pdu->hdr->type)
+ if (CA_MSG_CONFIRM == pdu->hdr->coap_hdr_udp_t.type)
{
blockWiseStatus = CACheckBlockErrorType(data, &block, receivedData,
COAP_OPTION_BLOCK1, dataLen);
if (CA_BLOCK_RECEIVED_ALREADY != blockWiseStatus)
{
// store the received payload and merge
- res = CAUpdatePayloadData(data, receivedData, blockWiseStatus, isSizeOption);
+ res = CAUpdatePayloadData(data, receivedData, blockWiseStatus,
+ isSizeOption, COAP_OPTION_BLOCK1);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
- res = CAUpdateBlockOptionItems(data, pdu, &block, COAP_OPTION_BLOCK1, blockWiseStatus);
+ res = CAUpdateBlockOptionItems(data, pdu, &block, COAP_OPTION_BLOCK1,
+ blockWiseStatus);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
// update block data
- res = CAUpdateBlockData(data, block);
+ res = CAUpdateBlockData(data, block, COAP_OPTION_BLOCK1);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
}
}
}
- res = CAProcessNextStep(pdu, receivedData, blockWiseStatus);
+ res = CAProcessNextStep(pdu, receivedData, blockWiseStatus, blockDataID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "setting has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
}
+ CADestroyBlockID(blockDataID);
return res;
}
-CAResult_t CASetNextBlockOption2(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+// TODO make pdu const after libcoap is updated to support that.
+CAResult_t CASetNextBlockOption2(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, coap_block_t block,
size_t dataLen)
{
VERIFY_NON_NULL(endpoint, TAG, "endpoint");
VERIFY_NON_NULL(receivedData, TAG, "receivedData");
- // BlockData data is created if it not existed
- if (!CAIsBlockDataInList(pdu))
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->coap_hdr_udp_t.token,
+ pdu->hdr->coap_hdr_udp_t.token_length,
+ endpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
{
- OIC_LOG(DEBUG, TAG, "no msg in list.");
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
- CAData_t *data = CACreateNewDataSet(pdu, endpoint);
- if (NULL == data)
+ // Get BlockData data. If does not exist, create a new data
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockDataID);
+ if (!data)
+ {
+ OIC_LOG(DEBUG, TAG, "block data doesn't exist in list. create new one");
+
+ CAData_t *cadata = CACreateNewDataSet(pdu, endpoint);
+ if (!cadata)
{
OIC_LOG(ERROR, TAG, "data is null");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
- CABlockData_t *currData = CACreateNewBlockData(data);
- if (NULL == currData)
+ CABlockData_t *currData = CACreateNewBlockData(cadata);
+ if (!currData)
{
- OIC_LOG(ERROR, TAG, "data is null");
- CADestroyDataSet(data);
+ OIC_LOG(ERROR, TAG, "failed to create a new block data");
+ CADestroyDataSet(cadata);
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
+ CADestroyDataSet(cadata);
}
// set Block Option Type
- CAResult_t res = CAUpdateBlockOptionType(pdu->hdr->token, COAP_OPTION_BLOCK2);
+ CAResult_t res = CAUpdateBlockOptionType(blockDataID, COAP_OPTION_BLOCK2);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
- CABlockData_t *data = CAGetBlockDataFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
- {
- OIC_LOG(ERROR, TAG, "getting has failed");
- return CA_STATUS_FAILED;
- }
-
uint8_t blockWiseStatus = CA_BLOCK_UNKNOWN;
- if (0 == block.num && CA_GET == pdu->hdr->code && 0 == block.m)
+ if (0 == block.num && CA_GET == pdu->hdr->coap_hdr_udp_t.code && 0 == block.m)
{
OIC_LOG(INFO, TAG, "first block number");
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
// first block data have to notify to Application
- res = CAUpdateBlockData(data, block);
+ res = CAUpdateBlockData(data, block, COAP_OPTION_BLOCK2);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
blockWiseStatus = CA_OPTION2_FIRST_BLOCK;
else
{
// received type from remote device
- if (CA_MSG_ACKNOWLEDGE == pdu->hdr->type ||
- (CA_MSG_NONCONFIRM == pdu->hdr->type && NULL != receivedData->responseInfo))
+ if (CA_MSG_ACKNOWLEDGE == pdu->hdr->coap_hdr_udp_t.type ||
+ (CA_MSG_NONCONFIRM == pdu->hdr->coap_hdr_udp_t.type &&
+ NULL != receivedData->responseInfo))
{
OIC_LOG(DEBUG, TAG, "received ACK or NON");
&(data->payloadLength));
// check if received payload is exact
- if (CA_MSG_ACKNOWLEDGE == pdu->hdr->type)
+ if (CA_MSG_ACKNOWLEDGE == pdu->hdr->coap_hdr_udp_t.type)
{
blockWiseStatus = CACheckBlockErrorType(data, &block, receivedData,
COAP_OPTION_BLOCK2, dataLen);
if (CA_BLOCK_RECEIVED_ALREADY != blockWiseStatus)
{
// store the received payload and merge
- res = CAUpdatePayloadData(data, receivedData, blockWiseStatus, isSizeOption);
+ res = CAUpdatePayloadData(data, receivedData, blockWiseStatus,
+ isSizeOption, COAP_OPTION_BLOCK2);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
}
{
OIC_LOG(DEBUG, TAG, "M bit is 1");
- if (CA_MSG_ACKNOWLEDGE == pdu->hdr->type)
+ if (CA_MSG_ACKNOWLEDGE == pdu->hdr->coap_hdr_udp_t.type)
{
blockWiseStatus = CA_OPTION2_ACK;
}
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
- res = CAUpdateBlockData(data, block);
+ res = CAUpdateBlockData(data, block, COAP_OPTION_BLOCK2);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
}
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
- res = CAUpdateBlockData(data, block);
+ res = CAUpdateBlockData(data, block, COAP_OPTION_BLOCK2);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "update has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
}
}
- res = CAProcessNextStep(pdu, receivedData, blockWiseStatus);
+ res = CAProcessNextStep(pdu, receivedData, blockWiseStatus, blockDataID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "setting has failed");
- CARemoveBlockDataFromList(pdu->hdr->token);
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return res;
}
+ CADestroyBlockID(blockDataID);
return CA_STATUS_OK;
}
// update block data
CAResult_t res = CA_STATUS_OK;
- uint32_t code = CA_RESPONSE_CODE(pdu->hdr->code);
+ uint32_t code = CA_RESPONSE_CODE(pdu->hdr->coap_hdr_udp_t.code);
if (CA_REQUEST_ENTITY_INCOMPLETE == code || CA_REQUEST_ENTITY_TOO_LARGE == code)
{
switch (status)
{
case CA_OPTION1_ACK:
- if (currData->block.num > block->num)
+ if (currData->block1.num > block->num)
{
OIC_LOG(ERROR, TAG, "received incorrect block num");
return CA_STATUS_FAILED;
block->m = 0;
break;
case CA_OPTION2_ACK:
- if (currData->block.num > block->num)
+ if (currData->block2.num > block->num)
{
OIC_LOG(ERROR, TAG, "received incorrect block num");
return CA_STATUS_FAILED;
{
block->num++;
block->m = 0;
+ block->szx = currData->block2.szx;
+ }
+ else
+ {
+ block->szx = currData->block1.szx;
}
- block->szx = currData->block.szx;
break;
default:
OIC_LOG_V(ERROR, TAG, "no logic [%d]", status);
if (CA_BLOCK_INCOMPLETE != status && CA_BLOCK_TOO_LARGE != status)
{
// negotiate block size
- res = CANegotiateBlockSize(currData, block, pdu->hdr->type, blockType);
+ res = CANegotiateBlockSize(currData, block, pdu->hdr->coap_hdr_udp_t.type, blockType);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "negotiation has failed");
return res;
}
-CAResult_t CAGetMoreBitFromBlock(size_t payloadLen, coap_block_t *block)
+CAResult_t CASetMoreBitFromBlock(size_t payloadLen, coap_block_t *block)
{
VERIFY_NON_NULL(block, TAG, "block");
- if (((block->num + 1) << (block->szx + BLOCK_NUMBER_IDX)) < payloadLen)
+ if ((size_t)((block->num + 1) << (block->szx + BLOCK_NUMBER_IDX))
+ < payloadLen)
{
OIC_LOG(DEBUG, TAG, "Set the M-bit(1)");
block->m = 1;
// #2. check the message type
if (CA_MSG_ACKNOWLEDGE == msgType)
{
- if (block->szx > currData->block.szx)
+ if (block->szx > currData->block2.szx)
{
OIC_LOG(DEBUG, TAG, "sze is big");
// #3. calculate new block number from block size
unsigned int blockNum = BLOCK_SIZE(block->szx) /
- BLOCK_SIZE(currData->block.szx) - 1;
+ BLOCK_SIZE(currData->block2.szx) - 1;
OIC_LOG(DEBUG, TAG, "num is set as Negotiation");
block->num += blockNum;
- block->szx = currData->block.szx;
+ block->szx = currData->block2.szx;
OIC_LOG_V(DEBUG, TAG, "updated block num: %d", block->num);
}
}
else
{
- if (block->szx > currData->block.szx)
+ if (block->szx > currData->block2.szx)
{
OIC_LOG(DEBUG, TAG, "sze is big");
- block->szx = currData->block.szx;
+ block->szx = currData->block2.szx;
}
}
}
{
if (CA_MSG_ACKNOWLEDGE == msgType)
{
- if (block->szx < currData->block.szx)
+ if (block->szx < currData->block1.szx)
{
OIC_LOG(DEBUG, TAG, "sze is small");
- unsigned int blockNum = BLOCK_SIZE(currData->block.szx) /
+ unsigned int blockNum = BLOCK_SIZE(currData->block1.szx) /
BLOCK_SIZE(block->szx) - 1;
block->num += blockNum;
OIC_LOG_V(DEBUG, TAG, "updated block num: %d", block->num);
}
else
{
- if (block->szx > currData->block.szx)
+ if (block->szx > currData->block1.szx)
{
OIC_LOG(DEBUG, TAG, "sze is big");
- block->szx = currData->block.szx;
+ block->szx = currData->block1.szx;
}
}
}
return CA_STATUS_OK;
}
-CAResult_t CAUpdateBlockData(CABlockData_t *currData, coap_block_t block)
+CAResult_t CAUpdateBlockData(CABlockData_t *currData, coap_block_t block,
+ uint16_t blockType)
{
VERIFY_NON_NULL(currData, TAG, "currData");
}
// update block option
- currData->block = block;
+ if (COAP_OPTION_BLOCK2 == blockType)
+ {
+ currData->block2 = block;
+ }
+ else
+ {
+ currData->block1 = block;
+ }
OIC_LOG(DEBUG, TAG, "data has updated");
return CA_STATUS_OK;
}
-CAResult_t CAUpdateMessageId(coap_pdu_t *pdu)
+CAResult_t CAUpdateMessageId(coap_pdu_t *pdu, const CABlockDataID_t *blockID)
{
VERIFY_NON_NULL(pdu, TAG, "pdu");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
// if CON message is sent, update messageId in block-wise transfer list
- if (CA_MSG_CONFIRM == pdu->hdr->type)
+ if (CA_MSG_CONFIRM == pdu->hdr->coap_hdr_udp_t.type)
{
- CAData_t * cadata = CAGetDataSetFromBlockDataList(pdu->hdr->token);
- if (NULL == cadata)
+ CAData_t * cadata = CAGetDataSetFromBlockDataList(blockID);
+ if (!cadata)
{
OIC_LOG(ERROR, TAG, "CAData is unavailable");
return CA_STATUS_FAILED;
}
- if (NULL != cadata->requestInfo)
+ if (cadata->requestInfo)
{
- cadata->requestInfo->info.messageId = pdu->hdr->id;
+ cadata->requestInfo->info.messageId = pdu->hdr->coap_hdr_udp_t.id;
}
}
return CA_STATUS_OK;
}
-CAResult_t CAAddBlockOption(coap_pdu_t **pdu, CAInfo_t info)
+CAResult_t CAAddBlockOption(coap_pdu_t **pdu, const CAInfo_t *info,
+ const CAEndpoint_t *endpoint, coap_list_t **options)
{
OIC_LOG(DEBUG, TAG, "IN-AddBlockOption");
VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL((*pdu), TAG, "(*pdu)");
VERIFY_NON_NULL((*pdu)->hdr, TAG, "(*pdu)->hdr");
+ VERIFY_NON_NULL(info, TAG, "info");
+ VERIFY_NON_NULL(endpoint, TAG, "endpoint");
+ VERIFY_NON_NULL(options, TAG, "options");
size_t dataLength = 0;
- if (info.payload)
+ if (info->payload)
{
- dataLength = info.payloadSize;
- OIC_LOG_V(DEBUG, TAG, "dataLength - %d", dataLength);
+ dataLength = info->payloadSize;
+ OIC_LOG_V(DEBUG, TAG, "dataLength - %zu", dataLength);
}
OIC_LOG_V(DEBUG, TAG, "previous payload - %s", (*pdu)->data);
- uint32_t code = CA_RESPONSE_CODE((*pdu)->hdr->code);
+ CAResult_t res = CA_STATUS_OK;
+ uint32_t code = CA_RESPONSE_CODE((*pdu)->hdr->coap_hdr_udp_t.code);
if (CA_REQUEST_ENTITY_INCOMPLETE == code)
{
OIC_LOG(INFO, TAG, "don't use option");
- return CA_STATUS_OK;
+ return res;
+ }
+
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)(*pdu)->hdr->coap_hdr_udp_t.token,
+ (*pdu)->hdr->coap_hdr_udp_t.token_length,
+ endpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ res = CA_STATUS_FAILED;
+ goto exit;
}
- uint8_t blockType = CAGetBlockOptionType((*pdu)->hdr->token);
+ uint8_t blockType = CAGetBlockOptionType(blockDataID);
if (COAP_OPTION_BLOCK2 == blockType)
{
- CAResult_t res = CAAddBlockOption2(pdu, info, dataLength);
+ res = CAAddBlockOption2(pdu, info, dataLength, blockDataID, options);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- return res;
+ goto exit;
}
}
else if (COAP_OPTION_BLOCK1 == blockType)
{
- CAResult_t res = CAAddBlockOption1(pdu, info, dataLength);
+ res = CAAddBlockOption1(pdu, info, dataLength, blockDataID, options);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- return res;
+ goto exit;
}
}
else
{
OIC_LOG(DEBUG, TAG, "no BLOCK option");
+
+ // in case it is not large data, add option list to pdu.
+ if (*options)
+ {
+ for (coap_list_t *opt = *options; opt; opt = opt->next)
+ {
+ OIC_LOG_V(DEBUG, TAG, "[%s] opt will be added.",
+ COAP_OPTION_DATA(*(coap_option *) opt->data));
+
+ OIC_LOG_V(DEBUG, TAG, "[%d] pdu length", (*pdu)->length);
+ coap_add_option(*pdu, COAP_OPTION_KEY(*(coap_option *) opt->data),
+ COAP_OPTION_LENGTH(*(coap_option *) opt->data),
+ COAP_OPTION_DATA(*(coap_option *) opt->data), coap_udp);
+ }
+ }
+
+ OIC_LOG_V(DEBUG, TAG, "[%d] pdu length after option", (*pdu)->length);
+
// if response data is so large. it have to send as block transfer
- if (!coap_add_data(*pdu, dataLength, (const unsigned char *) info.payload))
+ if (!coap_add_data(*pdu, dataLength, (const unsigned char *) info->payload))
{
OIC_LOG(INFO, TAG, "it have to use block");
}
else
{
OIC_LOG(INFO, TAG, "not Blockwise Transfer");
+ goto exit;
}
}
- CAResult_t res = CAUpdateMessageId(*pdu);
+ // if received message type is RESET from remote device,
+ // we have to use the updated message id to find token.
+ res = CAUpdateMessageId(*pdu, blockDataID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "fail to update CON message id ");
- return res;
+ goto exit;
}
+exit:
+ if (CA_ADAPTER_IP == endpoint->adapter && 0 == endpoint->port)
+ {
+ CARemoveBlockDataFromList(blockDataID);
+ }
+ CADestroyBlockID(blockDataID);
OIC_LOG(DEBUG, TAG, "OUT-AddBlockOption");
- return CA_STATUS_OK;
+ return res;
}
-CAResult_t CAAddBlockOption2(coap_pdu_t **pdu, CAInfo_t info, size_t dataLength)
+CAResult_t CAAddBlockOption2(coap_pdu_t **pdu, const CAInfo_t *info, size_t dataLength,
+ const CABlockDataID_t *blockID, coap_list_t **options)
{
OIC_LOG(DEBUG, TAG, "IN-AddBlockOption2");
VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL((*pdu), TAG, "(*pdu)");
VERIFY_NON_NULL((*pdu)->hdr, TAG, "(*pdu)->hdr");
+ VERIFY_NON_NULL(info, TAG, "info");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
+ VERIFY_NON_NULL(options, TAG, "options");
// get set block data from CABlock list-set.
- coap_block_t *block = CAGetBlockOption((*pdu)->hdr->token);
- if (NULL == block)
+ coap_block_t *block1 = CAGetBlockOption(blockID, COAP_OPTION_BLOCK1);
+ coap_block_t *block2 = CAGetBlockOption(blockID, COAP_OPTION_BLOCK2);
+ if (!block1 || !block2)
{
OIC_LOG(ERROR, TAG, "getting has failed");
return CA_STATUS_FAILED;
}
- CALogBlockInfo(block);
+ CALogBlockInfo(block2);
- uint8_t code = 0;
- if (CA_MSG_ACKNOWLEDGE == (*pdu)->hdr->type ||
- (CA_MSG_NONCONFIRM == (*pdu)->hdr->type && CA_GET != (*pdu)->hdr->code))
+ if (CA_MSG_ACKNOWLEDGE == (*pdu)->hdr->coap_hdr_udp_t.type ||
+ (CA_MSG_NONCONFIRM == (*pdu)->hdr->coap_hdr_udp_t.type &&
+ CA_GET != (*pdu)->hdr->coap_hdr_udp_t.code))
{
- int32_t res = coap_write_block_opt(block, COAP_OPTION_BLOCK2, *pdu, dataLength);
- switch (res)
+ CASetMoreBitFromBlock(dataLength, block2);
+ CALogBlockInfo(block2);
+
+ // if block number is 0, add size2 option
+ if (0 == block2->num)
{
- case -2: /* illegal block */
- code = COAP_RESPONSE_CODE(CA_BAD_REQ);
- OIC_LOG(ERROR, TAG, "write block option : -2");
- goto error;
- case -1: /* should really not happen */
- OIC_LOG(ERROR, TAG, "write block option : -1");
- break;
- case -3: /* cannot handle request */
- code = COAP_RESPONSE_CODE(CA_INTERNAL_SERVER_ERROR);
- OIC_LOG(ERROR, TAG, "write block option : -3");
- goto error;
- default:
- OIC_LOG(INFO, TAG, "success write block option");
+ CAResult_t res = CAAddBlockSizeOption(*pdu, COAP_OPTION_SIZE2, dataLength, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
}
- CALogBlockInfo(block);
- // if block number is 0, add size2 option
- if (0 == block->num)
+ CAResult_t res = CAAddBlockOptionImpl(block2, COAP_OPTION_BLOCK2, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
+
+ if (block1->num)
{
- res = CAAddBlockSizeOption(*pdu, COAP_OPTION_SIZE2, dataLength);
+ OIC_LOG(DEBUG, TAG, "combining block1 and block2");
+ res = CAAddBlockOptionImpl(block1, COAP_OPTION_BLOCK1, options);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
+ // initialize block number
+ block1->num = 0;
+ }
+
+ res = CAAddOptionToPDU(*pdu, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
}
- if (!coap_add_block(*pdu, dataLength, (const unsigned char *) info.payload,
- block->num, block->szx))
+ if (!coap_add_block(*pdu, dataLength, (const unsigned char *) info->payload,
+ block2->num, block2->szx))
{
OIC_LOG(ERROR, TAG, "Data length is smaller than the start index");
return CA_STATUS_FAILED;
}
- if (CA_MSG_NONCONFIRM == (*pdu)->hdr->type)
+ if (!block2->m)
{
- if (block->m)
+ // if sent message is last response block message, remove data
+ CARemoveBlockDataFromList(blockID);
+ }
+ else
+ {
+ if (CA_MSG_NONCONFIRM == (*pdu)->hdr->coap_hdr_udp_t.type)
{
OIC_LOG(DEBUG, TAG, "NON, send next block..");
// update block data
- block->num++;
- CAResult_t res = CAProcessNextStep(*pdu, NULL, CA_SENT_PREVIOUS_NON_MSG);
+ block2->num++;
+ CAResult_t res = CAProcessNextStep(*pdu, NULL,
+ CA_SENT_PREVIOUS_NON_MSG,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "failed to process next step");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
}
- else
- {
- CARemoveBlockDataFromList((*pdu)->hdr->token);
- }
}
}
else
{
OIC_LOG(DEBUG, TAG, "option2, not ACK msg");
- CAResult_t res = CAAddBlockOptionImpl(*pdu, block, COAP_OPTION_BLOCK2);
+ CAResult_t res = CAAddBlockOptionImpl(block2, COAP_OPTION_BLOCK2, options);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
+
+ res = CAAddOptionToPDU(*pdu, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
return res;
}
}
return CA_STATUS_OK;
-
-error:
- OIC_LOG_V(ERROR, TAG, "error : %d", code);
- coap_add_data(*pdu, strlen(coap_response_phrase(code)),
- (unsigned char *) coap_response_phrase(code));
- return CA_STATUS_FAILED;
}
-CAResult_t CAAddBlockOption1(coap_pdu_t **pdu, CAInfo_t info, size_t dataLength)
+CAResult_t CAAddBlockOption1(coap_pdu_t **pdu, const CAInfo_t *info, size_t dataLength,
+ const CABlockDataID_t *blockID, coap_list_t **options)
{
OIC_LOG(DEBUG, TAG, "IN-AddBlockOption1");
VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL((*pdu), TAG, "(*pdu)");
VERIFY_NON_NULL((*pdu)->hdr, TAG, "(*pdu)->hdr");
+ VERIFY_NON_NULL(info, TAG, "info");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
+ VERIFY_NON_NULL(options, TAG, "options");
// get set block data from CABlock list-set.
- coap_block_t *block = CAGetBlockOption((*pdu)->hdr->token);
- if (NULL == block)
+ coap_block_t *block1 = CAGetBlockOption(blockID, COAP_OPTION_BLOCK1);
+ if (!block1)
{
OIC_LOG(ERROR, TAG, "getting has failed");
return CA_STATUS_FAILED;
}
- CALogBlockInfo(block);
+ CALogBlockInfo(block1);
- if (CA_MSG_ACKNOWLEDGE == (*pdu)->hdr->type)
+ if (CA_MSG_ACKNOWLEDGE == (*pdu)->hdr->coap_hdr_udp_t.type)
{
OIC_LOG(DEBUG, TAG, "option1 and ACK msg..");
- CAResult_t res = CAAddBlockOptionImpl(*pdu, block, COAP_OPTION_BLOCK1);
+ CAResult_t res = CAAddBlockOptionImpl(block1, COAP_OPTION_BLOCK1, options);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
+ res = CAAddOptionToPDU(*pdu, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
+
+ if (!coap_add_data(*pdu, dataLength, (const unsigned char *) info->payload))
+ {
+ OIC_LOG(ERROR, TAG, "failed to add payload");
+ return CA_STATUS_FAILED;
+ }
+
// reset block-list after write block
- if (0 == block->m)
+ if (0 == block1->m)
{
// remove data from list
- CAResult_t res = CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CAResult_t res = CARemoveBlockDataFromList(blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "remove has failed");
}
else
{
- CAGetMoreBitFromBlock(dataLength, block);
- CAResult_t res = CAAddBlockOptionImpl(*pdu, block, COAP_OPTION_BLOCK1);
- if (CA_STATUS_OK != res)
- {
- OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
- return res;
- }
- CALogBlockInfo(block);
+ CASetMoreBitFromBlock(dataLength, block1);
+ CAResult_t res = CA_STATUS_OK;
// if block number is 0, add size1 option
- if (0 == block->num)
+ if (0 == block1->num)
{
- res = CAAddBlockSizeOption(*pdu, COAP_OPTION_SIZE1, dataLength);
+ res = CAAddBlockSizeOption(*pdu, COAP_OPTION_SIZE1, dataLength, options);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
}
- if (!coap_add_block(*pdu, dataLength, (const unsigned char *) info.payload,
- block->num, block->szx))
+ res = CAAddBlockOptionImpl(block1, COAP_OPTION_BLOCK1, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
+
+ res = CAAddOptionToPDU(*pdu, options);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
+
+ CALogBlockInfo(block1);
+
+ if (!coap_add_block(*pdu, dataLength, (const unsigned char *) info->payload,
+ block1->num, block1->szx))
{
OIC_LOG(ERROR, TAG, "Data length is smaller than the start index");
return CA_STATUS_FAILED;
}
// check the message type and if message type is NON, next block message will be sent
- if (CA_MSG_NONCONFIRM == (*pdu)->hdr->type)
+ if (CA_MSG_NONCONFIRM == (*pdu)->hdr->coap_hdr_udp_t.type)
{
- if (block->m)
+ if (block1->m)
{
OIC_LOG(DEBUG, TAG, "NON, send next block..");
// update block data
- block->num++;
- CAResult_t res = CAProcessNextStep(*pdu, NULL, CA_SENT_PREVIOUS_NON_MSG);
+ block1->num++;
+ CAResult_t res = CAProcessNextStep(*pdu, NULL,
+ CA_SENT_PREVIOUS_NON_MSG,
+ blockID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "failed to process next step");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
}
else
{
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
}
}
}
return CA_STATUS_OK;
}
-CAResult_t CAAddBlockOptionImpl(coap_pdu_t *pdu, coap_block_t *block, uint8_t blockType)
+CAResult_t CAAddBlockOptionImpl(coap_block_t *block, uint8_t blockType,
+ coap_list_t **options)
{
OIC_LOG(DEBUG, TAG, "IN-AddBlockOptionImpl");
- VERIFY_NON_NULL(pdu, TAG, "pdu");
VERIFY_NON_NULL(block, TAG, "block");
+ VERIFY_NON_NULL(options, TAG, "options");
+
+ unsigned char buf[BLOCKWISE_OPTION_BUFFER] = { 0 };
+ unsigned int optionLength = coap_encode_var_bytes(buf,
+ ((block->num << BLOCK_NUMBER_IDX)
+ | (block->m << BLOCK_M_BIT_IDX)
+ | block->szx));
- coap_option *option = (coap_option *) OICMalloc(sizeof(coap_option));
- if (NULL == option)
+ int ret = coap_insert(options,
+ CACreateNewOptionNode(blockType, optionLength, (char *) buf),
+ CAOrderOpts);
+ if (ret <= 0)
{
- OIC_LOG(ERROR, TAG, "out of memory");
- return CA_MEMORY_ALLOC_FAILED;
+ return CA_STATUS_INVALID_PARAM;
}
- unsigned char buf[BLOCKWISE_OPTION_BUFFER] = { 0 };
- option->key = blockType;
- option->length = coap_encode_var_bytes(buf,
- ((block->num << BLOCK_NUMBER_IDX)
- | (block->m << BLOCK_M_BIT_IDX) | block->szx));
- if (!coap_add_option(pdu, option->key, option->length, buf))
- {
- OIC_LOG(ERROR, TAG, "coap_add_option has failed");
- OICFree(option);
- return CA_STATUS_FAILED;
+ OIC_LOG(DEBUG, TAG, "OUT-AddBlockOptionImpl");
+ return CA_STATUS_OK;
+}
+
+CAResult_t CAAddOptionToPDU(coap_pdu_t *pdu, coap_list_t **options)
+{
+ // after adding the block option to option list, add option list to pdu.
+ if (*options)
+ {
+ for (coap_list_t *opt = *options; opt; opt = opt->next)
+ {
+ OIC_LOG_V(DEBUG, TAG, "[%s] opt will be added.",
+ COAP_OPTION_DATA(*(coap_option *) opt->data));
+
+ OIC_LOG_V(DEBUG, TAG, "[%d] pdu length", pdu->length);
+ int ret = coap_add_option(pdu, COAP_OPTION_KEY(*(coap_option *) opt->data),
+ COAP_OPTION_LENGTH(*(coap_option *) opt->data),
+ COAP_OPTION_DATA(*(coap_option *) opt->data), coap_udp);
+ if (!ret)
+ {
+ return CA_STATUS_FAILED;
+ }
+ }
}
- OICFree(option);
+ OIC_LOG_V(DEBUG, TAG, "[%d] pdu length after option", pdu->length);
- OIC_LOG(DEBUG, TAG, "OUT-AddBlockOptionImpl");
return CA_STATUS_OK;
}
-CAResult_t CAAddBlockSizeOption(coap_pdu_t *pdu, uint16_t sizeType, size_t dataLength)
+CAResult_t CAAddBlockSizeOption(coap_pdu_t *pdu, uint16_t sizeType, size_t dataLength,
+ coap_list_t **options)
{
OIC_LOG(DEBUG, TAG, "IN-CAAddBlockSizeOption");
VERIFY_NON_NULL(pdu, TAG, "pdu");
+ VERIFY_NON_NULL(options, TAG, "options");
if (sizeType != COAP_OPTION_SIZE1 && sizeType != COAP_OPTION_SIZE2)
{
}
unsigned char value[BLOCKWISE_OPTION_BUFFER] = { 0 };
- coap_option *option = (coap_option *) OICMalloc(sizeof(coap_option));
- if (NULL == option)
- {
- OIC_LOG(ERROR, TAG, "out of memory");
- return CA_MEMORY_ALLOC_FAILED;
- }
-
- option->key = sizeType;
- option->length = coap_encode_var_bytes(value, dataLength);
+ unsigned int optionLength = coap_encode_var_bytes(value, dataLength);
- if (!coap_add_option(pdu, option->key, option->length, value))
+ int ret = coap_insert(options,
+ CACreateNewOptionNode(sizeType, optionLength, (char *) value),
+ CAOrderOpts);
+ if (ret <= 0)
{
- OIC_LOG(ERROR, TAG, "failed to add size option");
- OICFree(option);
- return CA_STATUS_FAILED;
+ return CA_STATUS_INVALID_PARAM;
}
OIC_LOG(DEBUG, TAG, "OUT-CAAddBlockSizeOption");
return CA_STATUS_OK;
}
-bool CAIsPayloadLengthInPduWithBlockSizeOption(const coap_pdu_t *pdu,
+// TODO make pdu const after libcoap is updated to support that.
+bool CAIsPayloadLengthInPduWithBlockSizeOption(coap_pdu_t *pdu,
uint16_t sizeType,
size_t *totalPayloadLen)
{
*totalPayloadLen = coap_decode_var_bytes(COAP_OPT_VALUE(option),
COAP_OPT_LENGTH(option));
- OIC_LOG_V(DEBUG, TAG, "the total payload length to be received is [%d]bytes",
+ OIC_LOG_V(DEBUG, TAG, "the total payload length to be received is [%zu]bytes",
*totalPayloadLen);
return true;
if (COAP_OPTION_BLOCK1 == blockType)
{
size_t prePayloadLen = currData->receivedPayloadLen;
- if (prePayloadLen != BLOCK_SIZE(receivedBlock->szx) * receivedBlock->num)
+ if (prePayloadLen != (size_t)BLOCK_SIZE(receivedBlock->szx)
+ * receivedBlock->num)
{
- if (receivedBlock->num > currData->block.num + 1)
+ if (receivedBlock->num > currData->block1.num + 1)
{
// 408 Error handling of block loss
OIC_LOG(ERROR, TAG, "option1: error 4.08");
}
else if (COAP_OPTION_BLOCK2 == blockType)
{
- if (receivedBlock->num != currData->block.num)
+ if (receivedBlock->num != currData->block2.num)
{
- if (receivedBlock->num > currData->block.num)
+ if (receivedBlock->num > currData->block2.num)
{
// 408 Error handling of block loss
OIC_LOG(ERROR, TAG, "option2: error 4.08");
// #3. check if error check logic is required
size_t optionLen = dataLen - blockPayloadLen;
- if (receivedBlock->m && blockPayloadLen != BLOCK_SIZE(receivedBlock->szx))
+ if (receivedBlock->m && blockPayloadLen !=
+ (size_t)BLOCK_SIZE(receivedBlock->szx))
{
// 413 Error handling of too large entity
if (COAP_MAX_PDU_SIZE < BLOCK_SIZE(receivedBlock->szx) + optionLen)
if (COAP_MAX_PDU_SIZE >= BLOCK_SIZE(size) + optionLen)
{
OIC_LOG_V(ERROR, TAG, "replace sze with %d", size);
- currData->block.szx = size;
+ if (COAP_OPTION_BLOCK2 == blockType)
+ {
+ currData->block2.szx = size;
+ }
+ else
+ {
+ currData->block1.szx = size;
+ }
break;
}
}
}
CAResult_t CAUpdatePayloadData(CABlockData_t *currData, const CAData_t *receivedData,
- uint8_t status, bool isSizeOption)
+ uint8_t status, bool isSizeOption, uint16_t blockType)
{
OIC_LOG(DEBUG, TAG, "IN-UpdatePayloadData");
if (CA_BLOCK_TOO_LARGE == status)
{
- blockPayloadLen = BLOCK_SIZE(currData->block.szx);
+ blockPayloadLen = (COAP_OPTION_BLOCK2 == blockType) ?
+ BLOCK_SIZE(currData->block2.szx) : BLOCK_SIZE(currData->block1.szx);
}
// memory allocation for the received block payload
size_t prePayloadLen = currData->receivedPayloadLen;
- if (NULL != blockPayload)
+ if (blockPayload)
{
- if (0 != currData->payloadLength)
+ if (currData->payloadLength)
{
// in case the block message has the size option
// allocate the memory for the total payload
- if (true == isSizeOption)
+ if (isSizeOption)
{
CAPayload_t prePayload = currData->payload;
OIC_LOG(DEBUG, TAG, "allocate memory for the total payload");
- currData->payload = (CAPayload_t) OICCalloc(currData->payloadLength + 1,
- sizeof(char));
+ currData->payload = (CAPayload_t) OICCalloc(1, currData->payloadLength);
if (NULL == currData->payload)
{
OIC_LOG(ERROR, TAG, "out of memory");
{
OIC_LOG(DEBUG, TAG, "allocate memory for the received block payload");
- size_t totalPayloadLen = prePayloadLen + blockPayloadLen + 1;
- void *newPayload = realloc(currData->payload, totalPayloadLen);
+ size_t totalPayloadLen = prePayloadLen + blockPayloadLen;
+ CAPayload_t newPayload = OICRealloc(currData->payload, totalPayloadLen);
if (NULL == newPayload)
{
OIC_LOG(ERROR, TAG, "out of memory");
}
// update the total payload
- memset(newPayload + prePayloadLen, 0, blockPayloadLen + 1);
+ memset(newPayload + prePayloadLen, 0, blockPayloadLen);
currData->payload = newPayload;
memcpy(currData->payload + prePayloadLen, blockPayload, blockPayloadLen);
}
// update received payload length
currData->receivedPayloadLen += blockPayloadLen;
- OIC_LOG_V(DEBUG, TAG, "updated payload: %s, len: %d", currData->payload,
+ OIC_LOG_V(DEBUG, TAG, "updated payload: %s, len: %zu", currData->payload,
currData->receivedPayloadLen);
}
VERIFY_NON_NULL_RET(pdu->hdr, TAG, "pdu->hdr", NULL);
VERIFY_NON_NULL_RET(endpoint, TAG, "endpoint", NULL);
- CAInfo_t responseData = { 0 };
- responseData.token = (CAToken_t) OICMalloc(pdu->hdr->token_length);
- if (NULL == responseData.token)
+ CAInfo_t responseData = { .tokenLength = pdu->hdr->coap_hdr_udp_t.token_length };
+ responseData.token = (CAToken_t) OICMalloc(responseData.tokenLength);
+ if (!responseData.token)
{
OIC_LOG(ERROR, TAG, "out of memory");
return NULL;
}
- memcpy(responseData.token, pdu->hdr->token, pdu->hdr->token_length);
- responseData.tokenLength = pdu->hdr->token_length;
+ memcpy(responseData.token, pdu->hdr->coap_hdr_udp_t.token, responseData.tokenLength);
+
CAResponseInfo_t* responseInfo = (CAResponseInfo_t*) OICCalloc(1, sizeof(CAResponseInfo_t));
- if (NULL == responseInfo)
+ if (!responseInfo)
{
OIC_LOG(ERROR, TAG, "out of memory");
+ OICFree(responseData.token);
return NULL;
}
responseInfo->info = responseData;
CAData_t *data = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
- if (NULL == data)
+ if (!data)
{
OIC_LOG(ERROR, TAG, "out of memory");
OICFree(responseInfo);
VERIFY_NON_NULL_RET(data, TAG, "data", NULL);
CAData_t *clone = (CAData_t *) OICCalloc(1, sizeof(CAData_t));
- if (NULL == clone)
+ if (!clone)
{
OIC_LOG(ERROR, TAG, "out of memory");
return NULL;
}
- memcpy(clone, data, sizeof(CAData_t));
+ *clone = *data;
if (data->requestInfo)
{
clone->requestInfo = CACloneRequestInfo(data->requestInfo);
}
-
- if (data->responseInfo)
+ else if (data->responseInfo)
{
clone->responseInfo = CACloneResponseInfo(data->responseInfo);
}
clone->remoteEndpoint = CACloneEndpoint(data->remoteEndpoint);
}
- if (NULL != data->options && 0 < data->numOptions)
- {
- // copy data
- CAHeaderOption_t *headerOption = (CAHeaderOption_t *) OICMalloc(sizeof(CAHeaderOption_t)
- * data->numOptions);
- if (NULL == headerOption)
- {
- OIC_LOG(ERROR, TAG, "Out of memory");
- CADestroyDataSet(clone);
- return NULL;
- }
- memcpy(headerOption, data->options, sizeof(CAHeaderOption_t) * data->numOptions);
-
- clone->options = headerOption;
- }
-
return clone;
}
VERIFY_NON_NULL(data, TAG, "data is NULL");
VERIFY_NON_NULL(payload, TAG, "payload is NULL");
- if (NULL != data->requestInfo)
+ CAPayload_t newPayload = NULL;
+ switch (data->dataType)
{
- // allocate payload field
- if (NULL != data->requestInfo->info.payload)
- {
- char *temp = (char *) OICCalloc(payloadLen, sizeof(char));
- if (NULL == temp)
+ case CA_REQUEST_DATA:
+ if (!data->requestInfo)
+ {
+ OIC_LOG(ERROR, TAG, "request info is null");
+ return CA_STATUS_FAILED;
+ }
+ // allocate payload field
+ newPayload = OICRealloc(data->requestInfo->info.payload, payloadLen);
+ if (!newPayload)
{
OIC_LOG(ERROR, TAG, "out of memory");
return CA_STATUS_FAILED;
}
- memcpy(temp, payload, payloadLen);
-
- // save the full payload
- OICFree(data->requestInfo->info.payload);
- data->requestInfo->info.payload = (CAPayload_t) temp;
- }
- data->requestInfo->info.payloadSize = payloadLen;
- }
+ data->requestInfo->info.payload = newPayload;
+ memcpy(data->requestInfo->info.payload, payload, payloadLen);
+ data->requestInfo->info.payloadSize = payloadLen;
+ break;
- if (NULL != data->responseInfo)
- {
- // allocate payload field
- if (NULL != data->responseInfo->info.payload)
- {
- char *temp = (char *) OICCalloc(payloadLen, sizeof(char));
- if (NULL == temp)
+ case CA_RESPONSE_DATA:
+ if (!data->responseInfo)
+ {
+ OIC_LOG(ERROR, TAG, "response info is null");
+ return CA_STATUS_FAILED;
+ }
+ // allocate payload field
+ newPayload = OICRealloc(data->responseInfo->info.payload, payloadLen);
+ if (!newPayload)
{
OIC_LOG(ERROR, TAG, "out of memory");
return CA_STATUS_FAILED;
}
- memcpy(temp, payload, payloadLen);
+ data->responseInfo->info.payload = newPayload;
+ memcpy(data->responseInfo->info.payload, payload, payloadLen);
+ data->responseInfo->info.payloadSize = payloadLen;
+ break;
- // save the full payload
- OICFree(data->responseInfo->info.payload);
- data->responseInfo->info.payload = (CAPayload_t) temp;
- }
- data->responseInfo->info.payloadSize = payloadLen;
+ default:
+ // does not occur case
+ OIC_LOG(ERROR, TAG, "not supported data type");
+ return CA_NOT_SUPPORTED;
}
OIC_LOG(DEBUG, TAG, "OUT-UpdatePayload");
VERIFY_NON_NULL_RET(data, TAG, "data", NULL);
VERIFY_NON_NULL_RET(payloadLen, TAG, "payloadLen", NULL);
- if (NULL != data->requestInfo)
+ if (data->requestInfo)
{
- if (NULL != data->requestInfo->info.payload)
+ if (data->requestInfo->info.payload)
{
*payloadLen = data->requestInfo->info.payloadSize;
return data->requestInfo->info.payload;
}
else
{
- if (NULL != data->responseInfo->info.payload)
+ if (data->responseInfo->info.payload)
{
*payloadLen = data->responseInfo->info.payloadSize;
return data->responseInfo->info.payload;
break;
default:
OIC_LOG_V(ERROR, TAG, "there is no Error Code of BWT[%d]", responseResult);
+ return CA_STATUS_FAILED;
}
OIC_LOG(DEBUG, TAG, "OUT-HandleBlockErrorRes");
return CA_STATUS_OK;
}
-CAResult_t CAUpdateBlockOptionType(const unsigned char* token, uint8_t blockType)
+CAResult_t CAUpdateBlockOptionType(const CABlockDataID_t *blockID,
+ uint8_t blockType)
{
OIC_LOG(DEBUG, TAG, "IN-UpdateBlockOptionType");
- VERIFY_NON_NULL(token, TAG, "token");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
- {
- currData->type = blockType;
- ca_mutex_unlock(g_context.blockDataListMutex);
- OIC_LOG(DEBUG, TAG, "OUT-UpdateBlockOptionType");
- return CA_STATUS_OK;
- }
+ currData->type = blockType;
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ OIC_LOG(DEBUG, TAG, "OUT-UpdateBlockOptionType");
+ return CA_STATUS_OK;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
return CA_STATUS_FAILED;
}
-uint8_t CAGetBlockOptionType(const unsigned char* token)
+uint8_t CAGetBlockOptionType(const CABlockDataID_t *blockID)
{
OIC_LOG(DEBUG, TAG, "IN-GetBlockOptionType");
- VERIFY_NON_NULL(token, TAG, "token");
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", 0);
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
- {
- ca_mutex_unlock(g_context.blockDataListMutex);
- OIC_LOG(DEBUG, TAG, "OUT-GetBlockOptionType");
- return currData->type;
- }
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ OIC_LOG(DEBUG, TAG, "OUT-GetBlockOptionType");
+ return currData->type;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
return 0;
}
-CAData_t *CAGetDataSetFromBlockDataList(const unsigned char* token)
+CAData_t *CAGetDataSetFromBlockDataList(const CABlockDataID_t *blockID)
{
- VERIFY_NON_NULL_RET(token, TAG, "token", NULL);
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", NULL);
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
- {
- ca_mutex_unlock(g_context.blockDataListMutex);
- return currData->sentData;
- }
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ return currData->sentData;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
if (NULL != currData->sentData && NULL != currData->sentData->requestInfo)
{
- if (pdu->hdr->id == currData->sentData->requestInfo->info.messageId &&
+ if (pdu->hdr->coap_hdr_udp_t.id == currData->sentData->requestInfo->info.messageId &&
endpoint->adapter == currData->sentData->remoteEndpoint->adapter)
{
- if (NULL != currData->token)
+ if (NULL != currData->sentData->requestInfo->info.token)
{
- responseInfo->info.tokenLength = currData->tokenLength;
- responseInfo->info.token = (char *) OICMalloc(currData->tokenLength);
+ uint8_t length = currData->sentData->requestInfo->info.tokenLength;
+ responseInfo->info.tokenLength = length;
+ responseInfo->info.token = (char *) OICMalloc(length);
if (NULL == responseInfo->info.token)
{
OIC_LOG(ERROR, TAG, "out of memory");
ca_mutex_unlock(g_context.blockDataListMutex);
return CA_MEMORY_ALLOC_FAILED;
}
- memcpy(responseInfo->info.token, currData->token,
+ memcpy(responseInfo->info.token, currData->sentData->requestInfo->info.token,
responseInfo->info.tokenLength);
ca_mutex_unlock(g_context.blockDataListMutex);
VERIFY_NON_NULL(sendData, TAG, "sendData");
VERIFY_NON_NULL(blockData, TAG, "blockData");
+ CABlockDataID_t* blockDataID;
+ if(sendData->requestInfo)
+ {
+ blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)sendData->requestInfo->info.token,
+ sendData->requestInfo->info.tokenLength,
+ sendData->remoteEndpoint->port);
+ }
+ else if(sendData->responseInfo)
+ {
+ blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)sendData->responseInfo->info.token,
+ sendData->responseInfo->info.tokenLength,
+ sendData->remoteEndpoint->port);
+ }
+ else
+ {
+ OIC_LOG(ERROR, TAG, "sendData doesn't have requestInfo or responseInfo");
+ return CA_STATUS_FAILED;
+ }
+
+ if (NULL == blockDataID || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
ca_mutex_lock(g_context.blockDataListMutex);
size_t len = u_arraylist_length(g_context.dataList);
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if ((NULL == currData) || (NULL == currData->token))
+ if (!currData)
{
continue;
}
- if (NULL != sendData->requestInfo) // sendData is requestMessage
+ if (sendData->requestInfo) // sendData is requestMessage
{
OIC_LOG(DEBUG, TAG, "Send request");
- if (NULL != currData->token && NULL != sendData->requestInfo->info.token)
+ if (NULL != currData->blockDataId
+ && NULL != currData->blockDataId->id
+ && currData->blockDataId->idLength > 0
+ && NULL != sendData->requestInfo->info.token)
{
- if (!strncmp(currData->token, sendData->requestInfo->info.token,
- currData->tokenLength))
+ if (CABlockidMatches(currData, blockDataID))
{
OIC_LOG(ERROR, TAG, "already sent");
continue;
}
}
}
- else if (NULL != sendData->responseInfo) // sendData is responseMessage
+ else if (sendData->responseInfo) // sendData is responseMessage
{
OIC_LOG(DEBUG, TAG, "Send response");
- if (NULL != currData->token && NULL != sendData->responseInfo->info.token)
+ if (NULL != currData->blockDataId
+ && NULL != currData->blockDataId->id
+ && currData->blockDataId->idLength > 0
+ && NULL != sendData->responseInfo->info.token)
{
- if (!strncmp(currData->token, sendData->responseInfo->info.token,
- currData->tokenLength))
+ if (CABlockidMatches(currData, blockDataID))
{
// set sendData
if (NULL != currData->sentData)
{
OIC_LOG(DEBUG, TAG, "init block number");
- currData->block.num = 0;
CADestroyDataSet(currData->sentData);
}
currData->sentData = CACloneCAData(sendData);
*blockData = currData;
ca_mutex_unlock(g_context.blockDataListMutex);
+ CADestroyBlockID(blockDataID);
return CA_STATUS_OK;
}
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
+ CADestroyBlockID(blockDataID);
+
return CA_STATUS_FAILED;
}
-CABlockData_t *CAGetBlockDataFromBlockDataList(const unsigned char* token)
+CABlockData_t *CAGetBlockDataFromBlockDataList(const CABlockDataID_t *blockID)
{
- VERIFY_NON_NULL_RET(token, TAG, "token", NULL);
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", NULL);
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
- {
- ca_mutex_unlock(g_context.blockDataListMutex);
- return currData;
- }
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ return currData;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
return NULL;
}
-coap_block_t *CAGetBlockOption(const unsigned char* token)
+coap_block_t *CAGetBlockOption(const CABlockDataID_t *blockID,
+ uint16_t blockType)
{
OIC_LOG(DEBUG, TAG, "IN-GetBlockOption");
- VERIFY_NON_NULL_RET(token, TAG, "token", NULL);
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", NULL);
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ OIC_LOG(DEBUG, TAG, "OUT-GetBlockOption");
+ if (COAP_OPTION_BLOCK2 == blockType)
{
- ca_mutex_unlock(g_context.blockDataListMutex);
- OIC_LOG(DEBUG, TAG, "OUT-GetBlockOption");
- return &currData->block;
+ return &currData->block2;
+ }
+ else
+ {
+ return &currData->block1;
}
}
}
return NULL;
}
-CAPayload_t CAGetPayloadFromBlockDataList(const unsigned char* token, size_t *fullPayloadLen)
+CAPayload_t CAGetPayloadFromBlockDataList(const CABlockDataID_t *blockID,
+ size_t *fullPayloadLen)
{
OIC_LOG(DEBUG, TAG, "IN-GetFullPayload");
- VERIFY_NON_NULL_RET(token, TAG, "token", NULL);
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", NULL);
VERIFY_NON_NULL_RET(fullPayloadLen, TAG, "fullPayloadLen", NULL);
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
- {
- ca_mutex_unlock(g_context.blockDataListMutex);
- *fullPayloadLen = currData->receivedPayloadLen;
- OIC_LOG(DEBUG, TAG, "OUT-GetFullPayload");
- return currData->payload;
- }
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ *fullPayloadLen = currData->receivedPayloadLen;
+ OIC_LOG(DEBUG, TAG, "OUT-GetFullPayload");
+ return currData->payload;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
CABlockData_t *CACreateNewBlockData(const CAData_t *sendData)
{
- OIC_LOG(DEBUG, TAG, "IN-CreateBlockData");
+ OIC_LOG(DEBUG, TAG, "IN-CACreateNewBlockData");
VERIFY_NON_NULL_RET(sendData, TAG, "sendData", NULL);
// create block data
CABlockData_t *data = (CABlockData_t *) OICCalloc(1, sizeof(CABlockData_t));
- if (NULL == data)
+ if (!data)
{
OIC_LOG(ERROR, TAG, "memory alloc has failed");
return NULL;
}
- data->block.num = 0;
- data->block.m = 0;
- data->block.szx = CA_DEFAULT_BLOCK_SIZE;
- data->type = 0;
+ data->block1.szx = CA_DEFAULT_BLOCK_SIZE;
+ data->block2.szx = CA_DEFAULT_BLOCK_SIZE;
data->sentData = CACloneCAData(sendData);
- data->payload = NULL;
- data->payloadLength = 0;
- data->receivedPayloadLen = 0;
+ if(!data->sentData)
+ {
+ OIC_LOG(ERROR, TAG, PCF("memory alloc has failed"));
+ OICFree(data);
+ return NULL;
+ }
+ CAToken_t token = NULL;
+ uint8_t tokenLength = 0;
if (data->sentData->requestInfo)
{
// update token info
- uint8_t tokenLength = data->sentData->requestInfo->info.tokenLength;
-
- data->tokenLength = tokenLength;
- data->token = (char *) OICMalloc(tokenLength * sizeof(char));
- if (!data->token)
- {
- OIC_LOG(ERROR, TAG, "memory alloc has failed");
- OICFree(data);
- return NULL;
- }
- memcpy(data->token, data->sentData->requestInfo->info.token, tokenLength);
+ tokenLength = data->sentData->requestInfo->info.tokenLength;
+ token = data->sentData->requestInfo->info.token;
}
else if(data->sentData->responseInfo)
{
- uint8_t tokenLength = data->sentData->responseInfo->info.tokenLength;
+ tokenLength = data->sentData->responseInfo->info.tokenLength;
+ token = data->sentData->responseInfo->info.token;
+ }
- data->tokenLength = tokenLength;
- data->token = (char *) OICMalloc(tokenLength * sizeof(char));
- if (!data->token)
- {
- OIC_LOG(ERROR, TAG, "memory alloc has failed");
- OICFree(data);
- return NULL;
- }
- memcpy(data->token, data->sentData->responseInfo->info.token, tokenLength);
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ token, tokenLength,
+ data->sentData->remoteEndpoint->port);
+ if (NULL == blockDataID || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ CADestroyDataSet(data->sentData);
+ OICFree(data);
+ return NULL;
}
+ data->blockDataId = blockDataID;
ca_mutex_lock(g_context.blockDataListMutex);
- CAResult_t res = u_arraylist_add(g_context.dataList, (void *) data);
- if (CA_STATUS_OK != res)
+ bool res = u_arraylist_add(g_context.dataList, (void *) data);
+ if (!res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- OICFree(data->token);
+ CADestroyBlockID(data->blockDataId);
+ CADestroyDataSet(data->sentData);
OICFree(data);
ca_mutex_unlock(g_context.blockDataListMutex);
return NULL;
return data;
}
-CAResult_t CARemoveBlockDataFromList(const unsigned char* token)
+CAResult_t CARemoveBlockDataFromList(const CABlockDataID_t *blockID)
{
OIC_LOG(DEBUG, TAG, "CARemoveBlockData");
- VERIFY_NON_NULL(token, TAG, "token");
+ VERIFY_NON_NULL(blockID, TAG, "blockID");
ca_mutex_lock(g_context.blockDataListMutex);
for (size_t i = 0; i < len; i++)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
+ if (CABlockidMatches(currData, blockID))
{
- if (!strncmp(currData->token, (const char *) token, currData->tokenLength))
+ CABlockData_t *removedData = u_arraylist_remove(g_context.dataList, i);
+ if (!removedData)
{
- CABlockData_t *removedData = u_arraylist_remove(g_context.dataList, i);
- if (NULL == removedData)
- {
- OIC_LOG(ERROR, TAG, "data is NULL");
- ca_mutex_unlock(g_context.blockDataListMutex);
- return CA_STATUS_FAILED;
- }
-
- // destroy memory
- if (currData->sentData)
- {
- CADestroyDataSet(currData->sentData);
- }
- OICFree(currData->payload);
- OICFree(currData->token);
+ OIC_LOG(ERROR, TAG, "data is NULL");
ca_mutex_unlock(g_context.blockDataListMutex);
- return CA_STATUS_OK;
+ return CA_STATUS_FAILED;
}
- }
- }
- ca_mutex_unlock(g_context.blockDataListMutex);
-
- return CA_STATUS_OK;
-}
-bool CAIsBlockDataInList(const coap_pdu_t *pdu)
-{
- OIC_LOG(DEBUG, TAG, "IN-IsBlockDataInList");
- VERIFY_NON_NULL_RET(pdu, TAG, "pdu", false);
- VERIFY_NON_NULL_RET(pdu->hdr, TAG, "pdu->hdr", false);
-
- ca_mutex_lock(g_context.blockDataListMutex);
-
- size_t len = u_arraylist_length(g_context.dataList);
- for (size_t i = 0; i < len; i++)
- {
- CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if (currData && currData->token)
- {
- if (!strncmp(currData->token, (const char *) pdu->hdr->token, currData->tokenLength))
+ // destroy memory
+ if (currData->sentData)
{
- OIC_LOG(DEBUG, TAG, "found block data");
- ca_mutex_unlock(g_context.blockDataListMutex);
- return true;
+ CADestroyDataSet(currData->sentData);
}
+ CADestroyBlockID(currData->blockDataId);
+ OICFree(currData->payload);
+ OICFree(currData);
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ return CA_STATUS_OK;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
- OIC_LOG(DEBUG, TAG, "OUT-IsBlockDataInList");
- return false;
+ return CA_STATUS_OK;
}
void CADestroyDataSet(CAData_t* data)
CAFreeEndpoint(data->remoteEndpoint);
CADestroyRequestInfoInternal(data->requestInfo);
CADestroyResponseInfoInternal(data->responseInfo);
- OICFree(data->options);
OICFree(data);
}
+CABlockDataID_t* CACreateBlockDatablockId(const CAToken_t token, uint8_t tokenLength,
+ uint16_t portNumber)
+{
+ char port[PORT_LENGTH] = {0,};
+ port[0] = (char)((portNumber>>8) & 0xFF);
+ port[1] = (char)(portNumber & 0xFF);
+
+ CABlockDataID_t* blockDataID = (CABlockDataID_t *) OICMalloc(sizeof(CABlockDataID_t));
+ if (!blockDataID)
+ {
+ OIC_LOG(ERROR, TAG, "memory alloc has failed");
+ return NULL;
+ }
+ blockDataID->idLength = tokenLength + sizeof(port);
+ blockDataID->id = (uint8_t *) OICMalloc(blockDataID->idLength);
+ if (!blockDataID->id)
+ {
+ OIC_LOG(ERROR, TAG, "memory alloc has failed");
+ OICFree(blockDataID);
+ return NULL;
+ }
+
+ if (token)
+ {
+ memcpy(blockDataID->id, token, tokenLength);
+ }
+
+ memcpy(blockDataID->id + tokenLength, port, sizeof(port));
+
+ OIC_LOG(DEBUG, TAG, "BlockID is ");
+ OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *)blockDataID->id, blockDataID->idLength);
+
+ return blockDataID;
+}
+
+void CADestroyBlockID(CABlockDataID_t *blockID)
+{
+ VERIFY_NON_NULL_VOID(blockID, TAG, "blockID");
+ OICFree(blockID->id);
+ OICFree(blockID);
+ blockID = NULL;
+}
+
+bool CABlockidMatches(const CABlockData_t *currData, const CABlockDataID_t *blockID)
+{
+ VERIFY_NON_NULL_RET(currData, TAG, "currData", false);
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", false);
+ VERIFY_NON_NULL_RET(blockID->id, TAG, "blockID->id", false);
+
+ if ((currData->blockDataId)
+ && (currData->blockDataId->id)
+ && (currData->blockDataId->idLength == blockID->idLength)
+ && !memcmp(currData->blockDataId->id, blockID->id, currData->blockDataId->idLength))
+ {
+ return true;
+ }
+ return false;
+}
+
void CALogBlockInfo(coap_block_t *block)
{
VERIFY_NON_NULL_VOID(block, TAG, "block");
projects / platform / upstream / iotivity.git / blobdiff