Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Idf480dc4361b14c8902e15f74ca253a55b2f3e1e
+http://suprem.sec.samsung.net/jira/browse/CONPRO-1102
+
+commit_info_2017-10-04-rev1.txt
+
+commit_id: 43892977769486782b5b0475cc0343c875a4dca1
+----------------------------------------------------------------------------------------------------------------------------------
http://suprem.sec.samsung.net/jira/browse/CONPRO-1098
commit_info_2017-09-27-rev1.txt
http://suprem.sec.samsung.net/jira/browse/CONPRO-1098
commit_info_2017-09-27-rev1.txt
/**
* TAG of Analyzer log.
*/
/**
* TAG of Analyzer log.
*/
-#define ANALYZER_TAG "OIC_CA_ANALYZER_071801"
-#define BLE_CLIENT_TAG "OIC_CA_LE_CLIENT_0718"
-#define BLE_SERVER_MCD_TAG "OIC_CA_LE_SER_MC_0718"
-#define IP_SERVER_TAG "OIC_CA_IP_SERVER_0718"
-#define TCP_SERVER_TAG "OIC_CA_TCP_SERVER_0718"
+#define ANALYZER_TAG "OIC_CA_ANALYZER_092601"
+#define BLE_CLIENT_TAG "OIC_CA_LE_CLIENT_0926"
+#define BLE_SERVER_MCD_TAG "OIC_CA_LE_SER_MC_0926"
+#define IP_SERVER_TAG "OIC_CA_IP_SERVER_0926"
+#define TCP_SERVER_TAG "OIC_CA_TCP_SERVER_0926"
static void CADestroyInfoInternal(CAInfo_t *info)
{
static void CADestroyInfoInternal(CAInfo_t *info)
{
+ if (NULL == info)
+ {
+ return;
+ }
+
// free token field
OICFree(info->token);
info->token = NULL;
// free token field
OICFree(info->token);
info->token = NULL;
/** default ACK time is 2 sec(CoAP). **/
#define DEFAULT_ACK_TIMEOUT_SEC 2
/** default ACK time is 2 sec(CoAP). **/
#define DEFAULT_ACK_TIMEOUT_SEC 2
-/** default max retransmission trying count is 4(CoAP). **/
-#define DEFAULT_RETRANSMISSION_COUNT 4
+/** default max retransmission trying count is 4(CoAP).
+ * to allow reponse timeout greater than 60 seconds increased trying count to 5
+ */
+#define DEFAULT_RETRANSMISSION_COUNT 5
/** check period is 1 sec. **/
#define RETRANSMISSION_CHECK_PERIOD_SEC 1
/** check period is 1 sec. **/
#define RETRANSMISSION_CHECK_PERIOD_SEC 1
mbedtls_x509_crt_info(buf, sizeof(buf) - 1, "", crt);
OIC_LOG_V(DEBUG, NET_SSL_TAG, "crt : %s", buf);
mbedtls_x509_crt_info(buf, sizeof(buf) - 1, "", crt);
OIC_LOG_V(DEBUG, NET_SSL_TAG, "crt : %s", buf);
- g_peerCertCallback.cb(g_peerCertCallback.ctx, crt, depth);
-
- return 0;
+ return g_peerCertCallback.cb(g_peerCertCallback.ctx, crt, depth);
}
CAResult_t CAsetPeerCertCallback(void *ctx, PeerCertCallback peerCertCallback)
}
CAResult_t CAsetPeerCertCallback(void *ctx, PeerCertCallback peerCertCallback)
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateVariableForFragmentation failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateVariableForFragmentation failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeaderPayloadLength failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeaderPayloadLength failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
-
- g_errorHandler(bleData->remoteEndpoint,
- bleData->data,
- bleData->dataLen,
- result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint,
+ bleData->data,
+ bleData->dataLen,
+ result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Update characteristics failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Update characteristics failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
return;
}
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%d]",
return;
}
OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "Server Sent data length [%d]",
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
- g_errorHandler(bleData->remoteEndpoint,
- bleData->data,
- bleData->dataLen,
- result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint,
+ bleData->data,
+ bleData->dataLen,
+ result);
+ }
return;
}
OIC_LOG_V(DEBUG,
return;
}
OIC_LOG_V(DEBUG,
CALEADAPTER_TAG,
"CALEClientSendNegotiationMessage has failed, result [%d]",
res);
CALEADAPTER_TAG,
"CALEClientSendNegotiationMessage has failed, result [%d]",
res);
-
- g_errorHandler(bleData->remoteEndpoint,
- bleData->data,
- bleData->dataLen,
- res);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint,
+ bleData->data,
+ bleData->dataLen,
+ res);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateVariableForFragmentation failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateVariableForFragmentation failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeaderPayloadLength failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeaderPayloadLength failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
- g_errorHandler(bleData->remoteEndpoint,
- bleData->data,
- bleData->dataLen,
- result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint,
+ bleData->data,
+ bleData->dataLen,
+ result);
+ }
return;
}
OIC_LOG_V(DEBUG,
return;
}
OIC_LOG_V(DEBUG,
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"CAGenerateHeader failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
CALEADAPTER_TAG,
"Update characteristics failed, result [%d]",
result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
return;
}
OIC_LOG_V(DEBUG,
return;
}
OIC_LOG_V(DEBUG,
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG,
"Making data segment failed, result [%d]", result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics failed, result [%d]",
result);
{
OIC_LOG_V(ERROR, CALEADAPTER_TAG, "Update characteristics failed, result [%d]",
result);
- g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ if (g_errorHandler)
+ {
+ g_errorHandler(bleData->remoteEndpoint, bleData->data, bleData->dataLen, result);
+ }
return;
}
OIC_LOG_V(DEBUG,
return;
}
OIC_LOG_V(DEBUG,
{
VERIFY_NON_NULL(currData, TAG, "currData");
VERIFY_NON_NULL(pdu, TAG, "pdu");
{
VERIFY_NON_NULL(currData, TAG, "currData");
VERIFY_NON_NULL(pdu, TAG, "pdu");
+ VERIFY_NON_NULL(pdu->transport_hdr, TAG, "pdu->transport_hdr");
VERIFY_NON_NULL(block, TAG, "block");
// update block data
VERIFY_NON_NULL(block, TAG, "block");
// update block data
OIC_LOG_V(ERROR, TAG, "Clear send data failed[%d]", res);
}
OIC_LOG_V(ERROR, TAG, "Clear send data failed[%d]", res);
}
- res = CARetransmissionClearAdapterData(&g_retransmissionContext, transportType);
- if (res != CA_STATUS_OK)
+ if (transportType & DEFAULT_RETRANSMISSION_TYPE)
- OIC_LOG_V(ERROR, TAG, "Clear retransmission data failed[%d]", res);
+ res = CARetransmissionClearAdapterData(&g_retransmissionContext, transportType);
+ if (res != CA_STATUS_OK)
+ {
+ OIC_LOG_V(ERROR, TAG, "Clear retransmission data failed[%d]", res);
+ }
// free
if (NULL != removedData && NULL != removedData->endpoint &&
// free
if (NULL != removedData && NULL != removedData->endpoint &&
- removedData->endpoint->adapter == type)
+ (removedData->endpoint->adapter == type))
- CAFreeEndpoint(removedData->endpoint);
- OICFree(removedData->pdu);
- OICFree(removedData);
+ CARetransmissionData_t *remData = (CARetransmissionData_t *) u_arraylist_remove(
+ context->dataList, i);
+ if (NULL == remData)
+ {
+ continue;
+ }
+ CAFreeEndpoint(remData->endpoint);
+ OICFree(remData->pdu);
+ OICFree(remData);
+ len = u_arraylist_length(context->dataList);
+ i--;