From: John Ernberg Date: Mon, 1 Feb 2016 12:04:57 +0000 (+0000) Subject: D-Bus: Fix p2p interface capability message X-Git-Tag: hostap_2_6~954 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f91e11f465caf14126a3528dc2edceed963c2993;p=thirdparty%2Fhostap.git 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 --- diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 6b77008a5..09461c5d4 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,