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

D-Bus: Fix p2p interface capability message

Browse source 
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>
This commit is contained in:
John Ernberg 2016-02-01 12:04:57 +00:00 committed by Jouni Malinen
parent 479f46c4c2
commit f91e11f465
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -2645,6 +2645,7 @@ dbus_bool_t wpas_dbus_getter_capabilities(
!wpa_dbus_dict_string_array_add_element( !wpa_dbus_dict_string_array_add_element(
&iter_array, "ap")) || &iter_array, "ap")) ||
(res >= 0 && (capa.flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) && (res >= 0 && (capa.flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) &&
!wpa_s->conf->p2p_disabled &&
!wpa_dbus_dict_string_array_add_element( !wpa_dbus_dict_string_array_add_element(
&iter_array, "p2p")) || &iter_array, "p2p")) ||
!wpa_dbus_dict_end_string_array(&iter_dict, !wpa_dbus_dict_end_string_array(&iter_dict,