Imported Upstream version 0.9.1

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

diff --git a/resource/include/OCApi.h b/resource/include/OCApi.h
index b523da5..8087a4e 100644 (file)
--- a/resource/include/OCApi.h
+++ b/resource/include/OCApi.h
@@ -28,7 +28,7 @@
 #include <memory>
 #include <iterator>
 
-#include "ocstack.h"
+#include "octypes.h"
 #include "OCHeaderOption.h"
 #include <OCException.h>
 #include "StringConstants.h"
@@ -110,9 +110,9 @@ namespace OC
     *  ServiceType: indicate InProc or OutOfProc
     *  ModeType   : indicate whether we want to do server, client or both
     *  ipAddress  : ip address of server.
-    *               if you speecifiy 0.0.0.0 : it listens on any interface.
+    *               if you specify 0.0.0.0 : it listens on any interface.
     *  port       : port of server.
-    *             : if you specifiy 0 : next available random port is used.
+    *             : if you specify 0 : next available random port is used.
     *             : if you specify 5683 : client discovery can work even if they don't specify port.
     *  QoS        : Quality of Service : CONFIRMABLE or NON CONFIRMABLE.
     */
@@ -148,7 +148,6 @@ namespace OC
 
     enum RequestHandlerFlag
     {
-        InitFlag = 1 << 0,
         RequestFlag = 1 << 1,
         ObserverFlag = 1 << 2
     };
@@ -186,22 +185,24 @@ namespace OC
     // const strings for different interfaces
 
     // Default interface
-    const std::string DEFAULT_INTERFACE = "oc.mi.def";
+    const std::string DEFAULT_INTERFACE = "oic.if.baseline";
 
     // Used in discovering (GET) links to other resources of a collection.
-    const std::string LINK_INTERFACE = "oc.mi.ll";
+    const std::string LINK_INTERFACE = "oic.if.ll";
 
     // Used in GET, PUT, POST, DELETE methods on links to other resources of a collection.
-    const std::string BATCH_INTERFACE = "oc.mi.b";
+    const std::string BATCH_INTERFACE = "oic.if.b";
 
     // Used in GET, PUT, POST methods on links to other remote resources of a group.
-    const std::string GROUP_INTERFACE = "oc.mi.c";
+    const std::string GROUP_INTERFACE = "oc.mi.grp";
 
 
     typedef std::function<void(std::shared_ptr<OCResource>)> FindCallback;
 
     typedef std::function<void(const OCRepresentation&)> FindDeviceCallback;
 
+    typedef std::function<void(const OCRepresentation&)> FindPlatformCallback;
+
     typedef std::function<OCEntityHandlerResult(
                             const std::shared_ptr<OCResourceRequest>)> EntityHandler;