Merge 82232a7 into 5a0fa3d

src/app/CommandSender.cpp

@@ -30,7 +30,7 @@
 namespace chip {
 namespace app {
 
-CHIP_ERROR CommandSender::SendCommandRequest(NodeId aNodeId)
+CHIP_ERROR CommandSender::SendCommandRequest(NodeId aNodeId, Transport::AdminId aAdminId)
 {
  CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -42,7 +42,7 @@ CHIP_ERROR CommandSender::SendCommandRequest(NodeId aNodeId)
  // Create a new exchange context.
  // TODO: temprary create a SecureSessionHandle from node id, will be fix in PR 3602
  // TODO: Hard code keyID to 0 to unblock IM end-to-end test. Complete solution is tracked in issue:4451
- mpExchangeCtx = mpExchangeMgr->NewContext({ aNodeId, 0 }, this);
+ mpExchangeCtx = mpExchangeMgr->NewContext({ aNodeId, 0, aAdminId }, this);
  VerifyOrExit(mpExchangeCtx != nullptr, err = CHIP_ERROR_NO_MEMORY);
  mpExchangeCtx->SetResponseTimeout(CHIP_INVOKE_COMMAND_RSP_TIMEOUT);
 

src/app/CommandSender.h

@@ -50,7 +50,7 @@ namespace app {
 class DLL_EXPORT DLL_EXPORT CommandSender : public Command, public Messaging::ExchangeDelegate
 {
 public:
- CHIP_ERROR SendCommandRequest(NodeId aNodeId);
+ CHIP_ERROR SendCommandRequest(NodeId aNodeId, Transport::AdminId aAdminId);
 
  void OnMessageReceived(Messaging::ExchangeContext * apEc, const PacketHeader & aPacketHeader,
  const PayloadHeader & aPayloadHeader, System::PacketBufferHandle aPayload) override;

src/app/tests/integration/chip_im_initiator.cpp

@@ -120,7 +120,7 @@ CHIP_ERROR SendCommandRequest(void)
  err = gpCommandSender->AddCommand(CommandParams);
  SuccessOrExit(err);
 
- err = gpCommandSender->SendCommandRequest(chip::kTestDeviceNodeId);
+ err = gpCommandSender->SendCommandRequest(chip::kTestDeviceNodeId, gAdminId);
  SuccessOrExit(err);
 
  if (err == CHIP_NO_ERROR)

src/app/util/chip-message-send.cpp

@@ -75,7 +75,7 @@ EmberStatus chipSendUnicast(NodeId destination, EmberApsFrame * apsFrame, uint16
  buffer->SetDataLength(dataLength);
 
  // TODO: temprary create a handle from node id, will be fix in PR 3602
- CHIP_ERROR err = SessionManager().SendMessage({ destination, Transport::kAnyKeyId }, std::move(buffer));
+ CHIP_ERROR err = SessionManager().SendMessage({ destination, Transport::kAnyKeyId, 0}, std::move(buffer));
  if (err != CHIP_NO_ERROR)
  {
  // FIXME: Figure out better translations between our error types?

src/controller/CHIPDevice.cpp

@@ -130,7 +130,7 @@ CHIP_ERROR Device::SendCommands()
  bool loadedSecureSession = false;
  ReturnErrorOnFailure(LoadSecureSessionParametersIfNeeded(loadedSecureSession));
  VerifyOrReturnError(mCommandSender != nullptr, CHIP_ERROR_INCORRECT_STATE);
- return mCommandSender->SendCommandRequest(mDeviceId);
+ return mCommandSender->SendCommandRequest(mDeviceId, mAdminId);
 }
 
 CHIP_ERROR Device::SendMessage(System::PacketBufferHandle buffer)

src/messaging/tests/MessagingContext.cpp

@@ -55,13 +55,13 @@ CHIP_ERROR MessagingContext::Shutdown()
 Messaging::ExchangeContext * MessagingContext::NewExchangeToPeer(Messaging::ExchangeDelegate * delegate)
 {
  // TODO: temprary create a SecureSessionHandle from node id, will be fix in PR 3602
- return mExchangeManager.NewContext({ GetDestinationNodeId(), GetPeerKeyId() }, delegate);
+ return mExchangeManager.NewContext({ GetDestinationNodeId(), GetPeerKeyId(), GetAdminId() }, delegate);
 }
 
 Messaging::ExchangeContext * MessagingContext::NewExchangeToLocal(Messaging::ExchangeDelegate * delegate)
 {
  // TODO: temprary create a SecureSessionHandle from node id, will be fix in PR 3602
- return mExchangeManager.NewContext({ GetSourceNodeId(), GetLocalKeyId() }, delegate);
+ return mExchangeManager.NewContext({ GetSourceNodeId(), GetLocalKeyId(), GetAdminId() }, delegate);
 }
 
 } // namespace Test

src/messaging/tests/MessagingContext.h

@@ -56,6 +56,7 @@ class MessagingContext : public IOContext
 
  static constexpr uint16_t GetLocalKeyId() { return 1; }
  static constexpr uint16_t GetPeerKeyId() { return 2; }
+ static constexpr uint16_t GetAdminId() { return 0; }
 
  SecureSessionMgr & GetSecureSessionManager() { return mSecureSessionMgr; }
  Messaging::ExchangeManager & GetExchangeManager() { return mExchangeManager; }

src/messaging/tests/echo/echo_requester.cpp

@@ -232,7 +232,7 @@ int main(int argc, char * argv[])
  SuccessOrExit(err);
 
  // TODO: temprary create a SecureSessionHandle from node id to unblock end-to-end test. Complete solution is tracked in PR:4451
- err = gEchoClient.Init(&gExchangeManager, { chip::kTestDeviceNodeId, 0 });
+ err = gEchoClient.Init(&gExchangeManager, { chip::kTestDeviceNodeId, 0, gAdminId });
  SuccessOrExit(err);
 
  // Arrange to get a callback whenever an Echo Response is received.

src/transport/RendezvousSession.cpp

@@ -403,7 +403,8 @@ void RendezvousSession::InitPairingSessionHandle()
 {
  ReleasePairingSessionHandle();
  mPairingSessionHandle = chip::Platform::New<SecureSessionHandle>(mPairingSession.PeerConnection().GetPeerNodeId(),
- mPairingSession.PeerConnection().GetPeerKeyID());
+ mPairingSession.PeerConnection().GetPeerKeyID(),
+ mPairingSession.PeerConnection().GetAdminId());
 }
 
 void RendezvousSession::ReleasePairingSessionHandle()

src/transport/SecureSessionMgr.cpp

@@ -340,7 +340,7 @@ void SecureSessionMgr::HandleConnectionExpired(const Transport::PeerConnectionSt
 
  if (mCB != nullptr)
  {
- mCB->OnConnectionExpired({ state.GetPeerNodeId(), state.GetPeerKeyID() }, this);
+ mCB->OnConnectionExpired({ state.GetPeerNodeId(), state.GetPeerKeyID(), state.GetAdminId() }, this);
  }
 
  mTransportMgr->Disconnect(state.GetPeerAddress());

src/transport/SecureSessionMgr.h

@@ -49,7 +49,6 @@ class SecureSessionHandle
 {
 public:
  SecureSessionHandle() : mPeerNodeId(kAnyNodeId), mPeerKeyId(0), mAdmin(Transport::kUndefinedAdminId) {}
- SecureSessionHandle(NodeId peerNodeId, uint16_t peerKeyId) : mPeerNodeId(peerNodeId), mPeerKeyId(peerKeyId) {}
  SecureSessionHandle(NodeId peerNodeId, uint16_t peerKeyId, Transport::AdminId admin) :
  mPeerNodeId(peerNodeId), mPeerKeyId(peerKeyId), mAdmin(admin)
  {}