DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

D-Bus: Implement Pmf property

Browse source 
The Pmf property is documented in doc/dbus.doxygen, but does not exist,
so implement it.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2017-01-12 17:13:26 +01:00 committed by Jouni Malinen
parent b98706c14b
commit adf8f45f8a
4 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wpa_supplicant/dbus/dbus_new.c
View file

@ -1987,6 +1987,11 @@ 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;
@ -3138,6 +3143,13 @@ 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,

1
wpa_supplicant/dbus/dbus_new.h
View file

@ -22,6 +22,7 @@ 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,

55
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -2787,6 +2787,61 @@ 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)

2
wpa_supplicant/dbus/dbus_new_handlers.h
View file

@ -138,6 +138,8 @@ 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);