From 71baa13a54bbc5acb3dba2f890696291d466704b Mon Sep 17 00:00:00 2001 From: Charlie Lenahan Date: Fri, 29 May 2015 15:28:16 -0400 Subject: [PATCH] Remove CreateResourceWithHost calls. "host" member is never referenced anywhere or returned in any callbacks,so it is just a blackhole. Change-Id: I957e44361851191c2a834528e60a3007e58db026 Signed-off-by: Charlie Lenahan Reviewed-on: https://gerrit.iotivity.org/gerrit/1143 Tested-by: jenkins-iotivity Reviewed-by: Joseph Morrow Reviewed-by: Erich Keane --- resource/csdk/stack/include/internal/ocresource.h | 1 - resource/csdk/stack/include/ocstack.h | 23 --------- resource/csdk/stack/src/ocstack.c | 40 ---------------- resource/include/IServerWrapper.h | 9 ---- resource/include/InProcServerWrapper.h | 9 ---- resource/src/InProcServerWrapper.cpp | 58 ----------------------- resource/src/OCPlatform_impl.cpp | 4 +- 7 files changed, 2 insertions(+), 142 deletions(-) diff --git a/resource/csdk/stack/include/internal/ocresource.h b/resource/csdk/stack/include/internal/ocresource.h index acd6de4..58581ef 100644 --- a/resource/csdk/stack/include/internal/ocresource.h +++ b/resource/csdk/stack/include/internal/ocresource.h @@ -129,7 +129,6 @@ typedef struct resourceinterface_t { typedef struct rsrc_t { struct rsrc_t *next; // Points to next resource in list // Relative path on the device; will be combined with base url to create fully qualified path - char *host; char *uri; OCResourceType *rsrcType; // Resource type(s); linked list OCResourceInterface *rsrcInterface; // Resource interface(s); linked list diff --git a/resource/csdk/stack/include/ocstack.h b/resource/csdk/stack/include/ocstack.h index 49b0778..28ecba8 100644 --- a/resource/csdk/stack/include/ocstack.h +++ b/resource/csdk/stack/include/ocstack.h @@ -213,29 +213,6 @@ OCStackResult OCCreateResource(OCResourceHandle *handle, OCEntityHandler entityHandler, uint8_t resourceProperties); -/** - * Create a resource. with host ip address for remote resource. - * - * @param handle Pointer to handle to newly created resource. Set by ocstack. - * Used to refer to resource. - * @param resourceTypeName Name of resource type. Example: "core.led". - * @param resourceInterfaceName Name of resource interface. Example: "core.rw". - * @param host HOST address of the remote resource. Example: "coap://xxx.xxx.xxx.xxx:xxxxx". - * @param uri URI of the resource. Example: "/a/led". - * @param entityHandler Entity handler function that is called by ocstack to handle requests, etc. - * NULL for default entity handler. - * @param resourceProperties Properties supported by resource. - * Example: ::OC_DISCOVERABLE|::OC_OBSERVABLE - * - * @return ::OC_STACK_OK on success, some other value upon failure. - */ -OCStackResult OCCreateResourceWithHost(OCResourceHandle *handle, - const char *resourceTypeName, - const char *resourceInterfaceName, - const char *host, - const char *uri, - OCEntityHandler entityHandler, - uint8_t resourceProperties); /** * Add a resource to a collection resource. diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index aac4606..8bec995 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -2725,46 +2725,6 @@ exit: return result; } -OCStackResult OCCreateResourceWithHost(OCResourceHandle *handle, - const char *resourceTypeName, - const char *resourceInterfaceName, - const char *host, - const char *uri, - OCEntityHandler entityHandler, - uint8_t resourceProperties) -{ - OC_LOG(INFO, TAG, PCF("Entering OCCreateResourceWithHost")); - char *str = NULL; - size_t size = 0; - - if(!host) - { - OC_LOG(ERROR, TAG, PCF("Added resource host is NULL.")); - return OC_STACK_INVALID_PARAM; - } - - OCStackResult result = OC_STACK_ERROR; - - result = OCCreateResource(handle, resourceTypeName, resourceInterfaceName, - uri, entityHandler, resourceProperties); - - if (result == OC_STACK_OK) - { - // Set the uri - size = strlen(host) + 1; - str = (char *) OCMalloc(size); - if (!str) - { - OC_LOG(ERROR, TAG, PCF("Memory could not be allocated.")); - return OC_STACK_NO_MEMORY; - } - strncpy(str, host, size); - - ((OCResource *) *handle)->host = str; - } - - return result; -} OCStackResult OCBindResource( OCResourceHandle collectionHandle, OCResourceHandle resourceHandle) diff --git a/resource/include/IServerWrapper.h b/resource/include/IServerWrapper.h index ef45485..66f2007 100644 --- a/resource/include/IServerWrapper.h +++ b/resource/include/IServerWrapper.h @@ -57,15 +57,6 @@ namespace OC virtual OCStackResult registerPlatformInfo( const OCPlatformInfo PlatformInfo) = 0; - virtual OCStackResult registerResourceWithHost( - OCResourceHandle& resourceHandle, - std::string& resourceHOST, - std::string& resourceURI, - const std::string& resourceTypeName, - const std::string& resourceInterface, - EntityHandler& entityHandler, - uint8_t resourceProperty) = 0; - virtual OCStackResult unregisterResource( const OCResourceHandle& resourceHandle) = 0; virtual OCStackResult bindTypeToResource( diff --git a/resource/include/InProcServerWrapper.h b/resource/include/InProcServerWrapper.h index 1a9192a..6ba6466 100644 --- a/resource/include/InProcServerWrapper.h +++ b/resource/include/InProcServerWrapper.h @@ -51,15 +51,6 @@ namespace OC virtual OCStackResult registerPlatformInfo( const OCPlatformInfo PlatformInfo); - virtual OCStackResult registerResourceWithHost( - OCResourceHandle& resourceHandle, - std::string& resourceHOST, - std::string& resourceURI, - const std::string& resourceTypeName, - const std::string& resourceInterface, - EntityHandler& entityHandler, - uint8_t resourceProperty); - virtual OCStackResult unregisterResource( const OCResourceHandle& resourceHandle); diff --git a/resource/src/InProcServerWrapper.cpp b/resource/src/InProcServerWrapper.cpp index f42a18c..0c31217 100644 --- a/resource/src/InProcServerWrapper.cpp +++ b/resource/src/InProcServerWrapper.cpp @@ -377,65 +377,7 @@ namespace OC return result; } - OCStackResult InProcServerWrapper::registerResourceWithHost( - OCResourceHandle& resourceHandle, - std::string& resourceHOST, - std::string& resourceURI, - const std::string& resourceTypeName, - const std::string& resourceInterface, - EntityHandler& eHandler, - uint8_t resourceProperties) - - { - OCStackResult result = OC_STACK_ERROR; - auto cLock = m_csdkLock.lock(); - - if (cLock) - { - std::lock_guard < std::recursive_mutex > lock(*cLock); - - if (NULL != eHandler) - { - result = OCCreateResourceWithHost(&resourceHandle, // OCResourceHandle *handle - resourceTypeName.c_str(), // const char * resourceTypeName - resourceInterface.c_str(), //const char * resourceInterfaceName //TODO fix - resourceHOST.c_str(), // const char * host - (resourceHOST + resourceURI).c_str(), // const char * uri - EntityHandlerWrapper, // OCEntityHandler entityHandler - resourceProperties // uint8_t resourceProperties - ); - } - else - { - result = OCCreateResourceWithHost(&resourceHandle, // OCResourceHandle *handle - resourceTypeName.c_str(), // const char * resourceTypeName - resourceInterface.c_str(), //const char * resourceInterfaceName //TODO fix - resourceHOST.c_str(), // const char * host - (resourceHOST + resourceURI).c_str(), // const char * uri - nullptr, // OCEntityHandler entityHandler - resourceProperties // uint8_t resourceProperties - ); - } - - if (result != OC_STACK_OK) - { - resourceHandle = nullptr; - } - else - { - std::lock_guard lock(OC::details::serverWrapperLock); - OC::details::entityHandlerMap[resourceHandle] = eHandler; - OC::details::resourceUriMap[resourceHandle] = resourceURI; - } - } - else - { - result = OC_STACK_ERROR; - } - - return result; - } OCStackResult InProcServerWrapper::setDefaultDeviceEntityHandler (EntityHandler entityHandler) diff --git a/resource/src/OCPlatform_impl.cpp b/resource/src/OCPlatform_impl.cpp index e694bab..230f924 100644 --- a/resource/src/OCPlatform_impl.cpp +++ b/resource/src/OCPlatform_impl.cpp @@ -244,8 +244,8 @@ namespace OC uint8_t resourceProperty = OC_DISCOVERABLE | OC_OBSERVABLE; std::vector resourceTypes = resource->getResourceTypes(); - return checked_guard(m_server, &IServerWrapper::registerResourceWithHost, - std::ref(resourceHandle), resource->host(), resource->uri(), + return checked_guard(m_server, &IServerWrapper::registerResource, + std::ref(resourceHandle), resource->uri(), resourceTypes[0]/*"core.remote"*/, DEFAULT_INTERFACE, (EntityHandler) nullptr, resourceProperty); } -- 2.7.4