Imported Upstream version 1.2.0

[platform/upstream/iotivity.git] / resource / csdk / stack / include / internal / occlientcb.h

diff --git a/resource/csdk/stack/include/internal/occlientcb.h b/resource/csdk/stack/include/internal/occlientcb.h
index e32869c..2fcdb29 100644 (file)
--- a/resource/csdk/stack/include/internal/occlientcb.h
+++ b/resource/csdk/stack/include/internal/occlientcb.h
@@ -53,21 +53,6 @@ typedef struct OCPresence
 } OCPresence;
 
 /**
- * Data structure to hold Multicast node identity for resource discovery.
- */
-typedef struct OCMulticastNode
-{
-    /** URI of new resource.*/
-    char * uri;
-
-    /** URI of new resource that entity handler might create.*/
-    uint32_t nonce;
-
-    /** Linked list; for multicast nodes.*/
-    struct OCMulticastNode * next;
-} OCMulticastNode;
-
-/**
  * Forward declaration of resource type.
  */
 typedef struct resourcetype_t OCResourceType;
@@ -112,10 +97,10 @@ typedef struct ClientCB {
 
     /** Struct to hold TTL info for presence.*/
 
-    #ifdef WITH_PRESENCE
+#ifdef WITH_PRESENCE
     OCPresence * presence;
     OCResourceType * filterResourceType;
-    #endif
+#endif
 
     /** The connectivity type on which the request was sent on.*/
     OCConnectivityType conType;
@@ -155,12 +140,11 @@ extern struct ClientCB *cbList;
  *
  * @return OC_STACK_OK for Success, otherwise some error value.
  */
-OCStackResult
-AddClientCB (ClientCB** clientCB, OCCallbackData* cbData,
-             CAToken_t token, uint8_t tokenLength,
-             OCDoHandle *handle, OCMethod method,
-             OCDevAddr *devAddr, char * requestUri,
-             char * resourceTypeName, uint32_t ttl);
+OCStackResult AddClientCB(ClientCB** clientCB, OCCallbackData* cbData,
+                          CAToken_t token, uint8_t tokenLength,
+                          OCDoHandle *handle, OCMethod method,
+                          OCDevAddr *devAddr, char * requestUri,
+                          char * resourceTypeName, uint32_t ttl);
 
 /** @ingroup ocstack
  *
@@ -185,7 +169,7 @@ void DeleteClientCB(ClientCB *cbNode);
  * @return address of the node if found, otherwise NULL
  */
 ClientCB* GetClientCB(const CAToken_t token, uint8_t tokenLength,
-        OCDoHandle handle, const char * requestUri);
+                      OCDoHandle handle, const char * requestUri);
 
 #ifdef WITH_PRESENCE
 /**
@@ -219,29 +203,5 @@ void DeleteClientCBList();
  */
 void FindAndDeleteClientCB(ClientCB * cbNode);
 
-/** @ingroup ocstack
- *
- * This method is used to search a multicast presence node from list.
- *
- * @param[in]  uri   the uri of the request.
- *
- * @return OCMulticastNode
- *              The resulting node from making this call. Null if doesn't exist.
- */
-
-OCMulticastNode* GetMCPresenceNode(const char * uri);
-
-/** @ingroup ocstack
- *
- * This method is used to add a multicast presence node to the list.
- * @param[out] outnode  the resulting node from making this call. Null if out of memory.
- * @param[in] uri       the uri of the server.
- * @param[in] nonce     current nonce for the server
- *
- * @return OC_STACK_OK for Success, otherwise some error value
- */
-
-OCStackResult AddMCPresenceNode(OCMulticastNode** outnode, char* uri, uint32_t nonce);
-
 #endif //OC_CLIENT_CB