// OCClient.cpp : Defines the entry point for the console application.
//
+#include "iotivity_config.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+#ifdef HAVE_WINDOWS_H
+#include <Windows.h>
+#endif
#include <string>
#include <map>
#include <cstdlib>
-#include <pthread.h>
#include <mutex>
#include <condition_variable>
#include "OCPlatform.h"
DiscoveredResourceMap discoveredResources;
std::shared_ptr<OCResource> curResource;
static ObserveType OBSERVE_TYPE_TO_USE = ObserveType::Observe;
+static OCConnectivityType TRANSPORT_TYPE_TO_USE = OCConnectivityType::CT_ADAPTER_IP;
std::mutex curResourceLock;
class Light
{
try
{
- if(eCode == OC_STACK_OK && sequenceNumber != -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
{
{
try
{
- if(eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED)
+ if(eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED
+ || eCode == OC_STACK_RESOURCE_CHANGED)
{
std::cout << "POST request was successful" << std::endl;
{
try
{
- if(eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED)
+ if(eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED
+ || eCode == OC_STACK_RESOURCE_CHANGED)
{
std::cout << "POST request was successful" << std::endl;
{
try
{
- if(eCode == OC_STACK_OK)
+ if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CHANGED)
{
std::cout << "PUT request was successful" << std::endl;
if(resourceURI == "/a/light")
{
- curResource = resource;
- // Call a local function which will internally invoke get API on the resource pointer
- getLightRepresentation(resource);
+ if (resource->connectivityType() & TRANSPORT_TYPE_TO_USE)
+ {
+ curResource = resource;
+ // Get the resource host address
+ std::cout << "\tAddress of selected resource: " << resource->host() << std::endl;
+
+ // Call a local function which will internally invoke get API on the resource pointer
+ getLightRepresentation(resource);
+ }
}
}
else
{
std::cout << std::endl;
std::cout << "---------------------------------------------------------------------\n";
- std::cout << "Usage : simpleclient <ObserveType>" << std::endl;
+ std::cout << "Usage : simpleclient <ObserveType> <TransportType>" << std::endl;
std::cout << " ObserveType : 1 - Observe" << std::endl;
std::cout << " ObserveType : 2 - ObserveAll" << std::endl;
+ std::cout << " TransportType : 1 - IP" << std::endl;
+ std::cout << " TransportType : 2 - TCP" << std::endl;
std::cout << "---------------------------------------------------------------------\n\n";
}
}
}
+void checkTransportValue(int value)
+{
+ if (1 == value)
+ {
+ TRANSPORT_TYPE_TO_USE = OCConnectivityType::CT_ADAPTER_IP;
+ std::cout << "<===Setting TransportType to IP===>\n\n";
+ }
+ else if (2 == value)
+ {
+ TRANSPORT_TYPE_TO_USE = OCConnectivityType::CT_ADAPTER_TCP;
+ std::cout << "<===Setting TransportType to TCP===>\n\n";
+ }
+ else
+ {
+ std::cout << "<===Invalid TransportType selected."
+ <<" Setting TransportType to IP===>\n\n";
+ }
+}
+
static FILE* client_open(const char* /*path*/, const char *mode)
{
return fopen(SVR_DB_FILE_NAME, mode);
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();
{
checkObserverValue(std::stoi(argv[1]));
}
+ else if (argc == 3)
+ {
+ checkObserverValue(std::stoi(argv[1]));
+ checkTransportValue(std::stoi(argv[2]));
+ }
else
{
std::cout << "<===Invalid number of command line arguments===>\n\n";
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
};