Update a condition of security provisioning failures for timeout 91/11991/3
authorJihun Ha <jihun.ha@samsung.com>
Wed, 21 Sep 2016 01:37:54 +0000 (10:37 +0900)
committerUze Choi <uzchoi@samsung.com>
Mon, 26 Sep 2016 10:14:11 +0000 (10:14 +0000)
A request of a kind of security provisioning like ownership transfer,
ACL provisioning, cert provisioning, is sent as a CON message which
has a retransmission. And if retransmission timeout happens, then
we can say the security provisioning is failed. Thus, when timeout error
code is arrived at its callback function, mediator has to inform an app of
its failure.

Change-Id: I2e89f27f01cc6b834f4f60d106ec834b4c0d4a51
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp

index 7768e7c..e3d9b9d 100755 (executable)
@@ -203,7 +203,7 @@ namespace OIC
                         }
 
                         std::unique_lock<std::mutex> lck(m_mtx);
-                        m_cond.wait_for(lck, std::chrono::seconds(ES_SEC_DISCOVERY_TIMEOUT));
+                        m_cond.wait(lck);
 
                         if(!removeDeviceResult)
                         {
@@ -222,7 +222,7 @@ namespace OIC
                     }
 
                     std::unique_lock<std::mutex> lck(m_mtx);
-                    m_cond.wait_for(lck, std::chrono::seconds(ES_SEC_DISCOVERY_TIMEOUT));
+                    m_cond.wait(lck);
 
                     if(!OTMResult)
                     {
@@ -432,7 +432,7 @@ namespace OIC
             }
 
             std::unique_lock<std::mutex> lck(m_mtx);
-            m_cond.wait_for(lck, std::chrono::seconds(ES_SEC_DISCOVERY_TIMEOUT));
+            m_cond.wait(lck);
 
             if(certResult)
             {
@@ -476,7 +476,7 @@ namespace OIC
             }
 
             std::unique_lock<std::mutex> lck(m_mtx);
-            m_cond.wait_for(lck, std::chrono::seconds(ES_SEC_DISCOVERY_TIMEOUT));
+            m_cond.wait(lck);
 
             if(aclResult)
             {