Fix linux build

do not build GenericNetworkCommissioningThreadDriver for linux
project-chip · Feb 2, 2022 · b1c93d9 · b1c93d9
1 parent 29ef531
commit b1c93d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
@@ -360,7 +360,7 @@ ThreadStackManager::AttachToThreadNetwork(ByteSpan netInfo,
 
 inline void ThreadStackManager::OnThreadAttachFinished(void)
 {
-    return static_cast<ImplClass *>(this)->_OnThreadAttachFinished();
+    static_cast<ImplClass *>(this)->_OnThreadAttachFinished();
 }
 
 inline CHIP_ERROR ThreadStackManager::StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback)

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -301,7 +301,8 @@ if (chip_device_platform != "none") {
       "PlatformEventSupport.cpp",
     ]
 
-    if (chip_enable_openthread) {
+    # Linux has his own NetworkCommissioningThreadDriver
+    if (chip_enable_openthread && chip_device_platform != "linux") {
       sources += [
         "OpenThread/GenericNetworkCommissioningThreadDriver.cpp",
         "OpenThread/GenericNetworkCommissioningThreadDriver.h",

diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -289,7 +289,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadEnabled(bool val)
     VerifyOrReturnError(mProxy, CHIP_ERROR_INCORRECT_STATE);
     if (val)
     {
-        openthread_io_openthread_border_router_call_attach(mProxy.get(), nullptr, _OnThreadAttachFinished, this);
+        openthread_io_openthread_border_router_call_attach(mProxy.get(), nullptr, _OnThreadBrAttachFinished, this);
     }
     else
     {
@@ -311,7 +311,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadEnabled(bool val)
     return CHIP_NO_ERROR;
 }
 
-void ThreadStackManagerImpl::_OnThreadAttachFinished(GObject * source_object, GAsyncResult * res, gpointer user_data)
+void ThreadStackManagerImpl::_OnThreadBrAttachFinished(GObject * source_object, GAsyncResult * res, gpointer user_data)
 {
     ThreadStackManagerImpl * this_ = reinterpret_cast<ThreadStackManagerImpl *>(user_data);
     std::unique_ptr<GVariant, GVariantDeleter> attachRes;
@@ -507,7 +507,7 @@ CHIP_ERROR ThreadStackManagerImpl::_JoinerStart()
     return CHIP_ERROR_NOT_IMPLEMENTED;
 }
 
-CHIP_ERROR ThreadStackManagerImpl::StartThreadScan(ThreadDriver::ScanCallback * callback)
+CHIP_ERROR ThreadStackManagerImpl::_StartThreadScan(ThreadDriver::ScanCallback * callback)
 {
     // There is another ongoing scan request, reject the new one.
     VerifyOrReturnError(mpScanCallback == nullptr, CHIP_ERROR_INCORRECT_STATE);
@@ -637,8 +637,8 @@ CHIP_ERROR ThreadStackManagerImpl::_WriteThreadNetworkDiagnosticAttributeToTlv(A
 }
 
 CHIP_ERROR
-ThreadStackManagerImpl::AttachToThreadNetwork(ByteSpan netInfo,
-                                              NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback)
+ThreadStackManagerImpl::_AttachToThreadNetwork(ByteSpan netInfo,
+                                               NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback)
 {
     // There is another ongoing connect request, reject the new one.
     VerifyOrReturnError(mpConnectCallback == nullptr, CHIP_ERROR_INCORRECT_STATE);

diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -65,10 +65,13 @@ class ThreadStackManagerImpl : public ThreadStackManager
 
     bool _IsThreadAttached();
 
-    CHIP_ERROR AttachToThreadNetwork(ByteSpan netInfo, NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback);
+    CHIP_ERROR _AttachToThreadNetwork(ByteSpan netInfo, NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback);
 
     CHIP_ERROR _SetThreadEnabled(bool val);
-    static void _OnThreadAttachFinished(GObject * source_object, GAsyncResult * res, gpointer user_data);
+
+    void _OnThreadAttachFinished(void);
+
+    static void _OnThreadBrAttachFinished(GObject * source_object, GAsyncResult * res, gpointer user_data);
 
     ConnectivityManager::ThreadDeviceType _GetThreadDeviceType();
 
@@ -100,7 +103,7 @@ class ThreadStackManagerImpl : public ThreadStackManager
 
     CHIP_ERROR _WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, app::AttributeValueEncoder & encoder);
 
-    CHIP_ERROR StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback);
+    CHIP_ERROR _StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback);
 
     ~ThreadStackManagerImpl() = default;
 
@@ -145,5 +148,10 @@ class ThreadStackManagerImpl : public ThreadStackManager
     bool mAttached;
 };
 
+inline void ThreadStackManagerImpl::_OnThreadAttachFinished(void)
+{
+    // stub for ThreadStackManager.h
+}
+
 } // namespace DeviceLayer
 } // namespace chip