From b44d9c760fda85797187f1d0e97be47ed0182ed6 Mon Sep 17 00:00:00 2001 From: Jose Blanquicet Date: Tue, 23 Aug 2016 14:16:00 +0200 Subject: [PATCH] D-Bus: Add ConfigFile parameter into the interface properties This patch aims to expose the configuration file path as an interface property, like is done with the driver and the bridge name. Doing so, higher layer programs become responsible to recreate interfaces with the correct configuration file path when programs need to remove them. Signed-off-by: Jose Blanquicet --- doc/dbus.doxygen | 5 +++++ wpa_supplicant/dbus/dbus_new.c | 5 +++++ wpa_supplicant/dbus/dbus_new_handlers.c | 24 ++++++++++++++++++++++++ wpa_supplicant/dbus/dbus_new_handlers.h | 1 + 4 files changed, 35 insertions(+) diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index e6c70f975..b0e67d45b 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -680,6 +680,11 @@ fi.w1.wpa_supplicant1.CreateInterface.

Name of driver used by the interface, e.g., nl80211.

+
  • +

    ConfigFile - s - (read)

    +

    Configuration file path. Returns an empty string if no configuration file is in use.

    +
    • +

  • CurrentBSS - o - (read)

    Path to D-Bus object representing BSS which wpa_supplicant is associated with, or "/" if is not associated at all.

    diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 6d73bbc72..27b3012ae 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -3158,6 +3158,11 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = { NULL, NULL }, + { "ConfigFile", WPAS_DBUS_NEW_IFACE_INTERFACE, "s", + wpas_dbus_getter_config_file, + NULL, + NULL + }, { "CurrentBSS", WPAS_DBUS_NEW_IFACE_INTERFACE, "o", wpas_dbus_getter_current_bss, NULL, diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index f185f2786..e11dd36ca 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -3239,6 +3239,30 @@ dbus_bool_t wpas_dbus_getter_bridge_ifname( } +/** + * wpas_dbus_getter_config_file - Get interface configuration file path + * @iter: Pointer to incoming dbus message iter + * @error: Location to store error on failure + * @user_data: Function specific data + * Returns: TRUE on success, FALSE on failure + * + * Getter for "ConfigFile" property. + */ +dbus_bool_t wpas_dbus_getter_config_file( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + char *confname = ""; + + if (wpa_s->confname) + confname = wpa_s->confname; + + return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, + &confname, error); +} + + /** * wpas_dbus_getter_bsss - Get array of BSSs objects * @iter: Pointer to incoming dbus message iter diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h index cd299c050..1d6235d6f 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.h +++ b/wpa_supplicant/dbus/dbus_new_handlers.h @@ -150,6 +150,7 @@ DECLARE_ACCESSOR(wpas_dbus_setter_scan_interval); DECLARE_ACCESSOR(wpas_dbus_getter_ifname); DECLARE_ACCESSOR(wpas_dbus_getter_driver); DECLARE_ACCESSOR(wpas_dbus_getter_bridge_ifname); +DECLARE_ACCESSOR(wpas_dbus_getter_config_file); DECLARE_ACCESSOR(wpas_dbus_getter_current_bss); DECLARE_ACCESSOR(wpas_dbus_getter_current_network); DECLARE_ACCESSOR(wpas_dbus_getter_current_auth_mode);