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
f13c6bc
..
5063181
100644
(file)
--- a/
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
+++ b/
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
@@
-18,6
+18,7
@@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#include "iotivity_config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-36,6
+37,8
@@
#include "payload_logging.h"
#include "logger.h"
#include "common.h"
#include "payload_logging.h"
#include "logger.h"
#include "common.h"
+#include "oic_string.h"
+
std::string getQueryStrForGetPut();
#define TAG ("occlient")
std::string getQueryStrForGetPut();
#define TAG ("occlient")
@@
-56,6
+59,8
@@
typedef enum
TEST_UNKNOWN_RESOURCE_GET_DEFAULT,
TEST_UNKNOWN_RESOURCE_GET_BATCH,
TEST_UNKNOWN_RESOURCE_GET_LINK_LIST,
TEST_UNKNOWN_RESOURCE_GET_DEFAULT,
TEST_UNKNOWN_RESOURCE_GET_BATCH,
TEST_UNKNOWN_RESOURCE_GET_LINK_LIST,
+ TEST_GET_EMPTY,
+ TEST_GET_NULL,
MAX_TESTS
} CLIENT_TEST;
MAX_TESTS
} CLIENT_TEST;
@@
-89,6
+94,8
@@
testToTextMap queryInterface[] = {
{"?if=oic.if.baseline", TEST_PUT_DEFAULT},
{"?if=oic.if.b", TEST_PUT_BATCH},
{"?if=oic.if.ll", TEST_PUT_LINK_LIST},
{"?if=oic.if.baseline", TEST_PUT_DEFAULT},
{"?if=oic.if.b", TEST_PUT_BATCH},
{"?if=oic.if.ll", TEST_PUT_LINK_LIST},
+ {"", TEST_GET_EMPTY},
+ {NULL, TEST_GET_NULL},
};
};
@@
-159,6
+166,11
@@
void PrintUsage()
"unavailable resource using batch interface.");
OIC_LOG(INFO, TAG, "Test Case 9 : Discover Resources && Initiate GET Request on an "\
"unavailable resource using link list interface.");
"unavailable resource using batch interface.");
OIC_LOG(INFO, TAG, "Test Case 9 : Discover Resources && Initiate GET Request on an "\
"unavailable resource using link list interface.");
+ OIC_LOG(INFO, TAG, "Test Case 10 : Discover Resources && Initiate GET Request on an "\
+ "empty resource.");
+ OIC_LOG(INFO, TAG, "Test Case 11 : Discover Resources && Initiate GET Request on an "\
+ "NULL resource.");
+
}
OCStackApplicationResult putReqCB(void* ctx, OCDoHandle /*handle*/,
}
OCStackApplicationResult putReqCB(void* ctx, OCDoHandle /*handle*/,
@@
-258,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");
@@
-284,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");
@@
-314,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");
@@
-341,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");
@@
-356,16
+370,16
@@
int InitDiscovery()
OCStackResult ret;
OCCallbackData cbData;
/* Start a discovery query*/
OCStackResult ret;
OCCallbackData cbData;
/* Start a discovery query*/
- char szQueryUri[
64
] = { 0 };
+ char szQueryUri[
MAX_QUERY_LENGTH
] = { 0 };
-
strcpy(szQueryUri
, 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");
@@
-445,4
+459,3
@@
std::string getQueryStrForGetPut()
{
return "/a/room";
}
{
return "/a/room";
}
-