aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/dbus/dbus_new_handlers.c
diff options
context:
space:
mode:
authorJohn Ernberg <john.ernberg@actia.se>2016-02-01 12:04:57 (GMT)
committerJouni Malinen <j@w1.fi>2016-02-05 16:09:38 (GMT)
commitf91e11f465caf14126a3528dc2edceed963c2993 (patch)
treefa08d18e5f3c0705b49804fd718ded87355c4130 /wpa_supplicant/dbus/dbus_new_handlers.c
parent479f46c4c264341550335475e525bc311e75626b (diff)
downloadhostap-f91e11f465caf14126a3528dc2edceed963c2993.zip
hostap-f91e11f465caf14126a3528dc2edceed963c2993.tar.gz
hostap-f91e11f465caf14126a3528dc2edceed963c2993.tar.bz2
D-Bus: Fix p2p interface capability message
If the config file for the interface says "p2p_disabled=1", don't report p2p capabilities on this interface. This helps programs like Connman to not enable p2p when it's been disabled in wpa_supplicant. Signed-off-by: John Ernberg <john.ernberg@actia.se>
Diffstat (limited to 'wpa_supplicant/dbus/dbus_new_handlers.c')
-rw-r--r--wpa_supplicant/dbus/dbus_new_handlers.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 6b77008..09461c5 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2645,6 +2645,7 @@ dbus_bool_t wpas_dbus_getter_capabilities(
!wpa_dbus_dict_string_array_add_element(
&iter_array, "ap")) ||
(res >= 0 && (capa.flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) &&
+ !wpa_s->conf->p2p_disabled &&
!wpa_dbus_dict_string_array_add_element(
&iter_array, "p2p")) ||
!wpa_dbus_dict_end_string_array(&iter_dict,