projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
samples
/
linux
/
SimpleClientServer
/
occlientcoll.cpp
diff --git
a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
index
16ca072
..
5063181
100644
(file)
--- a/
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
+++ b/
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
@@
-270,9
+270,9
@@
int InitGetRequestToUnavailableResource(OCClientResponse * clientResponse)
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
- ret = OCDoRe
source
(NULL, OC_REST_GET, getQuery.str().c_str(),
-
&clientResponse->devAddr, 0, ConnType, OC_LOW_QOS,
-
&cbData, NULL, 0);
+ ret = OCDoRe
quest
(NULL, OC_REST_GET, getQuery.str().c_str(),
+ &clientResponse->devAddr, 0, ConnType, OC_LOW_QOS,
+ &cbData, NULL, 0);
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
@@
-296,9
+296,9
@@
int InitObserveRequest(OCClientResponse * clientResponse)
OIC_LOG_PAYLOAD(INFO, payload);
OCPayloadDestroy(payload);
OIC_LOG_PAYLOAD(INFO, payload);
OCPayloadDestroy(payload);
- ret = OCDoRe
source
(&handle, OC_REST_OBSERVE, obsReg.str().c_str(),
-
&clientResponse->devAddr, 0, ConnType,
-
OC_LOW_QOS, &cbData, NULL, 0);
+ ret = OCDoRe
quest
(&handle, OC_REST_OBSERVE, obsReg.str().c_str(),
+ &clientResponse->devAddr, 0, ConnType,
+ OC_LOW_QOS, &cbData, NULL, 0);
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
@@
-326,11
+326,13
@@
int InitPutRequest(OCClientResponse * clientResponse)
OIC_LOG_V(INFO, TAG, "PUT payload from client = ");
OCPayload* payload = putPayload();
OIC_LOG_PAYLOAD(INFO, payload);
OIC_LOG_V(INFO, TAG, "PUT payload from client = ");
OCPayload* payload = putPayload();
OIC_LOG_PAYLOAD(INFO, payload);
+
+ ret = OCDoRequest(NULL, OC_REST_PUT, getQuery.str().c_str(),
+ &clientResponse->devAddr, payload, ConnType,
+ OC_LOW_QOS, &cbData, NULL, 0);
+
OCPayloadDestroy(payload);
OCPayloadDestroy(payload);
- ret = OCDoResource(NULL, OC_REST_PUT, getQuery.str().c_str(),
- &clientResponse->devAddr, putPayload(), ConnType,
- OC_LOW_QOS, &cbData, NULL, 0);
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
@@
-353,9
+355,9
@@
int InitGetRequest(OCClientResponse * clientResponse)
cbData.cb = getReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
cbData.cb = getReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
- ret = OCDoRe
source
(NULL, OC_REST_GET, getQuery.str().c_str(),
-
&clientResponse->devAddr, 0, ConnType, OC_LOW_QOS,
-
&cbData, NULL, 0);
+ ret = OCDoRe
quest
(NULL, OC_REST_GET, getQuery.str().c_str(),
+ &clientResponse->devAddr, 0, ConnType, OC_LOW_QOS,
+ &cbData, NULL, 0);
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
@@
-370,14
+372,14
@@
int InitDiscovery()
/* Start a discovery query*/
char szQueryUri[MAX_QUERY_LENGTH] = { 0 };
/* Start a discovery query*/
char szQueryUri[MAX_QUERY_LENGTH] = { 0 };
- OICStrcpy(szQueryUri, sizeof(
RESOURCE_DISCOVERY_QUERY
), RESOURCE_DISCOVERY_QUERY);
+ OICStrcpy(szQueryUri, sizeof(
szQueryUri
), RESOURCE_DISCOVERY_QUERY);
cbData.cb = discoveryReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
cbData.cb = discoveryReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
- ret = OCDoRe
source
(NULL, OC_REST_DISCOVER, szQueryUri, NULL, 0, ConnType,
-
OC_LOW_QOS,
- &cbData, NULL, 0);
+ ret = OCDoRe
quest
(NULL, OC_REST_DISCOVER, szQueryUri, NULL, 0, ConnType,
+ OC_LOW_QOS,
+
&cbData, NULL, 0);
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");
if (ret != OC_STACK_OK)
{
OIC_LOG(ERROR, TAG, "OCStack resource error");