From 5d6231744e332b9be65e9f23454c142865dde5de Mon Sep 17 00:00:00 2001 From: Parkhi Date: Wed, 18 Jan 2017 15:08:16 +0900 Subject: [PATCH] Update MOT condition check logic - when enrollee didn't support MOT, mediator didn't call MOT function. Change-Id: I2b2bd932a5d00e7c783a8351819b61d6eb71d948 Signed-off-by: Parkhi Reviewed-on: https://gerrit.iotivity.org/gerrit/16475 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp index a609fa9..b09d1fb 100755 --- a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp +++ b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp @@ -528,7 +528,7 @@ namespace OIC #endif } #ifdef MULTIPLE_OWNER - else + else if(m_securedResource->isMOTSupported() && m_securedResource->isMOTEnabled()) { OCUUIdentity* mediatorDevId = (OCUUIdentity* )OICMalloc(sizeof(OCUUIdentity)); @@ -596,13 +596,12 @@ namespace OIC return res; } } -#else +#endif else { OIC_LOG(ERROR, ENROLEE_SECURITY_TAG, "The found device is already owned by other PT"); res = ESResult::ES_ERROR; } -#endif } } else @@ -650,8 +649,7 @@ namespace OIC OIC_LOG_V(DEBUG, ENROLEE_SECURITY_TAG, "Transfering sub-ownership for : %s ", m_securedResource->getDeviceID().c_str()); - if( // m_securedResource->isMOTSupported() && //not provided, yet - OIC_PRECONFIG_PIN == m_ownershipTransferData.getMOTMethod() && + if(OIC_PRECONFIG_PIN == m_ownershipTransferData.getMOTMethod() && !m_ownershipTransferData.getPreConfiguredPin().empty()) { std::string pin = m_ownershipTransferData.getPreConfiguredPin(); -- 2.7.4