Revert "D-Bus: Implement Pmf property"

This reverts commit adf8f45f8af27a9ac9429ecde81776b19b6f9224.

It is basically all wrong. The Pmf property did exist, with a signature of
"s" as documented in doc/dbus.doxygen. It was synthesized from
global_fields[].

The patch added a duplicate one, with a signature of "u", in violation
of D-Bus specification and to bemusement of tools that are careful
enough:

  $ busctl introspect fi.w1.wpa_supplicant1 /fi/w1/wpa_supplicant1/Interfaces/666
  Duplicate property

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>

diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index e0f16bbdab65aafbea45a674569e45047d19ba4d..d4deb0fe35f010b851d28b790ab1a43c91d2fd79 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -2131,11 +2131,6 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
        case WPAS_DBUS_PROP_AP_SCAN:
                prop = "ApScan";
                break;
-#ifdef CONFIG_IEEE80211W
-       case WPAS_DBUS_PROP_PMF:
-               prop = "Pmf";
-               break;
-#endif /* CONFIG_IEEE80211W */
        case WPAS_DBUS_PROP_SCANNING:
                prop = "Scanning";
                break;
@@ -3307,13 +3302,6 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
          wpas_dbus_setter_ap_scan,
          NULL
        },
-#ifdef CONFIG_IEEE80211W
-       { "Pmf", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
-         wpas_dbus_getter_pmf,
-         wpas_dbus_setter_pmf,
-         NULL
-       },
-#endif /* CONFIG_IEEE80211W */
        { "BSSExpireAge", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
          wpas_dbus_getter_bss_expire_age,
          wpas_dbus_setter_bss_expire_age,

diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index e68acb7a1c030a26e56613fd52ffc92d586690c1..40ae133b225e5cb02b1b074a4c89017420350fdd 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -22,7 +22,6 @@ struct wps_credential;
 
 enum wpas_dbus_prop {
        WPAS_DBUS_PROP_AP_SCAN,
-       WPAS_DBUS_PROP_PMF,
        WPAS_DBUS_PROP_SCANNING,
        WPAS_DBUS_PROP_STATE,
        WPAS_DBUS_PROP_CURRENT_BSS,

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index a3c98fadd306d19726789841443d09a30b95bc3d..c81c0855daa3d8c68adc276a7a39f19ad4ed059e 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -3012,61 +3012,6 @@ dbus_bool_t wpas_dbus_setter_ap_scan(
 }
 
 
-#ifdef CONFIG_IEEE80211W
-
-/**
- * wpas_dbus_getter_pmf - Control PMF default
- * @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 function for "Pmf" property.
- */
-dbus_bool_t wpas_dbus_getter_pmf(
-       const struct wpa_dbus_property_desc *property_desc,
-       DBusMessageIter *iter, DBusError *error, void *user_data)
-{
-       struct wpa_supplicant *wpa_s = user_data;
-       dbus_uint32_t pmf = wpa_s->conf->pmf;
-
-       return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT32,
-                                               &pmf, error);
-}
-
-
-/**
- * wpas_dbus_setter_pmf - Control PMF default
- * @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
- *
- * Setter function for "Pmf" property.
- */
-dbus_bool_t wpas_dbus_setter_pmf(
-       const struct wpa_dbus_property_desc *property_desc,
-       DBusMessageIter *iter, DBusError *error, void *user_data)
-{
-       struct wpa_supplicant *wpa_s = user_data;
-       dbus_uint32_t pmf;
-
-       if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_UINT32,
-                                             &pmf))
-               return FALSE;
-
-       if (pmf > 2) {
-               dbus_set_error_const(error, DBUS_ERROR_FAILED,
-                                    "Pmf must be 0, 1, or 2");
-               return FALSE;
-       }
-       wpa_s->conf->pmf = pmf;
-       return TRUE;
-}
-
-#endif /* CONFIG_IEEE80211W */
-
-
 /**
  * wpas_dbus_getter_fast_reauth - Control fast
  * reauthentication (TLS session resumption)

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h
index 26652ad3d7a89ffccf2e830ed6a429aae20de424..6f952cc390919b4b527b13e9edce5ebd7c10a959 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.h
+++ b/wpa_supplicant/dbus/dbus_new_handlers.h
@@ -141,8 +141,6 @@ DECLARE_ACCESSOR(wpas_dbus_getter_state);
 DECLARE_ACCESSOR(wpas_dbus_getter_scanning);
 DECLARE_ACCESSOR(wpas_dbus_getter_ap_scan);
 DECLARE_ACCESSOR(wpas_dbus_setter_ap_scan);
-DECLARE_ACCESSOR(wpas_dbus_getter_pmf);
-DECLARE_ACCESSOR(wpas_dbus_setter_pmf);
 DECLARE_ACCESSOR(wpas_dbus_getter_fast_reauth);
 DECLARE_ACCESSOR(wpas_dbus_setter_fast_reauth);
 DECLARE_ACCESSOR(wpas_dbus_getter_disconnect_reason);