obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-09 18:32:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

coap_cancel: fix COAP_RESOURCES_NOHASH

Browse Source
This commit is contained in:
chrysn committed 2015-01-15 13:34:21 +01:00
1 parent 421170b704
commit 7e37762227
1 file changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files
net.c
+10 -4
View File
@@ -1312,11 +1312,13 @@ wellknown_response(coap_context_t *context, coap_pdu_t *request) {
static int
coap_cancel(coap_context_t *context, const coap_queue_t *sent) {
#ifndef WITHOUT_OBSERVE
#ifdef WITH_CONTIKI
coap_iterator_t resource_iter;
#else
coap_resource_t *r;
#ifndef COAP_RESOURCES_NOHASH
coap_resource_t *tmp;
#else
coap_iterator_t resource_iter;
#endif
#endif
str token = { 0, NULL };
int num_cancelled = 0; /* the number of observers cancelled */
@@ -1327,7 +1329,7 @@ coap_cancel(coap_context_t *context, const coap_queue_t *sent) {
COAP_SET_STR(&token, sent->pdu->hdr->token_length, sent->pdu->hdr->token);
#ifdef COAP_RESOURCES_NOHASH
#ifdef WITH_CONTIKI
/* traverse resources and delete matching observers for each resource */
if (coap_resource_iterator_init(context->resources, &resource_iter) != NULL) {
@@ -1337,12 +1339,16 @@ coap_cancel(coap_context_t *context, const coap_queue_t *sent) {
}
}
#else
#ifdef COAP_RESOURCES_NOHASH
LL_FOREACH(context->resources, r) {
#else /* COAP_RESOURCES_NOHASH */
HASH_ITER(hh, context->resources, r, tmp) {
#endif
num_cancelled += coap_delete_observer(r, &sent->remote, &token);
coap_cancel_all_messages(context, &sent->remote, token.s, token.length);
}
#endif /* COAP_RESOURCES_NOHASH */
#endif /* not WITH_CONTIKI */
return num_cancelled;
#else /* WITOUT_OBSERVE */