Imported Upstream version 1.1.1

[platform/upstream/iotivity.git] / resource / include / IClientWrapper.h

diff --git a/resource/include/IClientWrapper.h b/resource/include/IClientWrapper.h
index 1e40e23..cd8387a 100644 (file)
--- a/resource/include/IClientWrapper.h
+++ b/resource/include/IClientWrapper.h
@@ -18,12 +18,11 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _I_CLIENT_WRAPPER_H_
-#define _I_CLIENT_WRAPPER_H_
+#ifndef OC_I_CLIENT_WRAPPER_H_
+#define OC_I_CLIENT_WRAPPER_H_
 
 #include <memory>
 #include <string>
-
 #include <OCApi.h>
 
 namespace OC
@@ -41,49 +40,80 @@ namespace OC
         {}
 
         virtual OCStackResult ListenForResource(const std::string& serviceUrl,
-                        const std::string& resourceType, FindCallback& callback,
+                        const std::string& resourceType,
+                        OCConnectivityType connectivityType,
+                        FindCallback& callback,
                         QualityOfService QoS) = 0;
 
         virtual OCStackResult ListenForDevice(const std::string& serviceUrl,
-                        const std::string& deviceURI, FindDeviceCallback& callback,
+                        const std::string& deviceURI,
+                        OCConnectivityType connectivityType,
+                        FindDeviceCallback& callback,
                         QualityOfService QoS) = 0;
 
-        virtual OCStackResult GetResourceRepresentation(const std::string& host,
-                        const std::string& uri, const QueryParamsMap& queryParams,
+        virtual OCStackResult GetResourceRepresentation(
+                        const OCDevAddr& devAddr,
+                        const std::string& uri,
+                        const QueryParamsMap& queryParams,
                         const HeaderOptions& headerOptions,
                         GetCallback& callback, QualityOfService QoS)=0;
 
-        virtual OCStackResult PutResourceRepresentation(const std::string& host,
-                        const std::string& uri, const OCRepresentation& rep,
-                        const QueryParamsMap& queryParams, const HeaderOptions& headerOptions,
+        virtual OCStackResult PutResourceRepresentation(
+                        const OCDevAddr& devAddr,
+                        const std::string& uri,
+                        const OCRepresentation& rep, const QueryParamsMap& queryParams,
+                        const HeaderOptions& headerOptions,
                         PutCallback& callback, QualityOfService QoS) = 0;
 
-        virtual OCStackResult PostResourceRepresentation(const std::string& host,
-                        const std::string& uri, const OCRepresentation& rep,
-                        const QueryParamsMap& queryParams, const HeaderOptions& headerOptions,
+        virtual OCStackResult PostResourceRepresentation(
+                        const OCDevAddr& devAddr,
+                        const std::string& uri,
+                        const OCRepresentation& rep, const QueryParamsMap& queryParams,
+                        const HeaderOptions& headerOptions,
                         PostCallback& callback, QualityOfService QoS) = 0;
 
-        virtual OCStackResult DeleteResource(const std::string& host, const std::string& uri,
-                        const HeaderOptions& headerOptions, DeleteCallback& callback,
-                        QualityOfService QoS) = 0;
-
-        virtual OCStackResult ObserveResource(ObserveType observeType, OCDoHandle* handle,
-                        const std::string& host, const std::string& uri,
-                        const QueryParamsMap& queryParams, const HeaderOptions& headerOptions,
-                        ObserveCallback& callback, QualityOfService QoS)=0;
-
-        virtual OCStackResult CancelObserveResource(OCDoHandle handle, const std::string& host,
-            const std::string& uri, const HeaderOptions& headerOptions, QualityOfService QoS)=0;
+        virtual OCStackResult DeleteResource(
+                        const OCDevAddr& devAddr,
+                        const std::string& uri,
+                        const HeaderOptions& headerOptions,
+                        DeleteCallback& callback, QualityOfService QoS) = 0;
+
+        virtual OCStackResult ObserveResource(
+                        ObserveType observeType, OCDoHandle* handle,
+                        const OCDevAddr& devAddr,
+                        const std::string& uri,
+                        const QueryParamsMap& queryParams,
+                        const HeaderOptions& headerOptions, ObserveCallback& callback,
+                        QualityOfService QoS)=0;
+
+        virtual OCStackResult CancelObserveResource(
+                        OCDoHandle handle,
+                        const std::string& host,
+                        const std::string& uri,
+                        const HeaderOptions& headerOptions,
+                        QualityOfService QoS)=0;
 
-        virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host,
-                        const std::string& resourceType, SubscribeCallback& presenceHandler)=0;
+        virtual OCStackResult SubscribePresence(OCDoHandle* handle,
+                        const std::string& host,
+                        const std::string& resourceType,
+                        OCConnectivityType connectivityType,
+                        SubscribeCallback& presenceHandler)=0;
 
         virtual OCStackResult UnsubscribePresence(OCDoHandle handle) =0;
 
         virtual OCStackResult GetDefaultQos(QualityOfService& qos) = 0;
 
+        virtual OCStackResult FindDirectPairingDevices(unsigned short waittime,
+                        GetDirectPairedCallback& callback) = 0;
+
+        virtual OCStackResult GetDirectPairedDevices(GetDirectPairedCallback& callback) = 0;
+
+        virtual OCStackResult DoDirectPairing(std::shared_ptr<OCDirectPairing> peer, const OCPrm_t& pmSel,
+                const std::string& pinNumber, DirectPairingCallback& resultCallback) = 0;
+
         virtual ~IClientWrapper(){}
     };
 }
 
 #endif
+