From: Sachin Agrawal <sachin.agrawal@intel.com>
Date: Sun, 21 Dec 2014 23:48:39 +0000 (-0800)
Subject: Updated security sample apps to add "/" in front of resource URI.
X-Git-Tag: 0.9.0-CA~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0d30f1fd656fa7158b719990d9f36f74779ed37;p=contrib%2Fiotivity.git

Updated security sample apps to add "/" in front of resource URI.

Gerrit Review 712 in 01.org updated CA layer to mandate "/" in front
of resource URI's. Current change updates security sample apps
to co-exist with 712 change.

Change-Id: I133eeab9092aac9d74f536065f5e10e91f621a4e
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
---

diff --git a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
index 047370e..ce051d0 100644
--- a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
+++ b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
@@ -185,11 +185,7 @@ int InitPutRequest()
     OC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__);
     std::ostringstream query;
     query << (coapSecureResource ? "coaps://" : "coap://") << coapServerIP
-        << ":" << coapServerPort
-#ifdef CA_INT_DTLS
-        << "/"
-#endif
-        << coapServerResource;
+        << ":" << coapServerPort  << coapServerResource;
     return (InvokeOCDoResource(query, OC_REST_PUT, OC_LOW_QOS, putReqCB, NULL, 0));
 }
 
@@ -231,11 +227,7 @@ int InitGetRequest(OCQualityOfService qos)
     OC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__);
     std::ostringstream query;
     query << (coapSecureResource ? "coaps://" : "coap://") << coapServerIP
-        << ":" << coapServerPort
-#ifdef CA_INT_DTLS
-        << "/"
-#endif
-        << coapServerResource;
+        << ":" << coapServerPort << coapServerResource;
 
     return (InvokeOCDoResource(query, OC_REST_GET, (qos == OC_HIGH_QOS)?
             OC_HIGH_QOS:OC_LOW_QOS, getReqCB, NULL, 0));
diff --git a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
index 5701184..216268b 100644
--- a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
+++ b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
@@ -39,11 +39,7 @@ static int gCurrLedInstance = 0;
 #define SAMPLE_MAX_NUM_POST_INSTANCE  2
 static LEDResource gLedInstance[SAMPLE_MAX_NUM_POST_INSTANCE];
 
-#ifdef CA_INT_DTLS
-char *gResourceUri= (char *)"a/led";
-#else
 char *gResourceUri= (char *)"/a/led";
-#endif
 
 static uint16_t OC_WELL_KNOWN_PORT = 5683;