#include "oic_malloc.h"
#include "oic_string.h"
#include "logger.h"
+#if defined (__TIZENRT__)
+#include <apps/netutils/cJSON.h>
+#else
#include "cJSON.h"
+#endif
#include "utlist.h"
#include "ocpayload.h"
#include "payload_logging.h"
#include "srmutility.h"
-#ifdef __WITH_DTLS__
-#include "global.h"
-#endif
-
-
-#define TAG ("DP")
+#define TAG ("OIC_DP")
static const uint16_t CBOR_SIZE = 1024;
/**
switch(connType & CT_MASK_FLAGS & ~CT_FLAG_SECURE)
{
case CT_IP_USE_V4:
- snRet = snprintf(buffer, bufferSize, "%s%s:%d%s",
- prefix, address, port, uri);
+ snRet = snprintf(buffer, bufferSize, "%s%s:%d%s",
+ prefix, address, port, uri);
break;
case CT_IP_USE_V6:
- snRet = snprintf(buffer, bufferSize, "%s[%s]:%d%s",
- prefix, address, port, uri);
+ {
+ char addressEncoded[CA_MAX_URI_LENGTH] = {0};
+
+ OCStackResult result = OCEncodeAddressForRFC6874(addressEncoded,
+ sizeof(addressEncoded),
+ address);
+ if (OC_STACK_OK != result)
+ {
+ OIC_LOG_V(ERROR, TAG, "DPGenerateQuery : encoding error %d\n", result);
+ return false;
+ }
+
+ snRet = snprintf(buffer, bufferSize, "%s[%s]:%d%s",
+ prefix, addressEncoded, port, uri);
break;
+ }
default:
OIC_LOG(ERROR, TAG, "Unknown address format.");
return false;
{
OIC_LOG(INFO, TAG, "Fail to close temporary dtls session");
}
-
- caResult = CASelectCipherSuite(TLS_NULL_WITH_NULL_NULL, CA_ADAPTER_IP);
- if(CA_STATUS_OK != caResult)
- {
- OIC_LOG(ERROR, TAG, "Failed to select TLS_NULL_WITH_NULL_NULL");
- }
#endif // __WITH_DTLS__ or __WITH_TLS__
OIC_LOG(INFO, TAG, "Direct-Papring was successfully completed.");
OIC_LOG(ERROR, TAG, "Failed to DpairingToCBORPayload");
return OC_STACK_NO_MEMORY;
}
- OIC_LOG(INFO, TAG, "DPARING CBOR data:");
- OIC_LOG_BUFFER(INFO, TAG, secPayload->securityData, secPayload->payloadSize);
+ OIC_LOG(DEBUG, TAG, "DPARING CBOR data:");
+ OIC_LOG_BUFFER(DEBUG, TAG, secPayload->securityData, secPayload->payloadSize);
char query[MAX_URI_LENGTH + MAX_QUERY_LENGTH] = {0};
if(!DPGenerateQuery(true,
caresult = CAEnableAnonECDHCipherSuite(false);
VERIFY_SUCCESS(TAG, CA_STATUS_OK == caresult, ERROR);
- caresult = CASelectCipherSuite(TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256, CA_ADAPTER_IP);
+ caresult = CASelectCipherSuite(MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256, CA_ADAPTER_IP);
VERIFY_SUCCESS(TAG, CA_STATUS_OK == caresult, ERROR);
//Register proceeding peer info. & DTLS event handler to catch the dtls event while handshake
RemoveCredential(&dpairData->peer->deviceID);
OICFree(dpairData);
g_dp_proceed_ctx = NULL;
+ OIC_LOG_V(INFO, TAG, "OUT DirectPairingHandler.");
+ return OC_STACK_DELETE_TRANSACTION;
}
resultCallback(dpairData->userCtx, dpairData->peer, res);
OIC_LOG(ERROR, TAG, "Failed to DpairingToCBORPayload");
return OC_STACK_NO_MEMORY;
}
- OIC_LOG(INFO, TAG, "DPARING CBOR data:");
- OIC_LOG_BUFFER(INFO, TAG, secPayload->securityData, secPayload->payloadSize);
+ OIC_LOG(DEBUG, TAG, "DPARING CBOR data:");
+ OIC_LOG_BUFFER(DEBUG, TAG, secPayload->securityData, secPayload->payloadSize);
char query[MAX_URI_LENGTH + MAX_QUERY_LENGTH] = {0};
if(!DPGenerateQuery(false,