CHIPDevice: add access to ExchangeManager, fix SessionHandle getter (#…

…9734) * add access to ExchangeManager * fix other references of GetSecureSession()
project-chip · Sep 17, 2021 · c1c90fb · c1c90fb
1 parent 458fe47
commit c1c90fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/controller/CHIPDevice.cpp b/src/controller/CHIPDevice.cpp
@@ -743,7 +743,8 @@ CHIP_ERROR Device::SendSubscribeAttributeRequest(app::AttributePathParams aPath,
 
     // The application context is used to identify different requests from client application the type of it is intptr_t, here we
     // use the seqNum.
-    app::ReadPrepareParams params(GetSecureSession());
+    VerifyOrReturnError(GetSecureSession().HasValue(), CHIP_ERROR_INCORRECT_STATE);
+    app::ReadPrepareParams params(GetSecureSession().Value());
     params.mpAttributePathParamsList    = path;
     params.mAttributePathParamsListSize = 1;
     params.mMinIntervalFloorSeconds     = mMinIntervalFloorSeconds;

diff --git a/src/controller/CHIPDevice.h b/src/controller/CHIPDevice.h
@@ -374,7 +374,9 @@ class DLL_EXPORT Device : public Messaging::ExchangeDelegate, public SessionEsta
 
     bool MatchesSession(SessionHandle session) const { return mSecureSession.HasValue() && mSecureSession.Value() == session; }
 
-    SessionHandle GetSecureSession() const { return mSecureSession.Value(); }
+    chip::Optional<SessionHandle> GetSecureSession() const { return mSecureSession; }
+
+    Messaging::ExchangeManager * GetExchangeManager() const { return mExchangeMgr; }
 
     void SetAddress(const Inet::IPAddress & deviceAddr) { mDeviceAddress.SetIPAddress(deviceAddr); }