Merge pull request #602 from mrdeep1/fix_rebase

resource.h: Remove function definitions that are duplicated
This commit is contained in:
obgm authored and GitHub committed 2021-02-26 09:16:43 +01:00
commit 85c6e0038c
3 files changed
-92

No files matched your search

-82
View File
@@ -395,88 +395,6 @@ coap_resource_t *coap_get_resource_from_uri_path(coap_context_t *context,
HASH_FIND(hh, (r), (k)->s, (k)->length, (res)); \
}
/**
* @addtogroup observe
* @{
*/
/**
* Adds the specified peer as observer for @p resource. The subscription is
* identified by the given @p token. This function returns the registered
* subscription information if the @p observer has been added, or @c NULL on
* error.
*
* @param resource The observed resource.
* @param session The observer's session
* @param token The token that identifies this subscription.
* @param query The query string, if any. subscription will
* take ownership of the string unless this
* function returns NULL.
* @param has_block2 If Option Block2 defined.
* @param block Contents of Block2 if has_block2 defined.
* @param code Request type code.
*
* @return A pointer to the added/updated subscription
* information or @c NULL on error.
*/
coap_subscription_t *coap_add_observer(coap_resource_t *resource,
coap_session_t *session,
const coap_binary_t *token,
coap_string_t *query,
int has_block2,
coap_block_t block,
uint8_t code);
/**
* Returns a subscription object for given @p peer.
*
* @param resource The observed resource.
* @param session The observer's session
* @param token The token that identifies this subscription or @c NULL for
* any token.
* @return A valid subscription if exists or @c NULL otherwise.
*/
coap_subscription_t *coap_find_observer(coap_resource_t *resource,
coap_session_t *session,
const coap_binary_t *token);
/**
* Flags that data is ready to be sent to observers.
*
* @param context The CoAP context to use.
* @param session The observer's session
* @param token The corresponding token that has been used for the
* subscription.
*/
void coap_touch_observer(coap_context_t *context,
coap_session_t *session,
const coap_binary_t *token);
/**
* Removes any subscription for @p observer from @p resource and releases the
* allocated storage. The result is @c 1 if an observation relationship with @p
* observer and @p token existed, @c 0 otherwise.
*
* @param resource The observed resource.
* @param session The observer's session.
* @param token The token that identifies this subscription or @c NULL for
* any token.
* @return @c 1 if the observer has been deleted, @c 0 otherwise.
*/
int coap_delete_observer(coap_resource_t *resource,
coap_session_t *session,
const coap_binary_t *token);
/**
* Removes any subscription for @p session and releases the allocated storage.
*
* @param context The CoAP context to use.
* @param session The observer's session.
*/
void coap_delete_observers(coap_context_t *context, coap_session_t *session);
/** @} */
/**
* @deprecated use coap_resource_notify_observers() instead.
*/
-5
View File
@@ -7,7 +7,6 @@ global:
coap_add_data_blocked_response;
coap_add_data_large_request;
coap_add_data_large_response;
coap_add_observer;
coap_add_option;
coap_add_optlist_pdu;
coap_add_resource;
@@ -52,8 +51,6 @@ global:
coap_delete_cache_entry;
coap_delete_cache_key;
coap_delete_node;
coap_delete_observer;
coap_delete_observers;
coap_delete_optlist;
coap_delete_pdu;
coap_delete_resource;
@@ -70,7 +67,6 @@ global:
coap_endpoint_str;
coap_find_async;
coap_find_attr;
coap_find_observer;
coap_find_transaction;
coap_fls;
coap_flsll;
@@ -228,7 +224,6 @@ global:
coap_ticks_to_rt;
coap_ticks_to_rt_us;
coap_tls_is_supported;
coap_touch_observer;
coap_wait_ack;
coap_wellknown_response;
coap_write_block_opt;
-5
View File
@@ -5,7 +5,6 @@ coap_add_data_after
coap_add_data_blocked_response
coap_add_data_large_request
coap_add_data_large_response
coap_add_observer
coap_add_option
coap_add_optlist_pdu
coap_add_resource
@@ -50,8 +49,6 @@ coap_delete_bin_const
coap_delete_cache_entry
coap_delete_cache_key
coap_delete_node
coap_delete_observer
coap_delete_observers
coap_delete_optlist
coap_delete_pdu
coap_delete_resource
@@ -68,7 +65,6 @@ coap_endpoint_set_default_mtu
coap_endpoint_str
coap_find_async
coap_find_attr
coap_find_observer
coap_find_transaction
coap_fls
coap_flsll
@@ -226,7 +222,6 @@ coap_ticks_from_rt_us
coap_ticks_to_rt
coap_ticks_to_rt_us
coap_tls_is_supported
coap_touch_observer
coap_wait_ack
coap_wellknown_response
coap_write_block_opt