commit af77670d3f06b3ee747e205a02b264a8e5c02f0f
author Robert Szewczyk <szewczyk@google.com> Tue Nov 03 23:07:41 2020 -0800
committer GitHub <noreply@github.com> Tue Nov 03 23:07:41 2020 -0800
tree 67dcd0d4308a4fa7347a862863a99798439b7d5d
parent 3eb17ba38776d8d4880661086c0e540af9db6792
parent 0cda126fb4698bb6b517bb37dbd9132f3a98e86a

Merge pull request #627 from openweave/bug/TunnelCASEFix

Fix for resumption message id valid tag.

src/lib/core/WeaveFabricState.cpp

diff --git a/src/lib/core/WeaveFabricState.cpp b/src/lib/core/WeaveFabricState.cpp
index fa00cef..4ead562 100644
--- a/src/lib/core/WeaveFabricState.cpp
+++ b/src/lib/core/WeaveFabricState.cpp
@@ -735,15 +735,15 @@
             ExitNow(err = WEAVE_ERROR_UNSUPPORTED_ENCRYPTION_TYPE);
         }
 
+        err = writer.PutBoolean(ContextTag(kTag_SerializedSession_AreResumptionMsgIdsValid),
+                         sessionKey->AreResumptionMsgIdsValid());
+        SuccessOrExit(err);
+
         if (sessionKey->AreResumptionMsgIdsValid())
         {
             // Generate a new set of resumption msg ids
             sessionKey->ComputeNextResumptionMsgIds();
 
-            err = writer.PutBoolean(ContextTag(kTag_SerializedSession_AreResumptionMsgIdsValid),
-                             sessionKey->AreResumptionMsgIdsValid());
-            SuccessOrExit(err);
-
             err = writer.Put(ContextTag(kTag_SerializedSession_ResumptionSendMessageId),
                              sessionKey->ResumptionSendMsgId);
             SuccessOrExit(err);