From d216075b26515b3912baa0f8b762281c8e9e68a3 Mon Sep 17 00:00:00 2001 From: omkar Date: Tue, 13 Jan 2015 18:11:27 -0800 Subject: [PATCH] C++ SDK Adding OCConnectivity Type Previously, we had connectivity type being passed as a unsigned integer in the C++ SDK. Changing that to OCConnectivity type. Change-Id: I5f1690cc0295a2448515d7681a792eb6f6f5811c Signed-off-by: omkar --- resource/include/IClientWrapper.h | 21 +++++++++++---------- resource/include/InProcClientWrapper.h | 30 +++++++++++++++--------------- resource/include/OCPlatform.h | 15 ++++++++------- resource/include/OCPlatform_impl.h | 15 ++++++++------- resource/include/OCResource.h | 9 +++++---- resource/include/OCSerialization.h | 4 ++-- resource/include/OutOfProcClientWrapper.h | 31 ++++++++++++++++--------------- resource/src/InProcClientWrapper.cpp | 24 ++++++++++++------------ resource/src/OCPlatform.cpp | 31 ++++++++++++++++--------------- resource/src/OCPlatform_impl.cpp | 16 +++++++++------- resource/src/OCResource.cpp | 4 ++-- 11 files changed, 104 insertions(+), 96 deletions(-) diff --git a/resource/include/IClientWrapper.h b/resource/include/IClientWrapper.h index 31a9591..5ce6395 100644 --- a/resource/include/IClientWrapper.h +++ b/resource/include/IClientWrapper.h @@ -42,41 +42,42 @@ namespace OC #ifdef CA_INT virtual OCStackResult ListenForResource(const std::string& serviceUrl, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, FindCallback& callback, QualityOfService QoS) = 0; virtual OCStackResult ListenForDevice(const std::string& serviceUrl, - const std::string& deviceURI, uint8_t connectivityType, + const std::string& deviceURI, OCConnectivityType connectivityType, FindDeviceCallback& callback, QualityOfService QoS) = 0; virtual OCStackResult GetResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, + const std::string& uri, OCConnectivityType connectivityType, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, GetCallback& callback, QualityOfService QoS)=0; virtual OCStackResult PutResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, + const std::string& uri, OCConnectivityType connectivityType, 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, uint8_t connectivityType, + const std::string& uri, OCConnectivityType connectivityType, 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, - uint8_t connectivityType, const HeaderOptions& headerOptions, + OCConnectivityType connectivityType, const HeaderOptions& headerOptions, DeleteCallback& callback, QualityOfService QoS) = 0; virtual OCStackResult ObserveResource(ObserveType observeType, OCDoHandle* handle, - const std::string& host, const std::string& uri, uint8_t connectivityType, - const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, - ObserveCallback& callback, QualityOfService QoS)=0; + const std::string& host, const std::string& uri, + OCConnectivityType connectivityType, const QueryParamsMap& queryParams, + const HeaderOptions& headerOptions, ObserveCallback& callback, + QualityOfService QoS)=0; #else virtual OCStackResult ListenForResource(const std::string& serviceUrl, const std::string& resourceType, FindCallback& callback, @@ -115,7 +116,7 @@ namespace OC #ifdef CA_INT virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, SubscribeCallback& presenceHandler)=0; #else virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host, diff --git a/resource/include/InProcClientWrapper.h b/resource/include/InProcClientWrapper.h index 0d29b9d..f7351c6 100644 --- a/resource/include/InProcClientWrapper.h +++ b/resource/include/InProcClientWrapper.h @@ -85,34 +85,34 @@ namespace OC #ifdef CA_INT virtual OCStackResult ListenForResource(const std::string& serviceUrl, - const std::string& resourceType, uint8_t connectivityType, FindCallback& callback, - QualityOfService QoS); + const std::string& resourceType, OCConnectivityType connectivityType, + FindCallback& callback, QualityOfService QoS); virtual OCStackResult ListenForDevice(const std::string& serviceUrl, - const std::string& deviceURI, uint8_t connectivityType, FindDeviceCallback& callback, - QualityOfService QoS); + const std::string& deviceURI, OCConnectivityType connectivityType, + FindDeviceCallback& callback, QualityOfService QoS); virtual OCStackResult GetResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const QueryParamsMap& queryParams, - const HeaderOptions& headerOptions, + const std::string& uri, OCConnectivityType connectivityType, + const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, GetCallback& callback, QualityOfService QoS); virtual OCStackResult PutResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const OCRepresentation& attributes, - const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, - PutCallback& callback, QualityOfService QoS); + const std::string& uri, OCConnectivityType connectivityType, + const OCRepresentation& attributes, const QueryParamsMap& queryParams, + const HeaderOptions& headerOptions, PutCallback& callback, QualityOfService QoS); virtual OCStackResult PostResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const OCRepresentation& attributes, - const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, - PostCallback& callback, QualityOfService QoS); + const std::string& uri, OCConnectivityType connectivityType, + const OCRepresentation& attributes, const QueryParamsMap& queryParams, + const HeaderOptions& headerOptions, PostCallback& callback, QualityOfService QoS); virtual OCStackResult DeleteResource(const std::string& host, const std::string& uri, - uint8_t connectivityType, const HeaderOptions& headerOptions, + OCConnectivityType connectivityType, const HeaderOptions& headerOptions, DeleteCallback& callback, QualityOfService QoS); virtual OCStackResult ObserveResource(ObserveType observeType, OCDoHandle* handle, - const std::string& host, const std::string& uri, uint8_t connectivityType, + const std::string& host, const std::string& uri, OCConnectivityType connectivityType, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, ObserveCallback& callback, QualityOfService QoS); #else @@ -151,7 +151,7 @@ namespace OC #ifdef CA_INT virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, SubscribeCallback& presenceHandler); #else virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host, diff --git a/resource/include/OCPlatform.h b/resource/include/OCPlatform.h index d83dc67..79ab4b6 100644 --- a/resource/include/OCPlatform.h +++ b/resource/include/OCPlatform.h @@ -116,9 +116,10 @@ namespace OC */ #ifdef CA_INT OCStackResult findResource(const std::string& host, const std::string& resourceURI, - uint8_t connectivityType, FindCallback resourceHandler); + OCConnectivityType connectivityType, FindCallback resourceHandler); OCStackResult findResource(const std::string& host, const std::string& resourceURI, - uint8_t connectivityType, FindCallback resourceHandler, QualityOfService QoS); + OCConnectivityType connectivityType, FindCallback resourceHandler, + QualityOfService QoS); #endif OCStackResult findResource(const std::string& host, const std::string& resourceURI, FindCallback resourceHandler); @@ -136,9 +137,9 @@ namespace OC */ #ifdef CA_INT OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, FindDeviceCallback deviceInfoHandler); + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler); OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, FindDeviceCallback deviceInfoHandler, + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler, QualityOfService QoS); #endif OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, @@ -395,9 +396,9 @@ namespace OC */ #ifdef CA_INT OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, - uint8_t connectivityType, SubscribeCallback presenceHandler); + OCConnectivityType connectivityType, SubscribeCallback presenceHandler); OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, SubscribeCallback presenceHandler); #endif OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, @@ -443,7 +444,7 @@ namespace OC */ #ifdef CA_INT OCResource::Ptr constructResourceObject(const std::string& host, const std::string& uri, - uint8_t connectivityType, bool isObservable, + OCConnectivityType connectivityType, bool isObservable, const std::vector& resourceTypes, const std::vector& interfaces); #endif diff --git a/resource/include/OCPlatform_impl.h b/resource/include/OCPlatform_impl.h index 46bc9d9..6f7ca58 100644 --- a/resource/include/OCPlatform_impl.h +++ b/resource/include/OCPlatform_impl.h @@ -142,9 +142,10 @@ namespace OC */ #ifdef CA_INT OCStackResult findResource(const std::string& host, const std::string& resourceURI, - uint8_t connectivityType, FindCallback resourceHandler); + OCConnectivityType connectivityType, FindCallback resourceHandler); OCStackResult findResource(const std::string& host, const std::string& resourceURI, - uint8_t connectivityType, FindCallback resourceHandler, QualityOfService QoS); + OCConnectivityType connectivityType, FindCallback resourceHandler, + QualityOfService QoS); #else OCStackResult findResource(const std::string& host, const std::string& resourceURI, FindCallback resourceHandler); @@ -163,9 +164,9 @@ namespace OC */ #ifdef CA_INT OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, FindDeviceCallback deviceInfoHandler); + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler); OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, FindDeviceCallback deviceInfoHandler, + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler, QualityOfService QoS); #else OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, @@ -419,9 +420,9 @@ namespace OC */ #ifdef CA_INT OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, - uint8_t connectivityType, SubscribeCallback presenceHandler); + OCConnectivityType connectivityType, SubscribeCallback presenceHandler); OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, SubscribeCallback presenceHandler); #else OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, @@ -468,7 +469,7 @@ namespace OC */ #ifdef CA_INT OCResource::Ptr constructResourceObject(const std::string& host, const std::string& uri, - uint8_t connectivityType, bool isObservable, + OCConnectivityType connectivityType, bool isObservable, const std::vector& resourceTypes, const std::vector& interfaces); #else diff --git a/resource/include/OCResource.h b/resource/include/OCResource.h index 5846994..5a09fbf 100644 --- a/resource/include/OCResource.h +++ b/resource/include/OCResource.h @@ -317,7 +317,7 @@ namespace OC * Function to get the connectivity type of this resource * @return uint8_t connectivity type */ - uint8_t connectivityType() const; + OCConnectivityType connectivityType() const; #endif /** @@ -384,7 +384,7 @@ namespace OC OCResourceIdentifier m_resourceId; std::string m_host; #ifdef CA_INT - uint8_t m_connectivityType; + OCConnectivityType m_connectivityType; #endif bool m_isObservable; bool m_isCollection; @@ -397,8 +397,9 @@ namespace OC private: #ifdef CA_INT OCResource(std::weak_ptr clientWrapper, const std::string& host, - const std::string& uri, const std::string& serverId, uint8_t m_connectivityType, - bool observable, const std::vector& resourceTypes, + const std::string& uri, const std::string& serverId, + OCConnectivityType m_connectivityType, bool observable, + const std::vector& resourceTypes, const std::vector& interfaces); #else OCResource(std::weak_ptr clientWrapper, const std::string& host, diff --git a/resource/include/OCSerialization.h b/resource/include/OCSerialization.h index b0bf50a..8ab3426 100644 --- a/resource/include/OCSerialization.h +++ b/resource/include/OCSerialization.h @@ -188,7 +188,7 @@ namespace OC public: #ifdef CA_INT ListenOCContainer(std::weak_ptr cw, const OCDevAddr& address, - uint8_t connectivityType, std::stringstream& json): + OCConnectivityType connectivityType, std::stringstream& json): m_clientWrapper(cw), m_address(address), m_connectivityType(connectivityType) #else ListenOCContainer(std::weak_ptr cw, const OCDevAddr& address, @@ -300,6 +300,6 @@ namespace OC std::vector> m_resources; std::weak_ptr m_clientWrapper; OCDevAddr m_address; - uint8_t m_connectivityType; + OCConnectivityType m_connectivityType; }; } diff --git a/resource/include/OutOfProcClientWrapper.h b/resource/include/OutOfProcClientWrapper.h index 0654a36..6b54748 100644 --- a/resource/include/OutOfProcClientWrapper.h +++ b/resource/include/OutOfProcClientWrapper.h @@ -34,40 +34,41 @@ namespace OC #ifdef CA_INT virtual OCStackResult ListenForResource(const std::string& serviceUrl, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, FindCallback& callback, QualityOfService QoS) {return OC_STACK_NOTIMPL;} virtual OCStackResult ListenForDevice(const std::string& serviceUrl, - const std::string& deviceURI, uint8_t connectivityType, FindDeviceCallback& callback, - QualityOfService QoS) + const std::string& deviceURI, OCConnectivityType connectivityType, + FindDeviceCallback& callback, QualityOfService QoS) {return OC_STACK_NOTIMPL;} virtual OCStackResult GetResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const QueryParamsMap& queryParams, - const HeaderOptions& headerOptions, GetCallback& callback, - QualityOfService QoS) + const std::string& uri, OCConnectivityType connectivityType, + const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, + GetCallback& callback, QualityOfService QoS) {return OC_STACK_NOTIMPL;} virtual OCStackResult PutResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const OCRepresentation& attributes, - const QueryParamsMap& queryParams, + const std::string& uri, OCConnectivityType connectivityType, + const OCRepresentation& attributes, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, PutCallback& callback, QualityOfService QoS) {return OC_STACK_NOTIMPL;} virtual OCStackResult PostResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const OCRepresentation& attributes, - const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, - PostCallback& callback, QualityOfService QoS) + const std::string& uri, OCConnectivityType connectivityType, + const OCRepresentation& attributes, const QueryParamsMap& queryParams, + const HeaderOptions& headerOptions, PostCallback& callback, QualityOfService QoS) {return OC_STACK_NOTIMPL;} virtual OCStackResult DeleteResource(const std::string& host, const std::string& uri, - uint8_t connectivityType, const HeaderOptions& headerOptions, DeleteCallback& callback, - QualityOfService QoS) {return OC_STACK_NOTIMPL;} + OCConnectivityType connectivityType, const HeaderOptions& headerOptions, + DeleteCallback& callback, QualityOfService QoS) + {return OC_STACK_NOTIMPL;} virtual OCStackResult ObserveResource(ObserveType observeType, OCDoHandle* handle, - const std::string& host, const std::string& uri, uint8_t connectivityType, + const std::string& host, const std::string& uri, OCConnectivityType connectivityType, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, ObserveCallback& callback, QualityOfService QoS){return OC_STACK_NOTIMPL;} #else @@ -113,7 +114,7 @@ namespace OC const HeaderOptions& headerOptions, QualityOfService QoS){return OC_STACK_NOTIMPL;} #ifdef CA_INT virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, SubscribeCallback& presenceHandler) {return OC_STACK_NOTIMPL;} #else diff --git a/resource/src/InProcClientWrapper.cpp b/resource/src/InProcClientWrapper.cpp index c2762bf..1d9d439 100644 --- a/resource/src/InProcClientWrapper.cpp +++ b/resource/src/InProcClientWrapper.cpp @@ -181,7 +181,7 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::ListenForResource(const std::string& serviceUrl, - const std::string& resourceType, uint8_t connectivityType, + const std::string& resourceType, OCConnectivityType connectivityType, FindCallback& callback, QualityOfService QoS) #else OCStackResult InProcClientWrapper::ListenForResource(const std::string& serviceUrl, @@ -244,7 +244,7 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::ListenForDevice(const std::string& serviceUrl, - const std::string& deviceURI, uint8_t connectivityType, + const std::string& deviceURI, OCConnectivityType connectivityType, FindDeviceCallback& callback, QualityOfService QoS) #else OCStackResult InProcClientWrapper::ListenForDevice(const std::string& serviceUrl, @@ -337,9 +337,9 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::GetResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const QueryParamsMap& queryParams, - const HeaderOptions& headerOptions, GetCallback& callback, - QualityOfService QoS) + const std::string& uri, OCConnectivityType connectivityType, + const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, + GetCallback& callback, QualityOfService QoS) #else OCStackResult InProcClientWrapper::GetResourceRepresentation(const std::string& host, const std::string& uri, const QueryParamsMap& queryParams, @@ -450,7 +450,7 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::PostResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const OCRepresentation& rep, + const std::string& uri, OCConnectivityType connectivityType, const OCRepresentation& rep, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, PostCallback& callback, QualityOfService QoS) #else @@ -508,7 +508,7 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::PutResourceRepresentation(const std::string& host, - const std::string& uri, uint8_t connectivityType, const OCRepresentation& rep, + const std::string& uri, OCConnectivityType connectivityType, const OCRepresentation& rep, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, PutCallback& callback, QualityOfService QoS) #else @@ -584,8 +584,8 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::DeleteResource(const std::string& host, - const std::string& uri, uint8_t connectivityType, const HeaderOptions& headerOptions, - DeleteCallback& callback, QualityOfService QoS) + const std::string& uri, OCConnectivityType connectivityType, + const HeaderOptions& headerOptions, DeleteCallback& callback, QualityOfService QoS) #else OCStackResult InProcClientWrapper::DeleteResource(const std::string& host, const std::string& uri, const HeaderOptions& headerOptions, @@ -658,7 +658,7 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::ObserveResource(ObserveType observeType, OCDoHandle* handle, - const std::string& host, const std::string& uri, uint8_t connectivityType, + const std::string& host, const std::string& uri, OCConnectivityType connectivityType, const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, ObserveCallback& callback, QualityOfService QoS) #else @@ -780,8 +780,8 @@ namespace OC #ifdef CA_INT OCStackResult InProcClientWrapper::SubscribePresence(OCDoHandle* handle, - const std::string& host, const std::string& resourceType, uint8_t connectivityType, - SubscribeCallback& presenceHandler) + const std::string& host, const std::string& resourceType, + OCConnectivityType connectivityType, SubscribeCallback& presenceHandler) #else OCStackResult InProcClientWrapper::SubscribePresence(OCDoHandle* handle, const std::string& host, const std::string& resourceType, diff --git a/resource/src/OCPlatform.cpp b/resource/src/OCPlatform.cpp index c240480..62bce98 100644 --- a/resource/src/OCPlatform.cpp +++ b/resource/src/OCPlatform.cpp @@ -72,7 +72,8 @@ namespace OC #ifdef CA_INT OCResource::Ptr constructResourceObject(const std::string& host, - const std::string& uri, uint8_t connectivityType, + const std::string& uri, + OCConnectivityType connectivityType, bool isObservable, const std::vector& resourceTypes, const std::vector& interfaces) @@ -84,7 +85,7 @@ namespace OC OCStackResult findResource(const std::string& host, const std::string& resourceName, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindCallback resourceHandler) { return OCPlatform_impl::Instance().findResource(host, resourceName, @@ -93,7 +94,7 @@ namespace OC OCStackResult findResource(const std::string& host, const std::string& resourceName, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindCallback resourceHandler, QualityOfService QoS) { return OCPlatform_impl::Instance().findResource(host, resourceName, connectivityType, @@ -102,7 +103,7 @@ namespace OC OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler) { return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, @@ -111,7 +112,7 @@ namespace OC OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler, QualityOfService QoS) { @@ -127,7 +128,7 @@ namespace OC //TODO-CA Revisit this API #ifdef CA_INT return OCPlatform_impl::Instance().findResource(host, resourceName, - OC_WIFI | OC_ETHERNET, resourceHandler); + OC_WIFI, resourceHandler); #else return OCPlatform_impl::Instance().findResource(host, resourceName, resourceHandler); #endif @@ -140,7 +141,7 @@ namespace OC //TODO-CA Revisit this API #ifdef CA_INT return OCPlatform_impl::Instance().findResource(host, resourceName, - OC_WIFI | OC_ETHERNET, resourceHandler, QoS); + OC_WIFI, resourceHandler, QoS); #else return OCPlatform_impl::Instance().findResource(host, resourceName, resourceHandler, QoS); @@ -155,8 +156,8 @@ namespace OC { //TODO-CA Revisit this API #ifdef CA_INT - return OCPlatform_impl::Instance().constructResourceObject(host, uri, isObservable, - OC_WIFI | OC_ETHERNET, resourceTypes, interfaces); + return OCPlatform_impl::Instance().constructResourceObject(host, uri, OC_WIFI, + isObservable, resourceTypes, interfaces); #else return OCPlatform_impl::Instance().constructResourceObject(host, uri, isObservable, resourceTypes, interfaces); @@ -168,7 +169,7 @@ namespace OC FindDeviceCallback deviceInfoHandler) { #ifdef CA_INT - return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, OC_WIFI | OC_ETHERNET, + return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, OC_WIFI, deviceInfoHandler); #else return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, deviceInfoHandler); @@ -181,7 +182,7 @@ namespace OC QualityOfService QoS) { #ifdef CA_INT - return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, OC_WIFI | OC_ETHERNET, + return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, OC_WIFI, deviceInfoHandler, QoS); #else return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, deviceInfoHandler, QoS); @@ -269,7 +270,7 @@ namespace OC #ifdef CA_INT OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, - uint8_t connectivityType, + OCConnectivityType connectivityType, SubscribeCallback presenceHandler) { return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host, @@ -279,7 +280,7 @@ namespace OC OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, const std::string& resourceType, - uint8_t connectivityType, + OCConnectivityType connectivityType, SubscribeCallback presenceHandler) { return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host, @@ -293,7 +294,7 @@ namespace OC //TODO-CA Revisit this API #ifdef CA_INT return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host, - OC_WIFI | OC_ETHERNET, presenceHandler); + OC_WIFI, presenceHandler); #else return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host, presenceHandler); @@ -308,7 +309,7 @@ namespace OC //TODO-CA Revisit this API #ifdef CA_INT return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host, - resourceType, OC_WIFI | OC_ETHERNET, + resourceType, OC_WIFI, presenceHandler); #else return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host, diff --git a/resource/src/OCPlatform_impl.cpp b/resource/src/OCPlatform_impl.cpp index 00ddad2..3039fe5 100644 --- a/resource/src/OCPlatform_impl.cpp +++ b/resource/src/OCPlatform_impl.cpp @@ -140,7 +140,8 @@ namespace OC #ifdef CA_INT OCResource::Ptr OCPlatform_impl::constructResourceObject(const std::string& host, - const std::string& uri, uint8_t connectivityType, + const std::string& uri, + OCConnectivityType connectivityType, bool isObservable, const std::vector& resourceTypes, const std::vector& interfaces) @@ -160,7 +161,7 @@ namespace OC OCStackResult OCPlatform_impl::findResource(const std::string& host, const std::string& resourceName, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindCallback resourceHandler) { return findResource(host, resourceName, connectivityType, resourceHandler, m_cfg.QoS); @@ -168,7 +169,7 @@ namespace OC OCStackResult OCPlatform_impl::findResource(const std::string& host, const std::string& resourceName, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindCallback resourceHandler, QualityOfService QoS) { @@ -178,7 +179,7 @@ namespace OC OCStackResult OCPlatform_impl::getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler) { return result_guard(getDeviceInfo(host, deviceURI, connectivityType, @@ -187,7 +188,7 @@ namespace OC OCStackResult OCPlatform_impl::getDeviceInfo(const std::string& host, const std::string& deviceURI, - uint8_t connectivityType, + OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler, QualityOfService QoS) { @@ -356,7 +357,8 @@ namespace OC #ifdef CA_INT OCStackResult OCPlatform_impl::subscribePresence(OCPresenceHandle& presenceHandle, - const std::string& host, uint8_t connectivityType, + const std::string& host, + OCConnectivityType connectivityType, SubscribeCallback presenceHandler) { return subscribePresence(presenceHandle, host, "", connectivityType, presenceHandler); @@ -366,7 +368,7 @@ namespace OC OCStackResult OCPlatform_impl::subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host, const std::string& resourceType, - uint8_t connectivityType, + OCConnectivityType connectivityType, SubscribeCallback presenceHandler) { return checked_guard(m_client, &IClientWrapper::SubscribePresence, diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index 847d21d..3a1312c 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -32,7 +32,7 @@ using OC::checked_guard; #ifdef CA_INT OCResource::OCResource(std::weak_ptr clientWrapper, const std::string& host, const std::string& uri, const std::string& serverId, - uint8_t connectivityType, bool observable, + OCConnectivityType connectivityType, bool observable, const std::vector& resourceTypes, const std::vector& interfaces) : m_clientWrapper(clientWrapper), m_uri(uri), m_resourceId(serverId, m_uri), @@ -325,7 +325,7 @@ std::string OCResource::uri() const } #ifdef CA_INT -uint8_t OCResource::connectivityType() const +OCConnectivityType OCResource::connectivityType() const { return m_connectivityType; } -- 2.7.4