Fix issue eclipse-wakaama#281: Check consistency at bootstrap finish.

Signed-off-by: Scott Bertin <sbertin@telular.com>
dingbihu · Jun 1, 2017 · 63285b9 · 63285b9
1 parent 3b6cc09
commit 63285b9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/core/bootstrap.c b/core/bootstrap.c
@@ -203,9 +203,16 @@ coap_status_t bootstrap_handleFinish(lwm2m_context_t * context,
     if (bootstrapServer != NULL
      && bootstrapServer->status == STATE_BS_PENDING)
     {
-        LOG("Bootstrap server status changed to STATE_BS_FINISHING");
-        bootstrapServer->status = STATE_BS_FINISHING;
-        return COAP_204_CHANGED;
+        if (object_getServers(context, true) == 0)
+        {
+            LOG("Bootstrap server status changed to STATE_BS_FINISHING");
+            bootstrapServer->status = STATE_BS_FINISHING;
+            return COAP_204_CHANGED;
+        }
+        else
+        {
+           return COAP_406_NOT_ACCEPTABLE;
+        }
     }
 
     return COAP_IGNORE;

diff --git a/core/internals.h b/core/internals.h
@@ -256,7 +256,7 @@ uint8_t object_checkReadable(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
 uint8_t object_checkNumeric(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
 bool object_isInstanceNew(lwm2m_context_t * contextP, uint16_t objectId, uint16_t instanceId);
 int object_getRegisterPayload(lwm2m_context_t * contextP, uint8_t * buffer, size_t length);
-int object_getServers(lwm2m_context_t * contextP);
+int object_getServers(lwm2m_context_t * contextP, bool checkOnly);
 coap_status_t object_createInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
 coap_status_t object_writeInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
 

diff --git a/core/liblwm2m.c b/core/liblwm2m.c
@@ -240,7 +240,7 @@ static int prv_refreshServerList(lwm2m_context_t * contextP)
         targetP = nextP;
     }
 
-    return object_getServers(contextP);
+    return object_getServers(contextP, false);
 }
 
 int lwm2m_configure(lwm2m_context_t * contextP,

diff --git a/core/objects.c b/core/objects.c
@@ -686,7 +686,7 @@ static int prv_getMandatoryInfo(lwm2m_object_t * objectP,
     return 0;
 }
 
-int object_getServers(lwm2m_context_t * contextP)
+int object_getServers(lwm2m_context_t * contextP, bool checkOnly)
 {
     lwm2m_object_t * objectP;
     lwm2m_object_t * securityObjP = NULL;
@@ -772,7 +772,14 @@ int object_getServers(lwm2m_context_t * contextP)
                 // lifetime of a bootstrap server is set to ClientHoldOffTime
                 targetP->lifetime = value;
 
-                contextP->bootstrapServerList = (lwm2m_server_t*)LWM2M_LIST_ADD(contextP->bootstrapServerList, targetP);
+                if (checkOnly)
+                {
+                    lwm2m_free(targetP);
+                }
+                else
+                {
+                    contextP->bootstrapServerList = (lwm2m_server_t*)LWM2M_LIST_ADD(contextP->bootstrapServerList, targetP);
+                }
             }
             else
             {
@@ -792,7 +799,14 @@ int object_getServers(lwm2m_context_t * contextP)
                         return -1;
                     }
                     targetP->status = STATE_DEREGISTERED;
-                    contextP->serverList = (lwm2m_server_t*)LWM2M_LIST_ADD(contextP->serverList, targetP);
+                    if (checkOnly)
+                    {
+                        lwm2m_free(targetP);
+                    }
+                    else
+                    {
+                        contextP->serverList = (lwm2m_server_t*)LWM2M_LIST_ADD(contextP->serverList, targetP);
+                    }
                 }
             }
             lwm2m_data_free(size, dataP);

diff --git a/core/registration.c b/core/registration.c
@@ -284,7 +284,7 @@ int lwm2m_update_registration(lwm2m_context_t * contextP,
     targetP = contextP->serverList;
     if (targetP == NULL)
     {
-        if (object_getServers(contextP) == -1)
+        if (object_getServers(contextP, false) == -1)
         {
             LOG("No server found");
             return COAP_404_NOT_FOUND;