#include <OCApi.h>
#include <OCPlatform.h>
-#define maxSequenceNumber 0xFFFFFF
-
using namespace OC;
using namespace std;
{
try
{
- if (eCode == OC_STACK_OK && sequenceNumber != maxSequenceNumber + 1)
+ if (eCode == OC_STACK_OK && sequenceNumber <= MAX_SEQUENCE_NUMBER)
{
if (sequenceNumber == OC_OBSERVE_REGISTER)
{
using namespace std;
using namespace OC;
-#define maxSequenceNumber 0xFFFFFF
-
void printRepresentation(OCRepresentation rep)
{
for (auto itr = rep.begin(); itr != rep.end(); ++itr)
{
try
{
- if (eCode == OC_STACK_OK && sequenceNumber != maxSequenceNumber + 1)
+ if (eCode == OC_STACK_OK && sequenceNumber <= MAX_SEQUENCE_NUMBER)
{
if (sequenceNumber == OC_OBSERVE_REGISTER)
{
exit:
return 0;
-}
\ No newline at end of file
+}
using namespace std;
#define DEFAULT_MQ_BROKER_URI "/oic/ps"
-#define maxSequenceNumber 0xFFFFFF
OC::OCResource::Ptr g_mqBrokerResource = nullptr;
OC::OCResource::Ptr g_mqSelectedTopicResource = nullptr;
{
try
{
- if (eCode == OC_STACK_OK && sequenceNumber != maxSequenceNumber + 1)
+ if (eCode == OC_STACK_OK && sequenceNumber <= MAX_SEQUENCE_NUMBER)
{
if (sequenceNumber == OC_OBSERVE_REGISTER)
{
exit:
return 0;
-}
\ No newline at end of file
+}
if (clientResponse)
{
- OIC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result));
- OIC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber);
- OIC_LOG_V(INFO, TAG, "Callback Context for OBSERVE notification recvd successfully %d",
- gNumObserveNotifies);
- OIC_LOG_PAYLOAD(INFO, clientResponse->payload);
- OIC_LOG(INFO, TAG, ("=============> Obs Response"));
- gNumObserveNotifies++;
- if (gNumObserveNotifies > 15) //large number to test observing in DELETE case.
+ if (clientResponse->sequenceNumber <= MAX_SEQUENCE_NUMBER)
{
- if (TestCase == TEST_OBS_REQ_NON || TestCase == TEST_OBS_REQ_CON)
+ if (clientResponse->sequenceNumber == OC_OBSERVE_REGISTER)
{
- OIC_LOG(ERROR, TAG, "Cancelling with LOW QOS");
- if (OCCancel (handle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK)
- {
- OIC_LOG(ERROR, TAG, "Observe cancel error");
- }
- return OC_STACK_DELETE_TRANSACTION;
+ OIC_LOG(INFO, TAG, "This also serves as a registration confirmation.");
}
- else if (TestCase == TEST_OBS_REQ_NON_CANCEL_IMM)
+
+ OIC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result));
+ OIC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber);
+ OIC_LOG_V(INFO, TAG, "Callback Context for OBSERVE notification recvd successfully %d",
+ gNumObserveNotifies);
+ OIC_LOG_PAYLOAD(INFO, clientResponse->payload);
+ OIC_LOG(INFO, TAG, ("=============> Obs Response"));
+ gNumObserveNotifies++;
+
+ if (gNumObserveNotifies > 15) //large number to test observing in DELETE case.
{
- OIC_LOG(ERROR, TAG, "Cancelling with HIGH QOS");
- if (OCCancel (handle, OC_HIGH_QOS, NULL, 0) != OC_STACK_OK)
+ if (TestCase == TEST_OBS_REQ_NON || TestCase == TEST_OBS_REQ_CON)
+ {
+ OIC_LOG(ERROR, TAG, "Cancelling with LOW QOS");
+ if (OCCancel (handle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK)
+ {
+ OIC_LOG(ERROR, TAG, "Observe cancel error");
+ }
+ return OC_STACK_DELETE_TRANSACTION;
+ }
+ else if (TestCase == TEST_OBS_REQ_NON_CANCEL_IMM)
{
- OIC_LOG(ERROR, TAG, "Observe cancel error");
+ OIC_LOG(ERROR, TAG, "Cancelling with HIGH QOS");
+ if (OCCancel (handle, OC_HIGH_QOS, NULL, 0) != OC_STACK_OK)
+ {
+ OIC_LOG(ERROR, TAG, "Observe cancel error");
+ }
}
}
}
- if (clientResponse->sequenceNumber == OC_OBSERVE_REGISTER)
- {
- OIC_LOG(INFO, TAG, "This also serves as a registration confirmation");
- }
- else if (clientResponse->sequenceNumber == OC_OBSERVE_DEREGISTER)
- {
- OIC_LOG(INFO, TAG, "This also serves as a deregistration confirmation");
- return OC_STACK_DELETE_TRANSACTION;
- }
- else if (clientResponse->sequenceNumber == OC_OBSERVE_NO_OPTION)
+ else
{
- OIC_LOG(INFO, TAG, "This also tells you that registration/deregistration failed");
+ OIC_LOG(INFO, TAG, "No observe option header is returned in the response.");
+ OIC_LOG(INFO, TAG, "For a registration request, it means the registration failed");
return OC_STACK_DELETE_TRANSACTION;
}
}
if (clientResponse)
{
- cout << "\nStackResult: " << getResult(clientResponse->result);
- cout << "\nSEQUENCE NUMBER: " << clientResponse->sequenceNumber;
- cout << "\nCallback Context for OBSERVE notification recvd successfully ";
- //OIC_LOG_PAYLOAD(INFO, clientResponse->payload);
- gNumObserveNotifies++;
- if (gNumObserveNotifies == 15) //large number to test observing in DELETE case.
+ if (clientResponse->sequenceNumber <= MAX_SEQUENCE_NUMBER)
{
- if (g_testCase == TEST_OBS_REQ_NON || g_testCase == TEST_OBS_REQ_CON)
+ if (clientResponse->sequenceNumber == OC_OBSERVE_REGISTER)
{
- if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK)
- {
- cout << "\nObserve cancel error";
- }
- return OC_STACK_DELETE_TRANSACTION;
+ cout << "This also serves as a registration confirmation" << endl;
}
- else if (g_testCase == TEST_OBS_REQ_NON_CANCEL_IMM)
+
+ cout << "\nStackResult: " << getResult(clientResponse->result);
+ cout << "\nSEQUENCE NUMBER: " << clientResponse->sequenceNumber;
+ cout << "\nCallback Context for OBSERVE notification recvd successfully ";
+ //OIC_LOG_PAYLOAD(INFO, clientResponse->payload);
+ gNumObserveNotifies++;
+
+ if (gNumObserveNotifies == 15) //large number to test observing in DELETE case.
{
- if (OCCancel (gObserveDoHandle, OC_HIGH_QOS, NULL, 0) != OC_STACK_OK)
+ if (g_testCase == TEST_OBS_REQ_NON || g_testCase == TEST_OBS_REQ_CON)
+ {
+ if (OCCancel(gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK)
+ {
+ cout << "Observe cancel error" << endl;
+ }
+ return OC_STACK_DELETE_TRANSACTION;
+ }
+ else if (g_testCase == TEST_OBS_REQ_NON_CANCEL_IMM)
{
- cout << "\nObserve cancel error";
+ if (OCCancel(gObserveDoHandle, OC_HIGH_QOS, NULL, 0) != OC_STACK_OK)
+ {
+ cout << "\nObserve cancel error";
+ }
}
}
}
- if (clientResponse->sequenceNumber == OC_OBSERVE_REGISTER)
- {
- cout << "\nThis also serves as a registration confirmation";
- }
- else if (clientResponse->sequenceNumber == OC_OBSERVE_DEREGISTER)
- {
- cout << "\nThis also serves as a deregistration confirmation";
- return OC_STACK_DELETE_TRANSACTION;
- }
- else if (clientResponse->sequenceNumber == OC_OBSERVE_NO_OPTION)
+ else
{
- cout << "\nThis also tells you that registration/deregistration failed";
+ OIC_LOG(INFO, TAG, "No observe option header is returned in the response.");
+ OIC_LOG(INFO, TAG, "For a registration request, it means the registration failed");
return OC_STACK_DELETE_TRANSACTION;
}
}
#include "OCPlatform.h"
#include "OCApi.h"
-#define maxSequenceNumber 0xFFFFFF
-
using namespace OC;
static const char* SVR_DB_FILE_NAME = "./oic_svr_db_client.dat";
{
try
{
- if(eCode == OC_STACK_OK && sequenceNumber != maxSequenceNumber + 1)
+ if(eCode == OC_STACK_OK && sequenceNumber <= MAX_SEQUENCE_NUMBER)
{
if(sequenceNumber == OC_OBSERVE_REGISTER)
{
{
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
{
{\r
try\r
{\r
- if (eCode == OC_STACK_OK)\r
+ if (OC_STACK_OK == eCode)\r
{\r
std::cout << "GET request was successful" << std::endl;\r
std::cout << "Resource URI: " << rep.getUri() << std::endl;\r
{\r
try\r
{\r
- if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CHANGED)\r
+ if (OC_STACK_OK == eCode || OC_STACK_RESOURCE_CHANGED == eCode)\r
{\r
std::cout << "PUT request was successful" << std::endl;\r
\r
{\r
try\r
{\r
- if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED\r
- || OC_STACK_RESOURCE_CHANGED)\r
+ if (OC_STACK_OK == eCode || (OC_STACK_RESOURCE_CREATED == eCode\r
+ || OC_STACK_RESOURCE_CHANGED == eCode))\r
{\r
std::cout << "POST request was successful" << std::endl;\r
\r
{\r
try\r
{\r
- if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED)\r
+ if (OC_STACK_OK == eCode || OC_STACK_RESOURCE_CREATED == eCode)\r
{\r
std::cout << "POST request was successful" << std::endl;\r
\r
{\r
try\r
{\r
- if (eCode == OC_STACK_OK && sequenceNumber != OC_OBSERVE_NO_OPTION)\r
+ if (OC_STACK_OK == eCode && sequenceNumber <= MAX_SEQUENCE_NUMBER)\r
{\r
if (sequenceNumber == OC_OBSERVE_REGISTER)\r
{\r
std::cout << "Observe registration action is successful" << std::endl;\r
}\r
- else if (sequenceNumber == OC_OBSERVE_DEREGISTER)\r
- {\r
- std::cout << "Observe De-registration action is successful" << std::endl;\r
- }\r
\r
std::cout << "OBSERVE RESULT:"<<std::endl;\r
std::cout << "\tSequenceNumber: "<< sequenceNumber << std::endl;\r
}\r
else\r
{\r
- if (sequenceNumber == OC_OBSERVE_NO_OPTION)\r
+ if (OC_STACK_OK == eCode)\r
{\r
- std::cout << "Observe registration or de-registration action is failed" << std::endl;\r
+ std::cout << "No observe option header is returned in the response." << std::endl;\r
+ std::cout << "For a registration request, it means the registration failed"\r
+ << std::endl;\r
}\r
else\r
{\r