Fix build following conflict resolution

project-chip · Nov 1, 2021 · 4916686 · 4916686
1 parent 8d795cc
commit 4916686
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
@@ -401,25 +401,15 @@ void SessionManager::SecureUnicastMessageDispatch(const PacketHeader & packetHea
     VerifyOrExit(CHIP_NO_ERROR == SecureMessageCodec::Decrypt(session, payloadHeader, packetHeader, msg),
                  ChipLogError(Inet, "Secure transport received message, but failed to decode/authenticate it, discarding"));
 
-    err = state->GetSessionMessageCounter().GetPeerMessageCounter().Verify(packetHeader.GetMessageCounter());
+    err = session->GetSessionMessageCounter().GetPeerMessageCounter().Verify(packetHeader.GetMessageCounter());
     if (err == CHIP_ERROR_DUPLICATE_MESSAGE_RECEIVED)
     {
         isDuplicate = SessionManagerDelegate::DuplicateMessage::Yes;
         err         = CHIP_NO_ERROR;
     }
     if (err != CHIP_NO_ERROR)
     {
-        err = session->GetSessionMessageCounter().GetPeerMessageCounter().Verify(packetHeader.GetMessageCounter());
-        if (err == CHIP_ERROR_DUPLICATE_MESSAGE_RECEIVED)
-        {
-            isDuplicate = SessionManagerDelegate::DuplicateMessage::Yes;
-            err         = CHIP_NO_ERROR;
-        }
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Inet, "Message counter verify failed, err = %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        SuccessOrExit(err);
+        ChipLogError(Inet, "Message counter verify failed, err = %" CHIP_ERROR_FORMAT, err.Format());
     }
     SuccessOrExit(err);