Add shutdown calls

mkardous-silabs · Nov 23, 2023 · 06b663a · 06b663a
1 parent 49113d4
commit 06b663a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
@@ -1936,7 +1936,7 @@ bool InteractionModelEngine::HasSubscriptionsToResume()
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-void InteractionModelEngine::SetICDData(ICDData & data)
+void InteractionModelEngine::SetICDData(ICDData * data)
 {
     ReadHandler::SetICDData(data);
 }

diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
@@ -311,7 +311,7 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
     CHIP_ERROR ResumeSubscriptions();
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    void SetICDData(ICDData & data);
+    void SetICDData(ICDData * data);
 #endif
 
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST

diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h
@@ -258,7 +258,7 @@ class ReadHandler : public Messaging::ExchangeDelegate
     }
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    static void SetICDData(ICDData & icdData) { mICDData = &icdData; }
+    static void SetICDData(ICDData * icdData) { mICDData = icdData; }
 #endif
 
 private:

diff --git a/src/app/server/Dnssd.h b/src/app/server/Dnssd.h
@@ -94,7 +94,7 @@ class DLL_EXPORT DnssdServer : public ICDStateObserver
     template <class AdvertisingParams>
     void AddICDKeyToAdvertisement(AdvertisingParams & advParams);
 
-    void SetICDManager(ICDManager & manager) { mICDManager = &manager; };
+    void SetICDManager(ICDManager * manager) { mICDManager = manager; };
 #endif
     /// Start operational advertising
     CHIP_ERROR AdvertiseOperational();

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -281,7 +281,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     app::DnssdServer::Instance().SetInterfaceId(mInterfaceId);
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    app::DnssdServer::Instance().SetICDManager(mICDManager);
+    app::DnssdServer::Instance().SetICDManager(&mICDManager);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     if (GetFabricTable().FabricCount() != 0)
@@ -333,7 +333,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     SuccessOrExit(err);
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    chip::app::InteractionModelEngine::GetInstance()->SetICDData(mICDData);
+    chip::app::InteractionModelEngine::GetInstance()->SetICDData(&mICDData);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     // This code is necessary to restart listening to existing groups after a reboot
@@ -503,10 +503,16 @@ void Server::Shutdown()
     PlatformMgr().RemoveEventHandler(OnPlatformEventWrapper, 0);
     mCASEServer.Shutdown();
     mCASESessionManager.Shutdown();
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    app::DnssdServer::Instance().SetICDManager(nullptr);
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     app::DnssdServer::Instance().SetCommissioningModeProvider(nullptr);
     chip::Dnssd::ServiceAdvertiser::Instance().Shutdown();
 
     chip::Dnssd::Resolver::Instance().Shutdown();
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    chip::app::InteractionModelEngine::GetInstance()->SetICDData(nullptr);
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     chip::app::InteractionModelEngine::GetInstance()->Shutdown();
     mCommissioningWindowManager.Shutdown();
     mMessageCounterManager.Shutdown();