Merge pull request #577 from mrdeep1/observer_fix

Observe: Fix coap_free_context() assert when active observe
obgm · Feb 24, 2021 · 35dbc32 · 35dbc32
2 parents 7c54bd7 + 9de0ff3
commit 35dbc32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/net.c b/src/net.c
@@ -586,15 +586,16 @@ coap_free_context(coap_context_t *context) {
   if (!context)
     return;
 
+  /* Removing a resource may cause a CON observe to be sent */
+  coap_delete_all_resources(context);
+
   coap_delete_all(context->sendqueue);
 
 #ifdef WITH_LWIP
   context->sendqueue = NULL;
   coap_retransmittimer_restart(context);
 #endif
 
-  coap_delete_all_resources(context);
-
 #ifndef WITHOUT_ASYNC
   coap_delete_all_async(context);
 #endif /* WITHOUT_ASYNC */

diff --git a/src/resource.c b/src/resource.c
@@ -906,6 +906,9 @@ coap_notify_observers(coap_context_t *context, coap_resource_t *r,
         assert(h);      /* we do not allow subscriptions if no
                          * GET/FETCH handler is defined */
         h(context, r, obs->session, NULL, &token, obs->query, response);
+        if (COAP_RESPONSE_CLASS(response->code) > 2) {
+          coap_delete_observer(r, obs->session, &token);
+        }
         break;
       case COAP_DELETING_RESOURCE:
       default:
@@ -914,9 +917,6 @@ coap_notify_observers(coap_context_t *context, coap_resource_t *r,
         break;
       }
 
-      /* TODO: do not send response and remove observer when
-       *  COAP_RESPONSE_CLASS(response->hdr->code) > 2
-       */
       if (response->type == COAP_MESSAGE_CON ||
           (r->flags & COAP_RESOURCE_FLAGS_NOTIFY_NON_ALWAYS)) {
         obs->non_cnt = 0;