From: youngman <yman.jung@samsung.com>
Date: Thu, 30 Jun 2016 23:26:44 +0000 (+0900)
Subject: change unowned device to owned device when registered
X-Git-Tag: submit/tizen/20160811.073905~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b16b4744ff47c1bad21fbed2b78d4556a24eaef5;p=platform%2Fcore%2Fiot%2Fiotcon.git

change unowned device to owned device when registered

Change-Id: Iec5362f24d23b90f7b9ab1da9359cd462eefe630
Signed-off-by: youngman <yman.jung@samsung.com>
---

diff --git a/lib/icl-provisioning-struct.c b/lib/icl-provisioning-struct.c
index 945d5cd..c127a63 100644
--- a/lib/icl-provisioning-struct.c
+++ b/lib/icl-provisioning-struct.c
@@ -572,7 +572,7 @@ bool icl_provisioning_compare_oic_uuid(OicUuid_t *a, OicUuid_t *b)
 }
 
 
-int icl_provisioning_devices_move_device(OicUuid_t *a,
+void icl_provisioning_devices_move_device(OicUuid_t *a,
 		iotcon_provisioning_devices_h unowned_devices,
 		iotcon_provisioning_devices_h owned_devices)
 {
@@ -595,9 +595,9 @@ int icl_provisioning_devices_move_device(OicUuid_t *a,
 
 		current->next = owned_dev_list;
 		owned_devices->dev_list = current;
-	}
 
-	return IOTCON_ERROR_NONE;
+		return;
+	}
 }
 
 
diff --git a/lib/icl-provisioning-struct.h b/lib/icl-provisioning-struct.h
index 350120b..772582a 100644
--- a/lib/icl-provisioning-struct.h
+++ b/lib/icl-provisioning-struct.h
@@ -33,7 +33,7 @@ int icl_provisioning_devices_create(OCProvisionDev_t *dev_list,
 OCProvisionDev_t* icl_provisioning_devices_get_devices(
 		iotcon_provisioning_devices_h devices);
 
-int icl_provisioning_devices_move_device(OicUuid_t *a,
+void icl_provisioning_devices_move_device(OicUuid_t *a,
 		iotcon_provisioning_devices_h unowned_devices,
 		iotcon_provisioning_devices_h owned_devices);
 
diff --git a/lib/icl-provisioning.c b/lib/icl-provisioning.c
index bbf2153..c8992b8 100644
--- a/lib/icl-provisioning.c
+++ b/lib/icl-provisioning.c
@@ -643,15 +643,21 @@ static void _provisioning_ownership_transfer_cb_container_destroy(
 static int _provisioning_ownership_transfer_get_result(
 		iotcon_provisioning_device_h device, OCProvisionResult_t *result_list, int count)
 {
-	int i;
+	int i, ret;
 	OCProvisionDev_t *oic_device;
 
 	oic_device = icl_provisioning_device_get_device(device);
 
 	for (i = 0; i < count; i++) {
 		if (true == icl_provisioning_compare_oic_uuid(&oic_device->doxm->deviceID,
-					(OicUuid_t*)&result_list[i].deviceId))
-			return _provisioning_parse_oic_error(result_list[i].res);
+					(OicUuid_t*)&result_list[i].deviceId)) {
+			ret = _provisioning_parse_oic_error(result_list[i].res);
+			if (IOTCON_ERROR_NONE == ret) {
+				icl_provisioning_devices_move_device((OicUuid_t*)&result_list[i].deviceId,
+						icl_unowned_devices, icl_owned_devices);
+			}
+			return ret;
+		}
 	}
 
 	return IOTCON_ERROR_IOTIVITY;