Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Linux] Restore required signals removed in 96bf5df #37806

Merged
merged 1 commit into from
Feb 27, 2025
Merged

[Linux] Restore required signals removed in 96bf5df #37806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/platform/Linux/ConnectivityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,11 +529,12 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED;
ChipLogProgress(DeviceLayer, "wpa_supplicant: connected to wpa_supplicant interface proxy");

g_signal_connect(mWpaSupplicant.iface, "properties-changed",
G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * properties, ConnectivityManagerImpl * self) {
return self->_OnWpaPropertiesChanged(proxy, properties);
}),
this);
g_signal_connect(
mWpaSupplicant.iface, "g-properties-changed",
G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * properties, const char * const * invalidatedProps,
ConnectivityManagerImpl * self) { return self->_OnWpaPropertiesChanged(proxy, properties); }),
this);

g_signal_connect(mWpaSupplicant.iface, "scan-done",
G_CALLBACK(+[](WpaSupplicant1Interface * proxy, gboolean success, ConnectivityManagerImpl * self) {
return self->_OnWpaInterfaceScanDone(proxy, success);
Expand Down
10 changes: 10 additions & 0 deletions src/platform/Linux/dbus/wpa/DBusWpa.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ the wpa_supplicant integration with the Matter SDK.

<node>
<interface name="fi.w1.wpa_supplicant1">

<method name="CreateInterface">
<arg name="args" type="a{sv}" direction="in" />
<arg name="path" type="o" direction="out" />
Expand All @@ -38,5 +39,14 @@ the wpa_supplicant integration with the Matter SDK.
<arg name="ifname" type="s" direction="in" />
<arg name="path" type="o" direction="out" />
</method>

<signal name="InterfaceAdded">
<arg name="path" type="o" />
<arg name="properties" type="a{sv}" />
</signal>
<signal name="InterfaceRemoved">
<arg name="path" type="o" />
</signal>

</interface>
</node>
15 changes: 15 additions & 0 deletions src/platform/Linux/dbus/wpa/DBusWpaInterface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,20 @@ the wpa_supplicant integration with the Matter SDK.
<property name="AuthStatusCode" type="i" access="read" />
<property name="AssocStatusCode" type="i" access="read" />

<signal name="ScanDone">
<arg name="success" type="b" />
</signal>
<signal name="NanDiscoveryresult">
<arg name="result" type="b" />
<arg name="discov_info" type="a{sv}" />
</signal>
<signal name="NanReceive">
<arg name="nanrx" type="a{sv}" />
</signal>
<signal name="NanSubscribeterminated">
<arg name="term_subscribe_id" type="i" />
<arg name="reason" type="i" />
</signal>

</interface>
</node>
Loading