typedef struct
{
- coap_block_t block; /**< block option */
+ uint8_t* id; /**< blockData ID for CA */
+ size_t idLength; /**< length of blockData ID */
+} CABlockDataID_t;
+
+typedef struct
+{
+ coap_block_t block1; /**< block1 option */
+ coap_block_t block2; /**< block2 option */
uint16_t type; /**< block option type */
- CAToken_t token; /**< token for CA */
- uint8_t tokenLength; /**< token length*/
+ CABlockDataID_t* blockDataId; /**< ID set of CABlockData */
CAData_t *sentData; /**< sent request or response data information */
CAPayload_t payload; /**< payload buffer */
size_t payloadLength; /**< the total payload length to be received */
/**
* Add the data to send thread queue
* @param[in] sendData data for sending
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CAAddSendThreadQueue(const CAData_t *sendData, const unsigned char* token);
+CAResult_t CAAddSendThreadQueue(const CAData_t *sendData, const CABlockDataID_t *blockID);
/**
* Check the block option type. If it has to be sent to a block,
/**
* Pass the received pdu data. and check if block option is set.
- * @param[in] pdu received pdu binary data
+ * @param[in] pdu received pdu binary data
* @param[in] endpoint information of remote device
* @param[in] receivedData received CAData
* @param[in] dataLen received data length
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CAReceiveBlockWiseData(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+CAResult_t CAReceiveBlockWiseData(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, size_t dataLen);
/**
* process next step by block-wise state
- * @param[in] pdu received pdu binary data
+ * @param[in] pdu received pdu binary data
* @param[in] receivedData received CAData
* @param[in] blockWiseStatus block-wise state to move next step
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
CAResult_t CAProcessNextStep(const coap_pdu_t *pdu, const CAData_t *receivedData,
- uint8_t blockWiseStatus);
+ uint8_t blockWiseStatus, const CABlockDataID_t *blockID);
/**
* send block message to remote device
- * @param[in] pdu received pdu binary data
- * @param[in] msgType the message type of the block
- * @param[in] status block-wise state to move next step
+ * @param[in] pdu received pdu binary data
+ * @param[in] msgType the message type of the block
+ * @param[in] status block-wise state to move next step
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-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);
/**
* send error message to remote device
- * @param[in] pdu received pdu binary data
- * @param[in] status block-wise state to move next step
- * @param[in] responseResult response result code
+ * @param[in] pdu received pdu binary data
+ * @param[in] status block-wise state to move next step
+ * @param[in] responseResult response result code
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
CAResult_t CASendErrorMessage(const coap_pdu_t *pdu, uint8_t status,
- CAResponseResult_t responseResult);
+ CAResponseResult_t responseResult,
+ const CABlockDataID_t *blockID);
/**
* receive last block data
- * @param[in] pdu received pdu binary data
+ * @param[in] blockID ID set of CABlockData
* @param[in] receivedData received CAData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CAReceiveLastBlock(const coap_pdu_t *pdu, const CAData_t *receivedData);
+CAResult_t CAReceiveLastBlock(const CABlockDataID_t *blockID,
+ const CAData_t *receivedData);
/**
* set next block option 1
* @param[in] dataLen received data length
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CASetNextBlockOption1(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+CAResult_t CASetNextBlockOption1(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, coap_block_t block,
size_t dataLen);
* @param[in] dataLen received data length
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CASetNextBlockOption2(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+CAResult_t CASetNextBlockOption2(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, coap_block_t block,
size_t dataLen);
* Update the block option in block-wise transfer list
* @param[in] currData stored block data information
* @param[in] block block option of current message
+ * @param[in] blockType block option type
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CAUpdateBlockData(CABlockData_t *currData, coap_block_t block);
+CAResult_t CAUpdateBlockData(CABlockData_t *currData, coap_block_t block,
+ uint16_t blockType);
/**
* Update the messageId in block-wise transfer list
- * @param[in] currData stored block data information
- * @param[in] block block option of current message
+ * @param[in] pdu received pdu binary data
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CAUpdateMessageId(coap_pdu_t *pdu);
+CAResult_t CAUpdateMessageId(coap_pdu_t *pdu, const CABlockDataID_t *blockID);
/**
* Update the block option items
* check the block option what kind of option have to set.
* @param[out] pdu pdu object
* @param[in] info information of the request/response
+ * @param[in] endpoint port of transport
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-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);
/**
* Write the block option2 in pdu binary data.
- * @param[out] pdu pdu object
+ * @param[out] pdu pdu object
* @param[in] info information of the request/response
* @param[in] dataLength length of payload
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-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);
/**
* Write the block option1 in pdu binary data.
- * @param[out] pdu pdu object
+ * @param[out] pdu pdu object
* @param[in] info information of the request/response
* @param[in] dataLength length of payload
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-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);
/**
* Add the block option in pdu data
- * @param[in] pdu pdu object
- * @param[out] block block data
+ * @param[in] pdu pdu object
+ * @param[out] block block data
* @param[in] blockType block option type
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
/**
* Add the size option in pdu data
- * @param[in/out] pdu pdu object
+ * @param[in/out] pdu pdu object
* @param[in] sizeType size option type
* @param[in] dataLength the total payload length to be sent
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
/**
* Get the size option from pdu data
- * @param[in] pdu pdu object
+ * @param[in] pdu pdu object
* @param[in] sizeType size option type
* @param[out] totalPayloadLen the total payload length to be received
* @return true or false
*/
-bool CAIsPayloadLengthInPduWithBlockSizeOption(const coap_pdu_t *pdu,
+bool CAIsPayloadLengthInPduWithBlockSizeOption(coap_pdu_t *pdu,
uint16_t sizeType,
size_t *totalPayloadLen);
* @param[in] receivedData received CAData
* @param[in] status block-wise state
* @param[in] isSizeOption size option
+ * @param[in] blockType block option type
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
CAResult_t CAUpdatePayloadData(CABlockData_t *currData, const CAData_t *receivedData,
- uint8_t status, bool isSizeOption);
+ uint8_t status, bool isSizeOption, uint16_t blockType);
/**
* Generate CAData structure from the given information.
- * @param[in] pdu pdu object
+ * @param[in] pdu pdu object
* @param[in] endpoint information of remote device
* @return generated CAData
*/
void CADestroyDataSet(CAData_t* data);
/**
+ * Create the blockId for CABlockData
+ * @param[in] token token of current message
+ * @param[in] tokenLength token length of current message
+ * @param[in] portNumber port
+ * @return ID set of CABlockData
+ */
+CABlockDataID_t* CACreateBlockDatablockId(const CAToken_t token, uint8_t tokenLength,
+ uint16_t portNumber);
+
+/**
+ * Destroy the blockId set
+ * @param[in] blockID ID set of CABlockData
+ */
+void CADestroyBlockID(CABlockDataID_t *blockID);
+
+/**
+ * check whether Block ID is matched or not
+ * @param[in] currData block data
+ * @param[in] blockID ID set of CABlockData
+ * @return true or false
+ */
+bool CABlockidMatches(const CABlockData_t *currData, const CABlockDataID_t *blockID);
+/**
* Print the given block option information
* @param[in] block block option information
*/
/**
* Set the block option type
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @param[in] blockType block option type
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CAUpdateBlockOptionType(const unsigned char* token, uint8_t blockType);
+CAResult_t CAUpdateBlockOptionType(const CABlockDataID_t *blockID,
+ uint8_t blockType);
/**
* Get the block option type from block-wise transfer list
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @return block option type
*/
-uint8_t CAGetBlockOptionType(const unsigned char* token);
+uint8_t CAGetBlockOptionType(const CABlockDataID_t *blockID);
/**
* Get the block data from block-wise transfer list
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @return CAData structure
*/
-CAData_t *CAGetDataSetFromBlockDataList(const unsigned char* token);
+CAData_t *CAGetDataSetFromBlockDataList(const CABlockDataID_t *blockID);
/**
* Get token from block-wise transfer list
- * @param[in] pdu received pdu binary data
+ * @param[in] pdu received pdu binary data
* @param[in] endpoint remote endpoint information
* @param[in] responseInfo received response information
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
/**
* Get the block data from block-wise transfer list
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @return CABlockData_t structure
*/
-CABlockData_t *CAGetBlockDataFromBlockDataList(const unsigned char* token);
+CABlockData_t *CAGetBlockDataFromBlockDataList(const CABlockDataID_t *blockID);
/**
* Get the block option from block-wise transfer list
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
+ * @param[in] blockType block option type
* @return coap_block_t structure
*/
-coap_block_t *CAGetBlockOption(const unsigned char* token);
+coap_block_t *CAGetBlockOption(const CABlockDataID_t *blockID,
+ uint16_t blockType);
/**
* Get the full payload from block-wise list
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @param[out] fullPayloadLen received full payload length
* @return payload
*/
-CAPayload_t CAGetPayloadFromBlockDataList(const unsigned char* token, size_t *fullPayloadLen);
+CAPayload_t CAGetPayloadFromBlockDataList(const CABlockDataID_t *blockID,
+ size_t *fullPayloadLen);
/**
* Create the block data from given data and add the data in block-wise transfer list
/**
* Remove the block data in block-wise transfer list
- * @param[in] token token of current message
+ * @param[in] blockID ID set of CABlockData
* @return CA_STATUS_OK or ERROR CODES (CAResult_t error codes in cacommon.h)
*/
-CAResult_t CARemoveBlockDataFromList(const unsigned char* token);
+CAResult_t CARemoveBlockDataFromList(const CABlockDataID_t *blockID);
/**
* Check if data exist in block-wise transfer list.
- * @param[in] pdu pdu object
+ * @param[in] blockID ID set of CABlockData
* @return true or false
*/
-bool CAIsBlockDataInList(const coap_pdu_t *pdu);
+bool CAIsBlockDataInList(const CABlockDataID_t *blockID);
#ifdef __cplusplus
#define BLOCKWISE_OPTION_BUFFER 3
#define BLOCK_NUMBER_IDX 4
#define BLOCK_M_BIT_IDX 3
+#define PORT_LENGTH 2
#define BLOCK_SIZE(arg) (1 << ((arg) + 4))
{
// #4. send block message
OIC_LOG(DEBUG, TAG, "send first block msg");
- CALogBlockInfo(&currData->block);
-
- res = CAAddSendThreadQueue(currData->sentData,
- (const unsigned char*) currData->token);
+ res = CAAddSendThreadQueue(currData->sentData, (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)
{
OIC_LOG(ERROR, TAG, "clone has failed");
- CARemoveBlockDataFromList(token);
+ CARemoveBlockDataFromList(blockID);
return CA_STATUS_FAILED;
}
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->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,
+CAResult_t CAReceiveBlockWiseData(coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
const CAData_t *receivedData, size_t dataLen)
{
OIC_LOG(DEBUG, TAG, "CAReceiveBlockWiseData");
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 || NULL == blockDataID->id || blockDataID->idLength < 1)
+ {
+ 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))
+
+ // 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);
if (CA_REQUEST_ENTITY_INCOMPLETE == code)
{
- CABlockData_t *data = CAGetBlockDataFromBlockDataList(pdu->hdr->token);
- if (NULL == data)
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->token,
+ pdu->hdr->token_length,
+ endpoint->port);
+
+ if(NULL == blockDataID || NULL == blockDataID->id || 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 (NULL == 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 (NULL == 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 (NULL == 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)
+ {
+ CAResult_t res = CAGetTokenFromBlockDataList(pdu, endpoint,
+ receivedData->responseInfo);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "fail to get token");
+ return res;
+ }
+ }
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);
+ data = CAGetDataSetFromBlockDataList(blockID);
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "it's unavailable");
data->responseInfo->info.messageId = pdu->hdr->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->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;
}
}
if (CA_MSG_CONFIRM == pdu->hdr->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");
if (CA_MSG_CONFIRM == pdu->hdr->type || CA_MSG_ACKNOWLEDGE == pdu->hdr->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");
case CA_BLOCK_TOO_LARGE:
if (CA_MSG_ACKNOWLEDGE == pdu->hdr->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");
}
else if (CA_MSG_CONFIRM == pdu->hdr->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);
+ CAData_t *data = CAGetDataSetFromBlockDataList(blockID);
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "CAData is unavailable");
}
// 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);
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockID);
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "data is unavailable");
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
// update payload
size_t fullPayloadLen = 0;
- CAPayload_t fullPayload = CAGetPayloadFromBlockDataList(pdu->hdr->token, &fullPayloadLen);
+ CAPayload_t fullPayload = CAGetPayloadFromBlockDataList(blockID,
+ &fullPayloadLen);
if (NULL != fullPayload)
{
CAResult_t res = CAUpdatePayloadToCAData(cloneData, fullPayload, fullPayloadLen);
return CA_STATUS_OK;
}
-CAResult_t CASetNextBlockOption1(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
+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);
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->token,
+ pdu->hdr->token_length,
+ endpoint->port);
+
+ if(NULL == blockDataID || NULL == blockDataID->id || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
// BlockData data is created if it not existed
- if (!CAIsBlockDataInList(pdu))
+ if (!CAIsBlockDataInList(blockDataID))
{
OIC_LOG(DEBUG, TAG, "no message in list");
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "data is null");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
{
OIC_LOG(ERROR, TAG, "currData is null");
CADestroyDataSet(data);
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
}
// 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);
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockDataID);
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "getting has failed");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
{
OIC_LOG(INFO, TAG, "Data has sent");
// initialize block number for response message
- data->block.num = 0;
+ data->block1.num = 0;
+ 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;
}
}
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;
}
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,
+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");
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)pdu->hdr->token,
+ pdu->hdr->token_length,
+ endpoint->port);
+
+ if(NULL == blockDataID || NULL == blockDataID->id || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
// BlockData data is created if it not existed
- if (!CAIsBlockDataInList(pdu))
+ if (!CAIsBlockDataInList(blockDataID))
{
OIC_LOG(DEBUG, TAG, "no msg in list.");
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "data is null");
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
{
OIC_LOG(ERROR, TAG, "data is null");
CADestroyDataSet(data);
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
}
// 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);
+ CABlockData_t *data = CAGetBlockDataFromBlockDataList(blockDataID);
if (NULL == data)
{
OIC_LOG(ERROR, TAG, "getting has failed");
+ CARemoveBlockDataFromList(blockDataID);
+ CADestroyBlockID(blockDataID);
return CA_STATUS_FAILED;
}
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;
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;
}
}
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;
}
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);
// #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)
{
- CAData_t * cadata = CAGetDataSetFromBlockDataList(pdu->hdr->token);
+ CAData_t * cadata = CAGetDataSetFromBlockDataList(blockID);
if (NULL == cadata)
{
OIC_LOG(ERROR, TAG, "CAData is unavailable");
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)
{
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(endpoint, TAG, "endpoint");
size_t dataLength = 0;
if (info.payload)
return CA_STATUS_OK;
}
- uint8_t blockType = CAGetBlockOptionType((*pdu)->hdr->token);
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)(*pdu)->hdr->token,
+ (*pdu)->hdr->token_length,
+ endpoint->port);
+
+ if(NULL == blockDataID || NULL == blockDataID->id || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ uint8_t blockType = CAGetBlockOptionType(blockDataID);
if (COAP_OPTION_BLOCK2 == blockType)
{
- CAResult_t res = CAAddBlockOption2(pdu, info, dataLength);
+ CAResult_t res = CAAddBlockOption2(pdu, info, dataLength,
+ blockDataID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
+ CADestroyBlockID(blockDataID);
return res;
}
}
else if (COAP_OPTION_BLOCK1 == blockType)
{
- CAResult_t res = CAAddBlockOption1(pdu, info, dataLength);
+ CAResult_t res = CAAddBlockOption1(pdu, info, dataLength,
+ blockDataID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
+ CADestroyBlockID(blockDataID);
return res;
}
}
}
}
- CAResult_t res = CAUpdateMessageId(*pdu);
+ CAResult_t res = CAUpdateMessageId(*pdu, blockDataID);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "fail to update CON message id ");
+ CADestroyBlockID(blockDataID);
return res;
}
+ CADestroyBlockID(blockDataID);
OIC_LOG(DEBUG, TAG, "OUT-AddBlockOption");
return CA_STATUS_OK;
}
-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)
{
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(blockID, TAG, "blockID");
// 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))
{
- int32_t res = coap_write_block_opt(block, COAP_OPTION_BLOCK2, *pdu, dataLength);
+ int32_t res = coap_write_block_opt(block2, COAP_OPTION_BLOCK2, *pdu, dataLength);
switch (res)
{
case -2: /* illegal block */
default:
OIC_LOG(INFO, TAG, "success write block option");
}
- CALogBlockInfo(block);
+ CALogBlockInfo(block2);
+
+ if (block1->num)
+ {
+ OIC_LOG(DEBUG, TAG, "combining block1 and block2");
+ CAResult_t res = CAAddBlockOptionImpl(*pdu, block1, COAP_OPTION_BLOCK1);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "add has failed");
+ CARemoveBlockDataFromList(blockID);
+ return res;
+ }
+ // initialize block number
+ block1->num = 0;
+ }
// if block number is 0, add size2 option
- if (0 == block->num)
+ if (0 == block2->num)
{
res = CAAddBlockSizeOption(*pdu, COAP_OPTION_SIZE2, dataLength);
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))
+ 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->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(*pdu, block2, COAP_OPTION_BLOCK2);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
}
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)
{
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(blockID, TAG, "blockID");
// 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 (NULL == block1)
{
OIC_LOG(ERROR, TAG, "getting has failed");
return CA_STATUS_FAILED;
}
- CALogBlockInfo(block);
+ CALogBlockInfo(block1);
if (CA_MSG_ACKNOWLEDGE == (*pdu)->hdr->type)
{
OIC_LOG(DEBUG, TAG, "option1 and ACK msg..");
- CAResult_t res = CAAddBlockOptionImpl(*pdu, block, COAP_OPTION_BLOCK1);
+ CAResult_t res = CAAddBlockOptionImpl(*pdu, block1, COAP_OPTION_BLOCK1);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
// 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);
+ CAGetMoreBitFromBlock(dataLength, block1);
+ CAResult_t res = CAAddBlockOptionImpl(*pdu, block1, COAP_OPTION_BLOCK1);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- CARemoveBlockDataFromList((*pdu)->hdr->token);
+ CARemoveBlockDataFromList(blockID);
return res;
}
- CALogBlockInfo(block);
+ CALogBlockInfo(block1);
// if block number is 0, add size1 option
- if (0 == block->num)
+ if (0 == block1->num)
{
res = CAAddBlockSizeOption(*pdu, COAP_OPTION_SIZE1, dataLength);
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))
+ 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 (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);
}
}
}
}
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))
+ if (!coap_add_option(pdu, sizeType, optionLength, value))
{
OIC_LOG(ERROR, TAG, "failed to add size option");
- OICFree(option);
return CA_STATUS_FAILED;
}
return CA_STATUS_OK;
}
-bool CAIsPayloadLengthInPduWithBlockSizeOption(const coap_pdu_t *pdu,
+bool CAIsPayloadLengthInPduWithBlockSizeOption(coap_pdu_t *pdu,
uint16_t sizeType,
size_t *totalPayloadLen)
{
size_t prePayloadLen = currData->receivedPayloadLen;
if (prePayloadLen != 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");
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
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 (pdu->hdr->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);
ca_mutex_unlock(g_context.blockDataListMutex);
OIC_LOG(DEBUG, TAG, "OUT-CAGetTokenFromBlockDataList");
- return CA_STATUS_FAILED;
+ return CA_STATUS_OK;
}
CAResult_t CACheckBlockDataValidation(const CAData_t *sendData, CABlockData_t **blockData)
{
CABlockData_t *currData = (CABlockData_t *) u_arraylist_get(g_context.dataList, i);
- if ((NULL == currData) || (NULL == currData->token))
+ if (NULL == currData)
{
continue;
}
if (NULL != 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))
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)sendData->requestInfo->info.token,
+ sendData->requestInfo->info.tokenLength,
+ sendData->remoteEndpoint->port);
+
+ if(NULL == blockDataID || NULL == blockDataID->id || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ if (CABlockidMatches(currData, blockDataID))
{
OIC_LOG(ERROR, TAG, "already sent");
+ CADestroyBlockID(blockDataID);
continue;
}
+ CADestroyBlockID(blockDataID);
}
}
else if (NULL != 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))
+ CABlockDataID_t* blockDataID = CACreateBlockDatablockId(
+ (CAToken_t)sendData->responseInfo->info.token,
+ sendData->responseInfo->info.tokenLength,
+ sendData->remoteEndpoint->port);
+
+ if(NULL == blockDataID || NULL == blockDataID->id || blockDataID->idLength < 1)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return CA_STATUS_FAILED;
+ }
+
+ 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;
+ CADestroyBlockID(blockDataID);
ca_mutex_unlock(g_context.blockDataListMutex);
return CA_STATUS_OK;
}
+ CADestroyBlockID(blockDataID);
}
}
else
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
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;
+ 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 && NULL == blockDataID->id && blockDataID->idLength < 0)
+ {
+ OIC_LOG(ERROR, TAG, "blockId is null");
+ CADestroyBlockID(blockDataID);
+ return NULL;
}
+ data->blockDataId = blockDataID;
ca_mutex_lock(g_context.blockDataListMutex);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "add has failed");
- OICFree(data->token);
+ CADestroyBlockID(data->blockDataId);
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 (NULL == 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;
+ }
+
+ // destroy memory
+ if (currData->sentData)
+ {
+ CADestroyDataSet(currData->sentData);
}
+ OICFree(currData->payload);
+ CADestroyBlockID(currData->blockDataId);
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ return CA_STATUS_OK;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
return CA_STATUS_OK;
}
-bool CAIsBlockDataInList(const coap_pdu_t *pdu)
+bool CAIsBlockDataInList(const CABlockDataID_t *blockID)
{
OIC_LOG(DEBUG, TAG, "IN-IsBlockDataInList");
- VERIFY_NON_NULL_RET(pdu, TAG, "pdu", false);
- VERIFY_NON_NULL_RET(pdu->hdr, TAG, "pdu->hdr", false);
+ VERIFY_NON_NULL_RET(blockID, TAG, "blockID", false);
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 *) pdu->hdr->token, currData->tokenLength))
- {
- OIC_LOG(DEBUG, TAG, "found block data");
- ca_mutex_unlock(g_context.blockDataListMutex);
- return true;
- }
+ OIC_LOG(DEBUG, TAG, "found block data");
+ ca_mutex_unlock(g_context.blockDataListMutex);
+ return true;
}
}
ca_mutex_unlock(g_context.blockDataListMutex);
OICFree(data);
}
+CABlockDataID_t* CACreateBlockDatablockId(const CAToken_t token, uint8_t tokenLength,
+ uint16_t portNumber)
+{
+ VERIFY_NON_NULL_RET(token, TAG, "token", NULL);
+
+ 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));
+ 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;
+ }
+
+ 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 / commitdiff