Skip to content

Commit 8c8c7d3

Browse files
arkqrestyled-commits
authored and
ratgr
committed
[Linux] Optimize generated glib D-Bus integration stubs (project-chip#37492)
* Unify D-Bus interface include files naming * Update code after D-Bus namespace change * Optimize OpenThread D-Bus API stub by removing non-used props This optimization saves: .text -> 16980 bytes .data -> 4720 bytes * Simplify namespace for wpa_supplicant D-Bus codegen API * Optimize D-Bus API stub for wpa_supplicant This optimization saves: .text -> 69969 bytes .data -> 16384 bytes * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent e68b234 commit 8c8c7d3

30 files changed

+395
-906
lines changed

‎src/controller/python/chip/ble/LinuxImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <platform/Linux/bluez/AdapterIterator.h>
2828
#include <platform/Linux/bluez/BluezObjectManager.h>
2929
#include <platform/Linux/bluez/ChipDeviceScanner.h>
30-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
30+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
3131
#include <platform/PlatformManager.h>
3232
#include <system/SystemClock.h>
3333
#include <system/SystemLayer.h>

‎src/platform/Linux/ConnectivityManagerImpl.cpp

+88-89
Large diffs are not rendered by default.

‎src/platform/Linux/ConnectivityManagerImpl.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ struct GDBusWpaSupplicant
8686
SCANNING,
8787
};
8888

89-
WpaState state = WpaState::INIT;
90-
WpaScanningState scanState = WpaScanningState::IDLE;
91-
WpaFiW1Wpa_supplicant1 * proxy = nullptr;
92-
WpaFiW1Wpa_supplicant1Interface * iface = nullptr;
93-
WpaFiW1Wpa_supplicant1BSS * bss = nullptr;
94-
gchar * interfacePath = nullptr;
95-
gchar * networkPath = nullptr;
89+
WpaState state = WpaState::INIT;
90+
WpaScanningState scanState = WpaScanningState::IDLE;
91+
WpaSupplicant1 * proxy = nullptr;
92+
WpaSupplicant1Interface * iface = nullptr;
93+
WpaSupplicant1BSS * bss = nullptr;
94+
gchar * interfacePath = nullptr;
95+
gchar * networkPath = nullptr;
9696
};
9797
#endif
9898

@@ -222,10 +222,10 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
222222
CHIP_ERROR StopAutoScan();
223223

224224
void _OnWpaProxyReady(GObject * sourceObject, GAsyncResult * res);
225-
void _OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties);
226-
void _OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties);
227-
void _OnWpaPropertiesChanged(WpaFiW1Wpa_supplicant1Interface * proxy, GVariant * properties);
228-
void _OnWpaInterfaceScanDone(WpaFiW1Wpa_supplicant1Interface * proxy, gboolean success);
225+
void _OnWpaInterfaceRemoved(WpaSupplicant1 * proxy, const char * path, GVariant * properties);
226+
void _OnWpaInterfaceAdded(WpaSupplicant1 * proxy, const char * path, GVariant * properties);
227+
void _OnWpaPropertiesChanged(WpaSupplicant1Interface * proxy, GVariant * properties);
228+
void _OnWpaInterfaceScanDone(WpaSupplicant1Interface * proxy, gboolean success);
229229
void _OnWpaInterfaceReady(GObject * sourceObject, GAsyncResult * res);
230230
void _OnWpaInterfaceProxyReady(GObject * sourceObject, GAsyncResult * res);
231231
void _OnWpaBssProxyReady(GObject * sourceObject, GAsyncResult * res);

‎src/platform/Linux/ThreadStackManagerImpl.cpp

+18-18
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace {
5151

5252
struct SetActiveDatasetContext
5353
{
54-
OpenthreadIoOpenthreadBorderRouter * proxy;
54+
OpenthreadBorderRouter * proxy;
5555
ByteSpan netInfo;
5656
};
5757

@@ -67,7 +67,7 @@ CHIP_ERROR GLibMatterContextSetActiveDataset(SetActiveDatasetContext * context)
6767
GAutoPtr<GVariant> value(g_variant_new_from_bytes(G_VARIANT_TYPE_BYTESTRING, bytes.release(), true));
6868
if (!value)
6969
return CHIP_ERROR_NO_MEMORY;
70-
openthread_io_openthread_border_router_set_active_dataset_tlvs(context->proxy, value.release());
70+
openthread_border_router_set_active_dataset_tlvs(context->proxy, value.release());
7171
return CHIP_NO_ERROR;
7272
}
7373

@@ -82,9 +82,9 @@ CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextInitThreadStack(ThreadStackM
8282
VerifyOrDie(g_main_context_get_thread_default() != nullptr);
8383

8484
GAutoPtr<GError> err;
85-
self->mProxy.reset(openthread_io_openthread_border_router_proxy_new_for_bus_sync(
86-
G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kDBusOpenThreadService, kDBusOpenThreadObjectPath, nullptr,
87-
&err.GetReceiver()));
85+
self->mProxy.reset(openthread_border_router_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
86+
kDBusOpenThreadService, kDBusOpenThreadObjectPath, nullptr,
87+
&err.GetReceiver()));
8888
VerifyOrReturnError(
8989
self->mProxy != nullptr, CHIP_ERROR_INTERNAL,
9090
ChipLogError(DeviceLayer, "openthread: failed to create openthread dbus proxy %s", err ? err->message : "unknown error"));
@@ -103,7 +103,7 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
103103

104104
// If get property is called inside dbus thread (we are going to make it so), XXX_get_XXX can be used instead of XXX_dup_XXX
105105
// which is a little bit faster and the returned object doesn't need to be freed. Same for all following get properties.
106-
GAutoPtr<char> role(openthread_io_openthread_border_router_dup_device_role(mProxy.get()));
106+
GAutoPtr<char> role(openthread_border_router_dup_device_role(mProxy.get()));
107107
if (role)
108108
{
109109
ThreadDeviceRoleChangedHandler(role.get());
@@ -112,7 +112,7 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
112112
return CHIP_NO_ERROR;
113113
}
114114

115-
void ThreadStackManagerImpl::OnDbusPropertiesChanged(OpenthreadIoOpenthreadBorderRouter * proxy, GVariant * changed_properties,
115+
void ThreadStackManagerImpl::OnDbusPropertiesChanged(OpenthreadBorderRouter * proxy, GVariant * changed_properties,
116116
const gchar * const * invalidated_properties, gpointer user_data)
117117
{
118118
ThreadStackManagerImpl * me = reinterpret_cast<ThreadStackManagerImpl *>(user_data);
@@ -182,7 +182,7 @@ bool ThreadStackManagerImpl::_HaveRouteToAddress(const Inet::IPAddress & destAdd
182182
return true;
183183
}
184184

185-
GAutoPtr<GVariant> routes(openthread_io_openthread_border_router_dup_external_routes(mProxy.get()));
185+
GAutoPtr<GVariant> routes(openthread_border_router_dup_external_routes(mProxy.get()));
186186
if (!routes)
187187
return false;
188188

@@ -368,7 +368,7 @@ bool ThreadStackManagerImpl::_IsThreadAttached() const
368368
CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextCallAttach(ThreadStackManagerImpl * self)
369369
{
370370
VerifyOrDie(g_main_context_get_thread_default() != nullptr);
371-
openthread_io_openthread_border_router_call_attach(self->mProxy.get(), nullptr, _OnThreadBrAttachFinished, self);
371+
openthread_border_router_call_attach(self->mProxy.get(), nullptr, _OnThreadBrAttachFinished, self);
372372
return CHIP_NO_ERROR;
373373
}
374374

@@ -383,7 +383,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadEnabled(bool val)
383383
else
384384
{
385385
GAutoPtr<GError> err;
386-
gboolean result = openthread_io_openthread_border_router_call_reset_sync(mProxy.get(), nullptr, &err.GetReceiver());
386+
gboolean result = openthread_border_router_call_reset_sync(mProxy.get(), nullptr, &err.GetReceiver());
387387
if (err)
388388
{
389389
ChipLogError(DeviceLayer, "openthread: _SetThreadEnabled calling %s failed: %s", "Reset", err->message);
@@ -405,7 +405,7 @@ void ThreadStackManagerImpl::_OnThreadBrAttachFinished(GObject * source_object,
405405
GAutoPtr<GVariant> attachRes;
406406
GAutoPtr<GError> err;
407407
{
408-
gboolean result = openthread_io_openthread_border_router_call_attach_finish(this_->mProxy.get(), res, &err.GetReceiver());
408+
gboolean result = openthread_border_router_call_attach_finish(this_->mProxy.get(), res, &err.GetReceiver());
409409
if (!result)
410410
{
411411
ChipLogError(DeviceLayer, "Failed to perform finish Thread network scan: %s",
@@ -442,7 +442,7 @@ ConnectivityManager::ThreadDeviceType ThreadStackManagerImpl::_GetThreadDeviceTy
442442
return ConnectivityManager::ThreadDeviceType::kThreadDeviceType_NotSupported;
443443
}
444444

445-
GAutoPtr<char> role(openthread_io_openthread_border_router_dup_device_role(mProxy.get()));
445+
GAutoPtr<char> role(openthread_border_router_dup_device_role(mProxy.get()));
446446
if (!role)
447447
return ConnectivityManager::ThreadDeviceType::kThreadDeviceType_NotSupported;
448448
if (strcmp(role.get(), kOpenthreadDeviceRoleDetached) == 0 || strcmp(role.get(), kOpenthreadDeviceRoleDisabled) == 0)
@@ -451,7 +451,7 @@ ConnectivityManager::ThreadDeviceType ThreadStackManagerImpl::_GetThreadDeviceTy
451451
}
452452
if (strcmp(role.get(), kOpenthreadDeviceRoleChild) == 0)
453453
{
454-
GAutoPtr<GVariant> linkMode(openthread_io_openthread_border_router_dup_link_mode(mProxy.get()));
454+
GAutoPtr<GVariant> linkMode(openthread_border_router_dup_link_mode(mProxy.get()));
455455
if (!linkMode)
456456
return ConnectivityManager::ThreadDeviceType::kThreadDeviceType_NotSupported;
457457
gboolean rx_on_when_idle;
@@ -499,7 +499,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadDeviceType(ConnectivityManager::Thr
499499
GAutoPtr<GVariant> linkMode(g_variant_new("(bbb)", rx_on_when_idle, device_type, network_data));
500500
if (!linkMode)
501501
return CHIP_ERROR_NO_MEMORY;
502-
openthread_io_openthread_border_router_set_link_mode(mProxy.get(), linkMode.release());
502+
openthread_border_router_set_link_mode(mProxy.get(), linkMode.release());
503503
}
504504

505505
return CHIP_NO_ERROR;
@@ -546,7 +546,7 @@ CHIP_ERROR ThreadStackManagerImpl::_GetAndLogThreadTopologyFull()
546546
CHIP_ERROR ThreadStackManagerImpl::_GetPrimary802154MACAddress(uint8_t * buf)
547547
{
548548
VerifyOrReturnError(mProxy, CHIP_ERROR_INCORRECT_STATE);
549-
guint64 extAddr = openthread_io_openthread_border_router_get_extended_address(mProxy.get());
549+
guint64 extAddr = openthread_border_router_get_extended_address(mProxy.get());
550550

551551
for (size_t i = 0; i < sizeof(extAddr); i++)
552552
{
@@ -579,7 +579,7 @@ CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
579579
CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextCallScan(ThreadStackManagerImpl * self)
580580
{
581581
VerifyOrDie(g_main_context_get_thread_default() != nullptr);
582-
openthread_io_openthread_border_router_call_scan(self->mProxy.get(), nullptr, _OnNetworkScanFinished, self);
582+
openthread_border_router_call_scan(self->mProxy.get(), nullptr, _OnNetworkScanFinished, self);
583583
return CHIP_NO_ERROR;
584584
}
585585

@@ -604,8 +604,8 @@ void ThreadStackManagerImpl::_OnNetworkScanFinished(GAsyncResult * res)
604604
GAutoPtr<GVariant> scan_result;
605605
GAutoPtr<GError> err;
606606
{
607-
gboolean result = openthread_io_openthread_border_router_call_scan_finish(mProxy.get(), &scan_result.GetReceiver(), res,
608-
&err.GetReceiver());
607+
gboolean result =
608+
openthread_border_router_call_scan_finish(mProxy.get(), &scan_result.GetReceiver(), res, &err.GetReceiver());
609609
if (!result)
610610
{
611611
ChipLogError(DeviceLayer, "Failed to perform finish Thread network scan: %s",

‎src/platform/Linux/ThreadStackManagerImpl.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
#include <app/icd/server/ICDServerConfig.h>
2424
#include <lib/support/ThreadOperationalDataset.h>
2525
#include <platform/GLibTypeDeleter.h>
26-
#include <platform/Linux/dbus/openthread/introspect.h>
26+
#include <platform/Linux/dbus/openthread/DBusOpenthread.h>
2727
#include <platform/NetworkCommissioning.h>
2828
#include <platform/internal/CHIPDeviceLayerInternal.h>
2929
#include <platform/internal/DeviceNetworkInfo.h>
3030

3131
namespace chip {
3232

3333
template <>
34-
struct GAutoPtrDeleter<OpenthreadIoOpenthreadBorderRouter>
34+
struct GAutoPtrDeleter<OpenthreadBorderRouter>
3535
{
3636
using deleter = GObjectDeleter;
3737
};
@@ -149,12 +149,12 @@ class ThreadStackManagerImpl : public ThreadStackManager
149149
uint8_t lqi;
150150
};
151151

152-
GAutoPtr<OpenthreadIoOpenthreadBorderRouter> mProxy;
152+
GAutoPtr<OpenthreadBorderRouter> mProxy;
153153

154154
static CHIP_ERROR GLibMatterContextInitThreadStack(ThreadStackManagerImpl * self);
155155
static CHIP_ERROR GLibMatterContextCallAttach(ThreadStackManagerImpl * self);
156156
static CHIP_ERROR GLibMatterContextCallScan(ThreadStackManagerImpl * self);
157-
static void OnDbusPropertiesChanged(OpenthreadIoOpenthreadBorderRouter * proxy, GVariant * changed_properties,
157+
static void OnDbusPropertiesChanged(OpenthreadBorderRouter * proxy, GVariant * changed_properties,
158158
const gchar * const * invalidated_properties, gpointer user_data);
159159
void ThreadDeviceRoleChangedHandler(const gchar * role);
160160

‎src/platform/Linux/bluez/AdapterIterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <lib/support/CodeUtils.h>
2626
#include <lib/support/logging/CHIPLogging.h>
2727
#include <platform/GLibTypeDeleter.h>
28-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
28+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
2929

3030
#include "BluezObjectIterator.h"
3131
#include "BluezObjectList.h"

‎src/platform/Linux/bluez/AdapterIterator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <cstdint>
2121

2222
#include <platform/GLibTypeDeleter.h>
23-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
23+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
2424

2525
#include "BluezObjectIterator.h"
2626
#include "BluezObjectManager.h"

‎src/platform/Linux/bluez/BluezAdvertisement.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <lib/support/logging/CHIPLogging.h>
3030
#include <platform/ConfigurationManager.h>
3131
#include <platform/GLibTypeDeleter.h>
32-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
32+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
3333
#include <platform/PlatformManager.h>
3434

3535
#include "BluezEndpoint.h"

‎src/platform/Linux/bluez/BluezAdvertisement.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <ble/Ble.h>
2828
#include <lib/core/CHIPError.h>
2929
#include <platform/GLibTypeDeleter.h>
30-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
30+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
3131

3232
#include "BluezEndpoint.h"
3333
#include "Types.h"

‎src/platform/Linux/bluez/BluezConnection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <lib/support/CodeUtils.h>
3030
#include <platform/ConnectivityManager.h>
3131
#include <platform/GLibTypeDeleter.h>
32-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
32+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
3333
#include <platform/PlatformManager.h>
3434
#include <platform/internal/BLEManager.h>
3535
#include <system/SystemPacketBuffer.h>

‎src/platform/Linux/bluez/BluezConnection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <lib/core/CHIPError.h>
2727
#include <platform/GLibTypeDeleter.h>
28-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
28+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
2929
#include <system/SystemPacketBuffer.h>
3030

3131
#include "Types.h"

‎src/platform/Linux/bluez/BluezEndpoint.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#include <platform/ConnectivityManager.h>
6767
#include <platform/DeviceInstanceInfoProvider.h>
6868
#include <platform/GLibTypeDeleter.h>
69-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
69+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
7070
#include <platform/PlatformManager.h>
7171
#include <platform/internal/BLEManager.h>
7272
#include <setup_payload/AdditionalDataPayloadGenerator.h>

‎src/platform/Linux/bluez/BluezEndpoint.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#include <ble/Ble.h>
5656
#include <lib/core/CHIPError.h>
5757
#include <platform/GLibTypeDeleter.h>
58-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
58+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
5959

6060
#include "BluezConnection.h"
6161
#include "BluezObjectManager.h"

‎src/platform/Linux/bluez/BluezObjectIterator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <glib.h>
2323

2424
#include <platform/CHIPDeviceConfig.h>
25-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
25+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
2626

2727
namespace chip {
2828
namespace DeviceLayer {

‎src/platform/Linux/bluez/BluezObjectList.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <lib/support/logging/CHIPLogging.h>
2323
#include <platform/CHIPDeviceConfig.h>
24-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
24+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
2525

2626
#include "BluezObjectIterator.h"
2727

‎src/platform/Linux/bluez/BluezObjectManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <lib/support/logging/CHIPLogging.h>
3232
#include <platform/ConfigurationManager.h>
3333
#include <platform/GLibTypeDeleter.h>
34-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
34+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
3535
#include <platform/PlatformManager.h>
3636

3737
#include "Types.h"

‎src/platform/Linux/bluez/ChipDeviceScanner.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <ble/Ble.h>
2525
#include <lib/core/CHIPError.h>
2626
#include <platform/GLibTypeDeleter.h>
27-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
27+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
2828
#include <system/SystemLayer.h>
2929

3030
#include "BluezObjectManager.h"

‎src/platform/Linux/bluez/Types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
5252

53-
#include <platform/Linux/dbus/bluez/DbusBluez.h>
53+
#include <platform/Linux/dbus/bluez/DBusBluez.h>
5454

5555
namespace chip {
5656

‎src/platform/Linux/dbus/bluez/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import("//build_overrides/chip.gni")
1717
import("${chip_root}/build/chip/linux/gdbus_library.gni")
1818

1919
gdbus_library("bluez") {
20-
sources = [ "DbusBluez.xml" ]
20+
sources = [ "DBusBluez.xml" ]
2121

2222
c_namespace = "Bluez"
2323
interface_prefix = "org.bluez"

‎src/platform/Linux/dbus/bluez/DbusBluez.xml ‎src/platform/Linux/dbus/bluez/DBusBluez.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<!--
32
# Copyright (c) 2020 Project CHIP Authors
43
#
@@ -21,8 +20,10 @@
2120
# relevant for the Matter GATT service and advertisement management. Also,
2221
# some properties and methods not used by Matter are omitted in order to
2322
# decrease the size of Matter SDK library.
24-
#
2523
-->
24+
<!DOCTYPE node PUBLIC
25+
"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
26+
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2627

2728
<node>
2829

@@ -158,9 +159,9 @@
158159
<property name="Discoverable" type="b" access="read"/>
159160
<!--
160161
Do not expose discoverable timeout property, so BlueZ will set it
161-
internally to zero, effectively disabling the timeout. Becase of BlueZ
162+
internally to zero, effectively disabling the timeout. Because of BlueZ
162163
bug, which is not fixed until BlueZ 5.73, exposing discoverable timeout
163-
as zero will timout the advertisement immediately.
164+
as zero will timeout the advertisement immediately.
164165
165166
<property name="DiscoverableTimeout" type="q" access="read"/>
166167
-->

‎src/platform/Linux/dbus/openthread/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import("//build_overrides/chip.gni")
1717
import("${chip_root}/build/chip/linux/gdbus_library.gni")
1818

1919
gdbus_library("openthread") {
20-
sources = [ "introspect.xml" ]
20+
sources = [ "DBusOpenthread.xml" ]
2121

2222
c_namespace = "Openthread"
23+
interface_prefix = "io.openthread"
2324
c_generate_object_manager = false
2425
dbus_out_dir = "platform/Linux/dbus/openthread"
2526
}

0 commit comments

Comments
 (0)