Apply iotivity 1.0.1

Change-Id: I480951e65eb14b595f451b0cde21d4d3c0a148f5

diff --git a/daemon/icd-payload.c b/daemon/icd-payload.c
index 8d8377f..7c0cd2c 100644 (file)
--- a/daemon/icd-payload.c
+++ b/daemon/icd-payload.c
@@ -77,7 +77,7 @@ GVariant** icd_payload_res_to_gvariant(OCPayload *payload, OCDevAddr *dev_addr)
                }
 
                /* device id */
-               random_res = OCConvertUuidToString(resource->sid, device_id);
+               random_res = OCConvertUuidToString(discovered->sid, device_id);
                if (RAND_UUID_OK != random_res) {
                        ERR("OCConvertUuidToString() Fail(%d)", random_res);
                        resource = resource->next;
@@ -366,7 +366,7 @@ static GVariant* _icd_payload_device_to_gvariant(OCDevicePayload *repr)
                return NULL;
        }
 
-       value = g_variant_new("(sssss)", repr->uri, repr->deviceName, repr->specVersion,
+       value = g_variant_new("(ssss)", repr->deviceName, repr->specVersion,
                        device_id, repr->dataModelVersion);
 
        return value;

diff --git a/lib/icl-device.c b/lib/icl-device.c
index 5d2124d..51cd43c 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -95,18 +95,15 @@ static void _icl_device_info_cb(GDBusConnection *connection,
                GVariant *parameters,
                gpointer user_data)
 {
-       char *uri_path;
        struct icl_device_info info = {0};
        icl_device_info_s *cb_container = user_data;
        iotcon_device_info_cb cb = cb_container->cb;
 
        cb_container->found = true;
 
-       g_variant_get(parameters, "(&s&s&s&s&s)", &uri_path, &info.device_name,
+       g_variant_get(parameters, "(&s&s&s&s)", &info.device_name,
                        &info.spec_ver, &info.device_id, &info.data_model_ver);
 
-       /* From iotivity, we can get uri_path. But, the value is always "/oic/d". */
-
        if (cb)
                cb(&info, IOTCON_ERROR_NONE, cb_container->user_data);
 }