From: Ziran Sun <ziran.sun@samsung.com>
Date: Wed, 1 Jun 2016 12:31:18 +0000 (+0100)
Subject: Remove extra href property in /oic/res as
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d673a9e235fb754a0876b55025af7cbff5fec0a;p=contrib%2Fiotivity.git

Remove extra href property in /oic/res as
the href property should be within links only.

JIRA Issue: https://jira.iotivity.org/browse/IOT-1104

Change-Id: I2b7b6996feebe92902a23a275c5bfbd3ad7e47e9
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
---

diff --git a/resource/csdk/stack/src/ocpayloadconvert.c b/resource/csdk/stack/src/ocpayloadconvert.c
index 3eb2d28..8099df8 100644
--- a/resource/csdk/stack/src/ocpayloadconvert.c
+++ b/resource/csdk/stack/src/ocpayloadconvert.c
@@ -229,7 +229,6 @@ static int64_t OCConvertDiscoveryPayload(OCDiscoveryPayload *payload, uint8_t *o
         [                                                       // rootArray
             {                                                   // rootMap
                 "di" : UUID,                                    // device ID
-                "href": "/oic/res"
                 "rt": "oic.wk.res"
                 "n":"MyDevice"
                 "if":"oic.if.ll oic.if.baseline"
@@ -264,11 +263,6 @@ static int64_t OCConvertDiscoveryPayload(OCDiscoveryPayload *payload, uint8_t *o
                 sizeof(OC_RSRVD_DEVICE_NAME) - 1, payload->name);
         VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting name");
 
-        // Insert URI
-        err |= ConditionalAddTextStringToMap(&rootMap, OC_RSRVD_HREF, sizeof(OC_RSRVD_HREF) - 1,
-                payload->uri);
-        VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting href");
-
         // Insert Device ID into the root map
         err |= AddTextStringToMap(&rootMap, OC_RSRVD_DEVICE_ID, sizeof(OC_RSRVD_DEVICE_ID) - 1,
                 payload->sid);