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
c023c26
..
5063181
100644
(file)
--- a/
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
+++ b/
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
@@
-18,21
+18,30
@@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#include "iotivity_config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
+#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
#include <ocstack.h>
#include <iostream>
#include <sstream>
#include <ocstack.h>
#include <iostream>
#include <sstream>
+#include <getopt.h>
#include "ocpayload.h"
#include "payload_logging.h"
#include "logger.h"
#include "ocpayload.h"
#include "payload_logging.h"
#include "logger.h"
-const char *getResult(OCStackResult result);
+#include "common.h"
+#include "oic_string.h"
+
std::string getQueryStrForGetPut();
std::string getQueryStrForGetPut();
-#define TAG
PCF
("occlient")
+#define TAG ("occlient")
#define DEFAULT_CONTEXT_VALUE 0x99
#ifndef MAX_LENGTH_IPv4_ADDR
#define MAX_LENGTH_IPv4_ADDR 16
#define DEFAULT_CONTEXT_VALUE 0x99
#ifndef MAX_LENGTH_IPv4_ADDR
#define MAX_LENGTH_IPv4_ADDR 16
@@
-50,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;
@@
-83,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},
};
};
@@
-132,27
+145,32
@@
OCPayload* putPayload()
void PrintUsage()
{
void PrintUsage()
{
- OC_LOG(INFO, TAG, "Usage : occlientcoll -t <Test Case> -c <CA connectivity Type>");
- OC_LOG(INFO, TAG, "-c 0 : Default auto-selection");
- OC_LOG(INFO, TAG, "-c 1 : IP Connectivity Type");
- OC_LOG(INFO, TAG, "Test Case 1 : Discover Resources && Initiate GET Request on an "\
+ O
I
C_LOG(INFO, TAG, "Usage : occlientcoll -t <Test Case> -c <CA connectivity Type>");
+ O
I
C_LOG(INFO, TAG, "-c 0 : Default auto-selection");
+ O
I
C_LOG(INFO, TAG, "-c 1 : IP Connectivity Type");
+ O
I
C_LOG(INFO, TAG, "Test Case 1 : Discover Resources && Initiate GET Request on an "\
"available resource using default interface.");
"available resource using default interface.");
- OC_LOG(INFO, TAG, "Test Case 2 : Discover Resources && Initiate GET Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 2 : Discover Resources && Initiate GET Request on an "\
"available resource using batch interface.");
"available resource using batch interface.");
- OC_LOG(INFO, TAG, "Test Case 3 : Discover Resources && Initiate GET Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 3 : Discover Resources && Initiate GET Request on an "\
"available resource using link list interface.");
"available resource using link list interface.");
- OC_LOG(INFO, TAG, "Test Case 4 : Discover Resources && Initiate GET & PUT Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 4 : Discover Resources && Initiate GET & PUT Request on an "\
"available resource using default interface.");
"available resource using default interface.");
- OC_LOG(INFO, TAG, "Test Case 5 : Discover Resources && Initiate GET & PUT Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 5 : Discover Resources && Initiate GET & PUT Request on an "\
"available resource using batch interface.");
"available resource using batch interface.");
- OC_LOG(INFO, TAG, "Test Case 6 : Discover Resources && Initiate GET & PUT Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 6 : Discover Resources && Initiate GET & PUT Request on an "\
"available resource using link list interface.");
"available resource using link list interface.");
- OC_LOG(INFO, TAG, "Test Case 7 : Discover Resources && Initiate GET Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 7 : Discover Resources && Initiate GET Request on an "\
"unavailable resource using default interface.");
"unavailable resource using default interface.");
- OC_LOG(INFO, TAG, "Test Case 8 : Discover Resources && Initiate GET Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 8 : Discover Resources && Initiate GET Request on an "\
"unavailable resource using batch interface.");
"unavailable resource using batch interface.");
- OC_LOG(INFO, TAG, "Test Case 9 : Discover Resources && Initiate GET Request on an "\
+ O
I
C_LOG(INFO, TAG, "Test Case 9 : Discover Resources && Initiate GET Request on an "\
"unavailable resource using link list interface.");
"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*/,
@@
-160,13
+178,13
@@
OCStackApplicationResult putReqCB(void* ctx, OCDoHandle /*handle*/,
{
if(clientResponse == NULL)
{
{
if(clientResponse == NULL)
{
- OC_LOG(INFO, TAG, "The clientResponse is NULL");
+ O
I
C_LOG(INFO, TAG, "The clientResponse is NULL");
return OC_STACK_DELETE_TRANSACTION;
}
if(ctx == (void*)DEFAULT_CONTEXT_VALUE)
{
return OC_STACK_DELETE_TRANSACTION;
}
if(ctx == (void*)DEFAULT_CONTEXT_VALUE)
{
- OC_LOG_V(INFO, TAG, "Callback Context for PUT query recvd successfully");
- O
C_LOG_PAYLOAD(INFO, TAG
, clientResponse->payload);
+ O
I
C_LOG_V(INFO, TAG, "Callback Context for PUT query recvd successfully");
+ O
IC_LOG_PAYLOAD(INFO
, clientResponse->payload);
}
return OC_STACK_KEEP_TRANSACTION;
}
return OC_STACK_KEEP_TRANSACTION;
@@
-175,27
+193,27
@@
OCStackApplicationResult putReqCB(void* ctx, OCDoHandle /*handle*/,
OCStackApplicationResult getReqCB(void* ctx, OCDoHandle /*handle*/,
OCClientResponse * clientResponse)
{
OCStackApplicationResult getReqCB(void* ctx, OCDoHandle /*handle*/,
OCClientResponse * clientResponse)
{
- OC_LOG_V(INFO, TAG, "StackResult: %s",
+ O
I
C_LOG_V(INFO, TAG, "StackResult: %s",
getResult(clientResponse->result));
if(ctx == (void*)DEFAULT_CONTEXT_VALUE)
{
getResult(clientResponse->result));
if(ctx == (void*)DEFAULT_CONTEXT_VALUE)
{
- OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber);
+ O
I
C_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber);
if(clientResponse->sequenceNumber == 0)
{
if(clientResponse->sequenceNumber == 0)
{
- OC_LOG_V(INFO, TAG, "Callback Context for GET query recvd successfully");
- O
C_LOG_PAYLOAD(INFO, TAG
, clientResponse->payload);
+ O
I
C_LOG_V(INFO, TAG, "Callback Context for GET query recvd successfully");
+ O
IC_LOG_PAYLOAD(INFO
, clientResponse->payload);
}
else
{
}
else
{
- OC_LOG_V(INFO, TAG, "Callback Context for Get recvd successfully %d",
+ O
I
C_LOG_V(INFO, TAG, "Callback Context for Get recvd successfully %d",
gNumObserveNotifies);
gNumObserveNotifies);
- O
C_LOG_PAYLOAD(INFO, TAG
, clientResponse->payload);;
+ O
IC_LOG_PAYLOAD(INFO
, clientResponse->payload);;
gNumObserveNotifies++;
if (gNumObserveNotifies == 3)
{
if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK)
{
gNumObserveNotifies++;
if (gNumObserveNotifies == 3)
{
if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "Observe cancel error");
+ O
I
C_LOG(ERROR, TAG, "Observe cancel error");
}
}
}
}
}
}
@@
-211,21
+229,21
@@
OCStackApplicationResult getReqCB(void* ctx, OCDoHandle /*handle*/,
OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle /*handle*/,
OCClientResponse * clientResponse)
{
OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle /*handle*/,
OCClientResponse * clientResponse)
{
- OC_LOG(INFO, TAG,
+ O
I
C_LOG(INFO, TAG,
"Entering discoveryReqCB (Application Layer CB)");
"Entering discoveryReqCB (Application Layer CB)");
- OC_LOG_V(INFO, TAG, "StackResult: %s",
+ O
I
C_LOG_V(INFO, TAG, "StackResult: %s",
getResult(clientResponse->result));
if (ctx == (void*) DEFAULT_CONTEXT_VALUE)
{
getResult(clientResponse->result));
if (ctx == (void*) DEFAULT_CONTEXT_VALUE)
{
- OC_LOG_V(INFO, TAG, "Callback Context recvd successfully");
+ O
I
C_LOG_V(INFO, TAG, "Callback Context recvd successfully");
}
}
- OC_LOG_V(INFO, TAG,
+ O
I
C_LOG_V(INFO, TAG,
"Device =============> Discovered @ %s:%d",
clientResponse->devAddr.addr,
clientResponse->devAddr.port);
"Device =============> Discovered @ %s:%d",
clientResponse->devAddr.addr,
clientResponse->devAddr.port);
- O
C_LOG_PAYLOAD(INFO, TAG
, clientResponse->payload);
+ O
IC_LOG_PAYLOAD(INFO
, clientResponse->payload);
ConnType = clientResponse->connType;
ConnType = clientResponse->connType;
@@
-252,12
+270,12
@@
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)
{
if (ret != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack resource error");
+ O
I
C_LOG(ERROR, TAG, "OCStack resource error");
}
return ret;
}
}
return ret;
}
@@
-273,17
+291,17
@@
int InitObserveRequest(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;
- OC_LOG_V(INFO, TAG, "OBSERVE payload from client =");
+ O
I
C_LOG_V(INFO, TAG, "OBSERVE payload from client =");
OCPayload* payload = putPayload();
OCPayload* payload = putPayload();
- O
C_LOG_PAYLOAD(INFO, TAG
, payload);
+ O
IC_LOG_PAYLOAD(INFO
, payload);
OCPayloadDestroy(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)
{
if (ret != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack resource error");
+ O
I
C_LOG(ERROR, TAG, "OCStack resource error");
}
else
{
}
else
{
@@
-305,17
+323,19
@@
int InitPutRequest(OCClientResponse * clientResponse)
cbData.cb = putReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
cbData.cb = putReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
- OC_LOG_V(INFO, TAG, "PUT payload from client = ");
+ O
I
C_LOG_V(INFO, TAG, "PUT payload from client = ");
OCPayload* payload = putPayload();
OCPayload* payload = putPayload();
- OC_LOG_PAYLOAD(INFO, TAG, payload);
+ 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)
{
if (ret != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack resource error");
+ O
I
C_LOG(ERROR, TAG, "OCStack resource error");
}
return ret;
}
}
return ret;
}
@@
-335,12
+355,12
@@
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)
{
if (ret != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack resource error");
+ O
I
C_LOG(ERROR, TAG, "OCStack resource error");
}
return ret;
}
}
return ret;
}
@@
-350,19
+370,19
@@
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)
{
if (ret != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack resource error");
+ O
I
C_LOG(ERROR, TAG, "OCStack resource error");
}
return ret;
}
}
return ret;
}
@@
-396,7
+416,7
@@
int main(int argc, char* argv[])
/* Initialize OCStack*/
if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK)
{
/* Initialize OCStack*/
if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack init error");
+ O
I
C_LOG(ERROR, TAG, "OCStack init error");
return 0;
}
return 0;
}
@@
-406,30
+426,30
@@
int main(int argc, char* argv[])
}
else
{
}
else
{
- OC_LOG(INFO, TAG, "Default Connectivity type selected...");
+ O
I
C_LOG(INFO, TAG, "Default Connectivity type selected...");
ConnType = CT_ADAPTER_IP;
}
InitDiscovery();
// Break from loop with Ctrl+C
ConnType = CT_ADAPTER_IP;
}
InitDiscovery();
// Break from loop with Ctrl+C
- OC_LOG(INFO, TAG, "Entering occlient main loop...");
+ O
I
C_LOG(INFO, TAG, "Entering occlient main loop...");
signal(SIGINT, handleSigInt);
while (!gQuitFlag)
{
if (OCProcess() != OC_STACK_OK)
{
signal(SIGINT, handleSigInt);
while (!gQuitFlag)
{
if (OCProcess() != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack process error");
+ O
I
C_LOG(ERROR, TAG, "OCStack process error");
return 0;
}
sleep(2);
return 0;
}
sleep(2);
- } OC_LOG(INFO, TAG, "Exiting occlient main loop...");
+ } O
I
C_LOG(INFO, TAG, "Exiting occlient main loop...");
if (OCStop() != OC_STACK_OK)
{
if (OCStop() != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "OCStack stop error");
+ O
I
C_LOG(ERROR, TAG, "OCStack stop error");
}
return 0;
}
return 0;
@@
-439,4
+459,3
@@
std::string getQueryStrForGetPut()
{
return "/a/room";
}
{
return "/a/room";
}
-