From d3a065d621e239db8a2c804deacd6377cdc337dc Mon Sep 17 00:00:00 2001 From: Woochul Shim Date: Mon, 7 Sep 2015 11:12:44 +0900 Subject: [PATCH] Bug-fix & Internal API name change 1. Change Internal API Name - DeleteDeviceList() -> PMDeleteDeviceList() 2. Modify wrong log text in ownershiptransfermanager.c 3. Modify invalid return in DeviceDiscoveryHandler() - KEEP_TRANSACTION is used instead of ERROR and DELETE because this handler is waiting responses from multicast request Change-Id: Id78b6d6ae91f6c92986ea26e9fc4d9cab3429fcb Signed-off-by: Woochul Shim Reviewed-on: https://gerrit.iotivity.org/gerrit/2391 Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh Reviewed-by: Sachin Agrawal --- resource/csdk/security/provisioning/include/pmutility.h | 2 +- .../csdk/security/provisioning/src/ocprovisioningmanager.c | 2 +- .../security/provisioning/src/ownershiptransfermanager.c | 12 ++++++------ resource/csdk/security/provisioning/src/pmutility.c | 6 +++--- .../csdk/security/provisioning/unittest/pmutilitytest.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resource/csdk/security/provisioning/include/pmutility.h b/resource/csdk/security/provisioning/include/pmutility.h index 0904b13..5387c90 100644 --- a/resource/csdk/security/provisioning/include/pmutility.h +++ b/resource/csdk/security/provisioning/include/pmutility.h @@ -53,7 +53,7 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi * * @param[in] pList List of OCProvisionDev_t. */ -void DeleteDeviceList(OCProvisionDev_t *pList); +void PMDeleteDeviceList(OCProvisionDev_t *pList); /** diff --git a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c index df8f62c..aff6414 100644 --- a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c +++ b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c @@ -119,7 +119,7 @@ OCStackResult OCDoOwnershipTransfer(void* ctx, */ void OCDeleteDiscoveredDevices(OCProvisionDev_t *pList) { - DeleteDeviceList(pList); + PMDeleteDeviceList(pList); } /** diff --git a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c index b80710c..ced4d1b 100644 --- a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c +++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c @@ -662,7 +662,7 @@ static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_DOXM_URI)) { - OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OC_LOG(ERROR, TAG, "PutOwnerTransferModeToResource : Failed to generate query"); return OC_STACK_ERROR; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -716,7 +716,7 @@ static OCStackResult GetProvisioningStatusResource(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_PSTAT_URI)) { - OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OC_LOG(ERROR, TAG, "GetProvisioningStatusResource : Failed to generate query"); return OC_STACK_ERROR; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -755,7 +755,7 @@ static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_DOXM_URI)) { - OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OC_LOG(ERROR, TAG, "PutOwnershipInformation : Failed to generate query"); return OC_STACK_ERROR; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -810,7 +810,7 @@ static OCStackResult PutUpdateOperationMode(OTMContext_t* otmCtx, deviceInfo->connType, query, sizeof(query), OIC_RSRC_PSTAT_URI)) { - OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OC_LOG(ERROR, TAG, "PutUpdateOperationMode : Failed to generate query"); return OC_STACK_ERROR; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1046,7 +1046,7 @@ static OCStackApplicationResult ProvisionDefaultACLCB(void *ctx, OCDoHandle UNUS otmCtx->selectedDeviceInfo->connType, query, sizeof(query), OIC_RSRC_PSTAT_URI)) { - OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OC_LOG(ERROR, TAG, "ProvisionDefaultACLCB : Failed to generate query"); return OC_STACK_ERROR; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1151,7 +1151,7 @@ OCStackResult FinalizeProvisioning(OTMContext_t* otmCtx) otmCtx->selectedDeviceInfo->connType, query, sizeof(query), OIC_RSRC_ACL_URI)) { - OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OC_LOG(ERROR, TAG, "FinalizeProvisioning : Failed to generate query"); return OC_STACK_ERROR; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c index fdde580..a5dbdd1 100644 --- a/resource/csdk/security/provisioning/src/pmutility.c +++ b/resource/csdk/security/provisioning/src/pmutility.c @@ -149,7 +149,7 @@ OCStackResult UpdateSecurePortOfDevice(OCProvisionDev_t **ppDevicesList, const c * * @param[in] pDevicesList List of OCProvisionDev_t. */ -void DeleteDeviceList(OCProvisionDev_t *pDevicesList) +void PMDeleteDeviceList(OCProvisionDev_t *pDevicesList) { if(pDevicesList) { @@ -445,7 +445,7 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU query, sizeof(query), OC_RSRVD_WELL_KNOWN_URI)) { OC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); - return OC_STACK_ERROR; + return OC_STACK_KEEP_TRANSACTION; } OC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -459,7 +459,7 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU if(OC_STACK_OK != ret) { OC_LOG(ERROR, TAG, "Failed to Secure Port Discovery"); - return OC_STACK_DELETE_TRANSACTION; + return OC_STACK_KEEP_TRANSACTION; } else { diff --git a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp index 31bdd53..daacef7 100644 --- a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp +++ b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp @@ -79,7 +79,7 @@ TEST(ProvisionListTest, Deletion) int cnt =0; // Delete whole - DeleteDeviceList(gList); + PMDeleteDeviceList(gList); gList = NULL; LL_FOREACH(gList,el){ ++cnt; }; -- 2.7.4