X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsamples%2Flinux%2FSimpleClientServer%2Focremoteaccessclient.cpp;h=7090befb1336d2fdb832a42045bdf1c0eb76282e;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=39627df03f0afdef863344e472cf961a53dd0f44;hpb=a2593578edc02d063c1335a3e89b19a3b5a4b1ad;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp index 39627df..7090bef 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp @@ -110,17 +110,20 @@ OCStackResult InvokeOCDoResource(std::ostringstream &query, cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; - OCStackResult ret = OCDoResource( - &handle, - method, - query.str().c_str(), - &responseAddr, - (method == OC_REST_PUT) ? putPayload() : NULL, - CT_ADAPTER_REMOTE_ACCESS, - qos, - &cbData, - options, - numOptions); + OCPayload* payload = (method == OC_REST_PUT) ? putPayload() : NULL; + + OCStackResult ret = OCDoRequest(&handle, + method, + query.str().c_str(), + &responseAddr, + payload, + CT_ADAPTER_REMOTE_ACCESS, + qos, + &cbData, + options, + numOptions); + + OCPayloadDestroy(payload); if (ret != OC_STACK_OK) { @@ -424,17 +427,16 @@ int InitDiscovery(OCQualityOfService qos) dest.flags = OC_DEFAULT_FLAGS; strncpy (dest.addr, remoteServerJabberID, MAX_ADDR_STR_SIZE - 1); - OCStackResult ret = OCDoResource(NULL, - OC_REST_GET, - MULTICAST_RESOURCE_DISCOVERY_QUERY, - &dest, - NULL, - CT_ADAPTER_REMOTE_ACCESS, - (qos == OC_HIGH_QOS) ? OC_HIGH_QOS : OC_LOW_QOS, - &cbData, - NULL, - 0 - ); + OCStackResult ret = OCDoRequest(NULL, + OC_REST_GET, + MULTICAST_RESOURCE_DISCOVERY_QUERY, + &dest, + NULL, + CT_ADAPTER_REMOTE_ACCESS, + (qos == OC_HIGH_QOS) ? OC_HIGH_QOS : OC_LOW_QOS, + &cbData, + NULL, + 0); if (ret != OC_STACK_OK) {