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
/
examples
/
simpleclient.cpp
diff --git
a/resource/examples/simpleclient.cpp
b/resource/examples/simpleclient.cpp
index
f9452af
..
5667b07
100644
(file)
--- a/
resource/examples/simpleclient.cpp
+++ b/
resource/examples/simpleclient.cpp
@@
-20,6
+20,7
@@
// OCClient.cpp : Defines the entry point for the console application.
//
// OCClient.cpp : Defines the entry point for the console application.
//
+#include "iotivity_config.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@
-37,8
+38,6
@@
#include "OCPlatform.h"
#include "OCApi.h"
#include "OCPlatform.h"
#include "OCApi.h"
-#define maxSequenceNumber 0xFFFFFF
-
using namespace OC;
static const char* SVR_DB_FILE_NAME = "./oic_svr_db_client.dat";
using namespace OC;
static const char* SVR_DB_FILE_NAME = "./oic_svr_db_client.dat";
@@
-76,7
+75,7
@@
void onObserve(const HeaderOptions /*headerOptions*/, const OCRepresentation& re
{
try
{
{
try
{
- if(eCode == OC_STACK_OK && sequenceNumber
!= maxSequenceNumber + 1
)
+ if(eCode == OC_STACK_OK && sequenceNumber
<= MAX_SEQUENCE_NUMBER
)
{
if(sequenceNumber == OC_OBSERVE_REGISTER)
{
{
if(sequenceNumber == OC_OBSERVE_REGISTER)
{
@@
-108,7
+107,9
@@
void onObserve(const HeaderOptions /*headerOptions*/, const OCRepresentation& re
{
if(eCode == OC_STACK_OK)
{
{
if(eCode == OC_STACK_OK)
{
- std::cout << "Observe registration failed or de-registration action failed/succeeded" << std::endl;
+ std::cout << "No observe option header is returned in the response." << std::endl;
+ std::cout << "For a registration request, it means the registration failed"
+ << std::endl;
}
else
{
}
else
{
@@
-475,7
+476,7
@@
static FILE* client_open(const char* /*path*/, const char *mode)
int main(int argc, char* argv[]) {
std::ostringstream requestURI;
int main(int argc, char* argv[]) {
std::ostringstream requestURI;
- OCPersistentStorage ps {client_open, fread, fwrite, fclose, unlink
};
+ OCPersistentStorage ps {client_open, fread, fwrite, fclose, unlink
, NULL, NULL
};
try
{
printUsage();
try
{
printUsage();
@@
-508,8
+509,9
@@
int main(int argc, char* argv[]) {
PlatformConfig cfg {
OC::ServiceType::InProc,
OC::ModeType::Both,
PlatformConfig cfg {
OC::ServiceType::InProc,
OC::ModeType::Both,
- "0.0.0.0",
- 0,
+ OCConnectivityType::CT_ADAPTER_IP,
+ OCConnectivityType::CT_ADAPTER_IP,
+ (OCTransportAdapter)(OCTransportAdapter::OC_ADAPTER_IP|OCTransportAdapter::OC_ADAPTER_TCP),
OC::QualityOfService::HighQos,
&ps
};
OC::QualityOfService::HighQos,
&ps
};