Remove duplicated deviceID check in PM_Discovery

Patch 1: upload
Patch 2,3: If self reply, discard it.
Patch 4: Retriger jenkins build

Change-Id: Ife6bf2a802aa17da63899ad904a1df085696340e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16297
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16885
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
index 1cdd369..4d5e10b 100644 (file)
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -742,7 +742,7 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU
     // Get my device ID from doxm resource
     OicUuid_t myId;
     memset(&myId, 0, sizeof(myId));
-    res = GetDoxmDevOwnerId(&myId);
+    res = GetDoxmDeviceID(&myId);
     if(OC_STACK_OK != res)
     {
         OIC_LOG(ERROR, TAG, "Error while getting my device ID.");
@@ -759,13 +759,6 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU
         return OC_STACK_KEEP_TRANSACTION;
     }
 
-    res = GetDoxmDeviceID(&myId);
-    if(OC_STACK_OK != res)
-    {
-        OIC_LOG(ERROR, TAG, "Error while getting my UUID.");
-        DeleteDoxmBinData(ptrDoxm);
-        return OC_STACK_KEEP_TRANSACTION;
-    }
     //if targetId and discovered deviceID are different, discard it
     if ((pDInfo->isSingleDiscovery) &&
         (0 != memcmp(&ptrDoxm->deviceID.id, &pDInfo->targetId->id, sizeof(pDInfo->targetId->id))) )
@@ -774,9 +767,8 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU
         DeleteDoxmBinData(ptrDoxm);
         return OC_STACK_KEEP_TRANSACTION;
     }
-    //if this is owned discovery and this is PT's reply, discard it
-    if (((pDInfo->isSingleDiscovery) || (pDInfo->isOwnedDiscovery)) &&
-            (0 == memcmp(&ptrDoxm->deviceID.id, &myId.id, sizeof(myId.id))) )
+    //If self reply, discard it
+    if (0 == memcmp(&ptrDoxm->deviceID.id, &myId.id, sizeof(myId.id)))
     {
         OIC_LOG(DEBUG, TAG, "discarding provision tool's reply");
         DeleteDoxmBinData(ptrDoxm);