dbus: Fix SignalChange property

SignalChange should be defined as a property of an interface.
Previously, it was incorrectly defined as a property of P2P peers.

Fixes: 7a7ce957460a ("dbus: Emit more information over D-Bus")
Signed-off-by: David Ruth <druth@chromium.org>

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index 9f72614d42604a2fe989af9f3c3cbc932a718057..070210945dcbcfd002d7df6e6e8aa571dd355ee6 100644 (file)
--- a/doc/dbus.doxygen
+++ b/doc/dbus.doxygen
@@ -1147,6 +1147,12 @@ fi.w1.wpa_supplicant1.CreateInterface.
       <li>
        <h3>MACAddress - ay - (read)</h3>
        <p>MAC address of the interface</p>
+      </li>
+
+      <li>
+       <h3>SignalChange - "a{sv}" - (read)</h3>
+       <p>Signal and quality properties of the interface</p>
+      </li>
     </ul>
 
 \subsection dbus_interface_signals Signals

diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index ef70769344d6f4c0bc87e438eab69a594e99b9a8..76e42ffbcc77b7e6d217c15f40c920055050cd41 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -4023,6 +4023,11 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
          NULL,
          NULL,
        },
+       { "SignalChange", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{sv}",
+         wpas_dbus_getter_signal_change,
+         NULL,
+         NULL
+       },
        { NULL, NULL, NULL, NULL, NULL, NULL }
 };
 
@@ -4620,11 +4625,6 @@ static const struct wpa_dbus_property_desc wpas_dbus_p2p_peer_properties[] = {
          NULL,
          NULL
        },
-       { "SignalChange", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{sv}",
-         wpas_dbus_getter_signal_change,
-         NULL,
-         NULL
-       },
        { NULL, NULL, NULL, NULL, NULL, NULL }
 };