Skip to content

Commit e34015c

Browse files
authored
[Linux] Restore required signals removed in 96bf5df (#37806)
1 parent 78e5932 commit e34015c

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

src/platform/Linux/ConnectivityManagerImpl.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,12 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
529529
mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED;
530530
ChipLogProgress(DeviceLayer, "wpa_supplicant: connected to wpa_supplicant interface proxy");
531531

532-
g_signal_connect(mWpaSupplicant.iface, "properties-changed",
533-
G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * properties, ConnectivityManagerImpl * self) {
534-
return self->_OnWpaPropertiesChanged(proxy, properties);
535-
}),
536-
this);
532+
g_signal_connect(
533+
mWpaSupplicant.iface, "g-properties-changed",
534+
G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * properties, const char * const * invalidatedProps,
535+
ConnectivityManagerImpl * self) { return self->_OnWpaPropertiesChanged(proxy, properties); }),
536+
this);
537+
537538
g_signal_connect(mWpaSupplicant.iface, "scan-done",
538539
G_CALLBACK(+[](WpaSupplicant1Interface * proxy, gboolean success, ConnectivityManagerImpl * self) {
539540
return self->_OnWpaInterfaceScanDone(proxy, success);

src/platform/Linux/dbus/wpa/DBusWpa.xml

+10
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ the wpa_supplicant integration with the Matter SDK.
3030

3131
<node>
3232
<interface name="fi.w1.wpa_supplicant1">
33+
3334
<method name="CreateInterface">
3435
<arg name="args" type="a{sv}" direction="in" />
3536
<arg name="path" type="o" direction="out" />
@@ -38,5 +39,14 @@ the wpa_supplicant integration with the Matter SDK.
3839
<arg name="ifname" type="s" direction="in" />
3940
<arg name="path" type="o" direction="out" />
4041
</method>
42+
43+
<signal name="InterfaceAdded">
44+
<arg name="path" type="o" />
45+
<arg name="properties" type="a{sv}" />
46+
</signal>
47+
<signal name="InterfaceRemoved">
48+
<arg name="path" type="o" />
49+
</signal>
50+
4151
</interface>
4252
</node>

src/platform/Linux/dbus/wpa/DBusWpaInterface.xml

+15
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,20 @@ the wpa_supplicant integration with the Matter SDK.
101101
<property name="AuthStatusCode" type="i" access="read" />
102102
<property name="AssocStatusCode" type="i" access="read" />
103103

104+
<signal name="ScanDone">
105+
<arg name="success" type="b" />
106+
</signal>
107+
<signal name="NanDiscoveryresult">
108+
<arg name="result" type="b" />
109+
<arg name="discov_info" type="a{sv}" />
110+
</signal>
111+
<signal name="NanReceive">
112+
<arg name="nanrx" type="a{sv}" />
113+
</signal>
114+
<signal name="NanSubscribeterminated">
115+
<arg name="term_subscribe_id" type="i" />
116+
<arg name="reason" type="i" />
117+
</signal>
118+
104119
</interface>
105120
</node>

0 commit comments

Comments
 (0)