Merge pull request #505 from openweave/issue/session-restore-fix

Fixed bug in WeaveFabricState::RestoreSession()

Author: Jay Logue

src/lib/core/WeaveFabricState.cpp

@@ -762,12 +762,24 @@ WEAVE_ERROR WeaveFabricState::RestoreSession(uint8_t * serializedSession, uint16
     err = reader.Get(peerNodeId);
     SuccessOrExit(err);
 
-    // Look for or create a session key entry for the given key id and peer node.
+    // Look for / create a session key entry for the given key id and peer node.
     err = FindSessionKey(keyId, peerNodeId, true, sessionKey);
     SuccessOrExit(err);
-
-    // If the key id / peer node matched an existing session key, fail with an error.
-    VerifyOrExit(!sessionKey->IsKeySet(), err = WEAVE_ERROR_DUPLICATE_KEY_ID);
+    if (!sessionKey->IsAllocated())
+    {
+        sessionKey->MsgEncKey.KeyId = keyId;
+        sessionKey->NodeId = peerNodeId;
+        sessionKey->BoundCon = NULL;
+        sessionKey->ReserveCount = 0;
+        sessionKey->Flags = 0;
+    }
+    else
+    {
+        // If the key id / peer node matches an existing session that is NOT suspended, fail with an error.
+        VerifyOrExit(sessionKey->IsSuspended(), err = WEAVE_ERROR_DUPLICATE_KEY_ID);
+    }
+    sessionKey->SetRemoveOnIdle(true);
+    sessionKey->MarkRecentlyActive();
 
     // After this point, if an error occurs, remove the session key.
     removeSessionOnError = true;

src/test-apps/weave-ping.cpp

@@ -671,7 +671,8 @@ void DriveSending()
         }
 
         // If the --test-session-suspend option has been enabled, suspend and restore
-        // the CASE session every 4 echo requests.
+        // the CASE session every 4 echo requests.  Every 8th echo request, remove the
+        // suspended session before attempting to restore it.
         if (TestSessionSuspend && gWeaveSecurityMode.SecurityMode == WeaveSecurityMode::kCASE)
         {
             if (EchoCount > 0 && (EchoCount % 4) == 0)
@@ -680,16 +681,25 @@ void DriveSending()
                 uint16_t serializedKeyLen;
 
                 printf("Suspending CASE session\n");
-
                 err = FabricState.SuspendSession(EchoClient.KeyId, DestNodeId, buf, sizeof(buf), serializedKeyLen);
                 if (err != WEAVE_NO_ERROR)
                 {
                     printf("FabricState.SuspendSession() failed: %s\n", ErrorStr(err));
                 }
-                else
+
+                if (err == WEAVE_NO_ERROR && (EchoCount % 8) == 0)
                 {
-                    printf("Restoring CASE session\n");
+                    printf("Removing suspended CASE session\n");
+                    err = FabricState.RemoveSessionKey(EchoClient.KeyId, DestNodeId);
+                    if (err != WEAVE_NO_ERROR)
+                    {
+                        printf("FabricState.RemoveSessionKey() failed: %s\n", ErrorStr(err));
+                    }
+                }
 
+                if (err == WEAVE_NO_ERROR)
+                {
+                    printf("Restoring suspended CASE session\n");
                     err = FabricState.RestoreSession(buf, serializedKeyLen);
                     if (err != WEAVE_NO_ERROR)
                     {