From 517b0a28fce622e62e07fee54ddf97224de9a8b1 Mon Sep 17 00:00:00 2001 From: "js126.lee" Date: Tue, 31 May 2016 16:24:25 +0900 Subject: [PATCH] Change QOS to HIGH for security module Issue: If packet loss happend during OTM, OTM is failed due to Non-Confirmable msg. Solution: In order to retransmission, change msg type to confirmable. Patch 1,2: Init patch Change-Id: I5222d19661a6eb01a2cc0033857e96ad63a8f175 Signed-off-by: js126.lee Reviewed-on: https://gerrit.iotivity.org/gerrit/8389 Tested-by: jenkins-iotivity Reviewed-by: Chul Lee Reviewed-by: Randeep Singh --- .../security/provisioning/src/ownershiptransfermanager.c | 12 ++++++------ resource/csdk/security/provisioning/src/pmutility.c | 10 +++++----- .../csdk/security/provisioning/src/secureresourceprovider.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c index 7b22d46..e098886 100644 --- a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c +++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c @@ -976,7 +976,7 @@ static OCStackResult PutOwnerCredential(OTMContext_t* otmCtx) cbData.cd = NULL; OCStackResult res = OCDoResource(NULL, OC_REST_PUT, query, &deviceInfo->endpoint, (OCPayload*)secPayload, - deviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -1038,7 +1038,7 @@ static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx) cbData.cd = NULL; res = OCDoResource(NULL, OC_REST_PUT, query, &deviceInfo->endpoint, (OCPayload *)secPayload, - deviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -1076,7 +1076,7 @@ static OCStackResult GetProvisioningStatusResource(OTMContext_t* otmCtx) cbData.context = (void *)otmCtx; cbData.cd = NULL; OCStackResult res = OCDoResource(NULL, OC_REST_GET, query, NULL, NULL, - deviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -1133,7 +1133,7 @@ static OCStackResult PutOwnerUuid(OTMContext_t* otmCtx) cbData.cd = NULL; res = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload *)secPayload, - deviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -1192,7 +1192,7 @@ static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx) cbData.cd = NULL; res = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload*)secPayload, - deviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -1245,7 +1245,7 @@ static OCStackResult PutUpdateOperationMode(OTMContext_t* otmCtx) cbData.context = (void *)otmCtx; cbData.cd = NULL; res = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload *)secPayload, - deviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c index e55e9a6..38d1377 100644 --- a/resource/csdk/security/provisioning/src/pmutility.c +++ b/resource/csdk/security/provisioning/src/pmutility.c @@ -768,7 +768,7 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi OCDoHandle handle = NULL; res = OCDoResource(&handle, OC_REST_DISCOVER, query, 0, 0, - CT_DEFAULT, OC_LOW_QOS, &cbData, NULL, 0); + CT_DEFAULT, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -782,14 +782,14 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi { OIC_LOG(ERROR, TAG, "Failed to wait response for secure discovery."); OICFree(pDInfo); - OCStackResult resCancel = OCCancel(handle, OC_LOW_QOS, NULL, 0); + OCStackResult resCancel = OCCancel(handle, OC_HIGH_QOS, NULL, 0); if(OC_STACK_OK != resCancel) { OIC_LOG(ERROR, TAG, "Failed to remove registered callback"); } return res; } - res = OCCancel(handle,OC_LOW_QOS,NULL,0); + res = OCCancel(handle,OC_HIGH_QOS,NULL,0); if (OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "Failed to remove registered callback"); @@ -836,7 +836,7 @@ static OCStackResult SecurePortDiscovery(DiscoveryInfo* discoveryInfo, cbData.context = (void*)discoveryInfo; cbData.cd = NULL; OCStackResult ret = OCDoResource(NULL, OC_REST_DISCOVER, query, 0, 0, - clientResponse->connType, OC_LOW_QOS, &cbData, NULL, 0); + clientResponse->connType, OC_HIGH_QOS, &cbData, NULL, 0); if(OC_STACK_OK != ret) { OIC_LOG(ERROR, TAG, "Failed to Secure Port Discovery"); @@ -879,7 +879,7 @@ static OCStackResult SecurityVersionDiscovery(DiscoveryInfo* discoveryInfo, cbData.context = (void*)discoveryInfo; cbData.cd = NULL; OCStackResult ret = OCDoResource(NULL, OC_REST_DISCOVER, query, 0, 0, - clientResponse->connType, OC_LOW_QOS, &cbData, NULL, 0); + clientResponse->connType, OC_HIGH_QOS, &cbData, NULL, 0); if(OC_STACK_OK != ret) { OIC_LOG(ERROR, TAG, "Failed to Security Version Discovery"); diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c index 9799ea4..7980e56 100644 --- a/resource/csdk/security/provisioning/src/secureresourceprovider.c +++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c @@ -1055,7 +1055,7 @@ OCStackResult SRPProvisionDirectPairing(void *ctx, const OCProvisionDev_t *selec OIC_LOG(DEBUG, TAG, "Sending PCONF info to resource server"); OCStackResult ret = OCDoResource(&handle, method, query, &selectedDeviceInfo->endpoint, (OCPayload*)secPayload, - selectedDeviceInfo->connType, OC_LOW_QOS, &cbData, NULL, 0); + selectedDeviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (OC_STACK_OK != ret) { OICFree(pconfData->resArr); -- 2.7.4