terence zhang / Mbed OS mbed-os-example-wakaama

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   C12832 LM75B

Diff: wakaama/observe.c

Revision:
15:d0f20339c1ad
Parent:
14:ec9e195830ff
--- a/wakaama/observe.c	Sat May 06 11:21:27 2017 +0000
+++ b/wakaama/observe.c	Sun May 07 03:00:16 2017 +0000
@@ -226,7 +226,8 @@
     {
         lwm2m_watcher_t * targetP = NULL;
 
-        if (LWM2M_MAX_ID == mid || observedP->watcherList->lastMid == mid)
+        if ((LWM2M_MAX_ID == mid || observedP->watcherList->lastMid == mid)
+          && lwm2m_session_is_equal(observedP->watcherList->server->sessionH, fromSessionH, contextP->userData))
         {
             targetP = observedP->watcherList;
             observedP->watcherList = observedP->watcherList->next;
@@ -237,7 +238,8 @@
 
             parentP = observedP->watcherList;
             while (parentP->next != NULL
-                && (parentP->next->lastMid != mid))
+                && (parentP->next->lastMid != mid
+                || lwm2m_session_is_equal(parentP->next->server->sessionH, fromSessionH, contextP->userData)))
             {
                 parentP = parentP->next;
             }