X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Finclude%2FOCApi.h;h=8087a4e282b4f3ffc5ab53c9aea51302e651b552;hb=935fdb9b67b6c10d007e652e9e2e028fd6ccfe09;hp=b523da538a90162bd8a5cab76b06953d4b3ba1ff;hpb=00b3660e45c56cb3db35dc2596a054f801b5591a;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/include/OCApi.h b/resource/include/OCApi.h index b523da5..8087a4e 100644 --- a/resource/include/OCApi.h +++ b/resource/include/OCApi.h @@ -28,7 +28,7 @@ #include #include -#include "ocstack.h" +#include "octypes.h" #include "OCHeaderOption.h" #include #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)> FindCallback; typedef std::function FindDeviceCallback; + typedef std::function FindPlatformCallback; + typedef std::function)> EntityHandler;