Update bridge app to init network commissioning

This change modifies the linux bridge app to initialize the Network Commissioning cluster, so that the FeatureMap of the cluster is set to ethernet. In other Linux example apps, the FeatureMap of the Network Commissioning cluster is set to ethernet, but in the bridge app, the cluster is not initialized, so the FeatureMap is set to thread. The default value of the FeatureMap is thread in zap file of example apps. Signed-off-by: Youngho Yoon <[email protected]>
project-chip · Oct 6, 2023 · adb67d9 · adb67d9
1 parent ccdbfee
commit adb67d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
@@ -1024,6 +1024,7 @@ int main(int argc, char * argv[])
 
     // Run CHIP
 
+    ChipLinuxAppInitNetworkCommissioning();
     ApplicationInit();
     registerAttributeAccessOverride(&gPowerAttrAccess);
     chip::DeviceLayer::PlatformMgr().RunEventLoop();

diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
@@ -177,8 +177,9 @@ void EnableWiFiNetworkCommissioning(EndpointId endpoint)
     sWiFiNetworkCommissioningInstance.Value().Init();
 #endif // CHIP_APP_MAIN_HAS_WIFI_DRIVER
 }
+} // anonymous namespace
 
-void InitNetworkCommissioning()
+void ChipLinuxAppInitNetworkCommissioning()
 {
     if (sSecondaryNetworkCommissioningEndpoint.HasValue())
     {
@@ -232,7 +233,6 @@ void InitNetworkCommissioning()
 #endif // CHIP_APP_MAIN_HAS_ETHERNET_DRIVER
     }
 }
-} // anonymous namespace
 
 #if defined(ENABLE_CHIP_SHELL)
 using chip::Shell::Engine;
@@ -582,7 +582,7 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl)
 #endif // defined(ENABLE_CHIP_SHELL)
 #endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
 
-    InitNetworkCommissioning();
+    ChipLinuxAppInitNetworkCommissioning();
 
     ApplicationInit();
 

diff --git a/examples/platform/linux/AppMain.h b/examples/platform/linux/AppMain.h
@@ -88,6 +88,11 @@ class DefaultAppMainLoopImplementation : public AppMainLoopImplementation
  */
 void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl = nullptr);
 
+// This function supports initializing the Network Commissioning cluster for the
+// Linux app that does not call ChipLinuxAppMainLoop. This function should be
+// called before calling the ApplicationInit function.
+void ChipLinuxAppInitNetworkCommissioning();
+
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
 
 using chip::Controller::DeviceCommissioner;