From 17021621d40803d2c4b7828474c0dd5971cd406a Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 2 Jul 2021 22:01:11 -0400 Subject: [PATCH] Fix admin id used in the peer-to-local session in messaging context. (#8049) Without this, trying to use NewExchangeToLocal to simulate an unsolicited incoming message fails to do the right thing because we end up not matching up the MRP ack to the message's exchange correctly, since the admin ids mismatch. --- src/messaging/tests/MessagingContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/messaging/tests/MessagingContext.cpp b/src/messaging/tests/MessagingContext.cpp index fdd44dfdf0225c..dd3cbbd1edab96 100644 --- a/src/messaging/tests/MessagingContext.cpp +++ b/src/messaging/tests/MessagingContext.cpp @@ -64,7 +64,7 @@ SecureSessionHandle MessagingContext::GetSessionLocalToPeer() SecureSessionHandle MessagingContext::GetSessionPeerToLocal() { // TODO: temporarily create a SecureSessionHandle from node id, will be fixed in PR 3602 - return { GetSourceNodeId(), GetLocalKeyId(), GetAdminId() }; + return { GetSourceNodeId(), GetLocalKeyId(), mDestAdminId }; } Messaging::ExchangeContext * MessagingContext::NewExchangeToPeer(Messaging::ExchangeDelegate * delegate)