From ce7ff3bedef97dd1afb89506d3a6ad2d7d57457b Mon Sep 17 00:00:00 2001 From: Sandeep Sharma Date: Thu, 8 Dec 2016 13:12:38 +0530 Subject: [PATCH] Add C++ API for UnsetInputPinCB. Change-Id: I0a3285d906d250a932a6cb98daff0b34ba6bff79 Signed-off-by: Sandeep Sharma Reviewed-on: https://gerrit.iotivity.org/gerrit/15257 Tested-by: jenkins-iotivity Reviewed-by: Jongmin Choi Reviewed-by: Randeep Singh (cherry picked from commit 194d25ca4d7dccbe2201d0db563a785b4f838d9c) Reviewed-on: https://gerrit.iotivity.org/gerrit/15313 --- resource/include/OCProvisioningManager.hpp | 7 +++++++ resource/provisioning/src/OCProvisioningManager.cpp | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/resource/include/OCProvisioningManager.hpp b/resource/include/OCProvisioningManager.hpp index 7435e24..86ae813 100644 --- a/resource/include/OCProvisioningManager.hpp +++ b/resource/include/OCProvisioningManager.hpp @@ -218,6 +218,13 @@ namespace OC static OCStackResult setInputPinCallback(InputPinCallback inputPin); /** + * API for de-registering Pin Callback. + * + * @return ::OC_STACK_OK in case of success and other value otherwise. + */ + static OCStackResult unsetInputPinCallback(); + + /** * API to get status of all the devices in current subnet. The status include endpoint * information and doxm information which can be extracted during owned and unowned * discovery. Along with this information, API will provide information about diff --git a/resource/provisioning/src/OCProvisioningManager.cpp b/resource/provisioning/src/OCProvisioningManager.cpp index 6ab5f6b..b5b18a2 100644 --- a/resource/provisioning/src/OCProvisioningManager.cpp +++ b/resource/provisioning/src/OCProvisioningManager.cpp @@ -258,6 +258,26 @@ namespace OC return result; } + OCStackResult OCSecure::unsetInputPinCallback() + { + OCStackResult result; + auto cLock = OCPlatform_impl::Instance().csdkLock().lock(); + + if (cLock) + { + std::lock_guard lock(*cLock); + UnsetInputPinCB(); + result = OC_STACK_OK; + } + else + { + oclog() <<"Mutex not found"; + result = OC_STACK_ERROR; + } + + return result; + } + OCStackResult OCSecure::getDevInfoFromNetwork(unsigned short timeout, DeviceList_t &ownedDevList, DeviceList_t &unownedDevList) -- 2.7.4