fix pairing issues

project-chip · Dec 10, 2021 · b6d0022 · b6d0022
1 parent d0b3ddb
commit b6d0022
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/src/app/CASESessionManager.cpp b/src/app/CASESessionManager.cpp
@@ -17,9 +17,23 @@
  */
 
 #include <app/CASESessionManager.h>
+#include <platform/CHIPDeviceLayer.h>
 
 namespace chip {
 
+CASESessionManager::CASESessionManager(CASESessionManagerConfig & params)
+{
+    VerifyOrDie(params.sessionInitParams.Validate() == CHIP_NO_ERROR);
+
+    if (params.dnsResolver == nullptr)
+    {
+        mDNSResolver.Init(DeviceLayer::UDPEndPointManager());
+        params.dnsResolver = &mDNSResolver;
+        params.dnsResolver->SetResolverDelegate(this);
+    }
+    mConfig = params;
+}
+
 CHIP_ERROR CASESessionManager::FindOrEstablishSession(FabricInfo * fabric, NodeId nodeId,
                                                       Callback::Callback<OnDeviceConnected> * onConnection,
                                                       Callback::Callback<OnDeviceConnectionFailure> * onFailure)

diff --git a/src/app/CASESessionManager.h b/src/app/CASESessionManager.h
@@ -52,15 +52,7 @@ class CASESessionManager : public SessionReleaseDelegate, public Dnssd::Resolver
 public:
     CASESessionManager() = delete;
 
-    CASESessionManager(CASESessionManagerConfig & params)
-    {
-        VerifyOrDie(params.sessionInitParams.Validate() == CHIP_NO_ERROR);
-
-        mConfig = params;
-
-        // TODO: Revisit who should be set as the resolver delegate
-        params.dnsResolver->SetResolverDelegate(this);
-    }
+    CASESessionManager(CASESessionManagerConfig & params);
 
     virtual ~CASESessionManager() {}
 
@@ -109,6 +101,7 @@ class CASESessionManager : public SessionReleaseDelegate, public Dnssd::Resolver
     void ReleaseSession(OperationalDeviceProxy * device);
 
     CASESessionManagerConfig mConfig;
+    Dnssd::ResolverProxy mDNSResolver;
 };
 
 } // namespace chip
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -233,7 +233,6 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
 
 CHIP_ERROR Server::InitCASESessionManager()
 {
-    ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
     DeviceProxyInitParams initParams = {
         .sessionManager = &mSessions,
         .exchangeMgr    = &mExchangeMgr,
@@ -246,7 +245,7 @@ CHIP_ERROR Server::InitCASESessionManager()
         .sessionInitParams = initParams,
         .dnsCache          = nullptr,
         .devicePool        = &mDevicePool,
-        .dnsResolver       = &mDNSResolver,
+        .dnsResolver       = nullptr,
     };
     mCASESessionManager = new (&mCASESessionManagerStorage) CASESessionManager(sessionManagerConfig);
 

diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -147,7 +147,6 @@ class Server
     CASESessionManager * mCASESessionManager;
     CASEClientPool<kCASEClientPoolSize> mCASEClientPool;
     OperationalDeviceProxyPool<kOperationalDevicePoolSize> mDevicePool;
-    Dnssd::ResolverProxy mDNSResolver;
 
     Messaging::ExchangeManager mExchangeMgr;
     FabricTable mFabrics;