jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

D-Bus: Fix WPS.Start method in AP/P2P GO mode

Browse source 
Previously, role="enrollee" was required to be used to allow the AP mode
WPS operation to be started. This is incorrect since the AP/GO will
operate in Registrar role. Fix this by ignoring the role parameter when
AP (including P2P GO) mode is enabled.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-02 17:11:15 +02:00
parent bd47d68035
commit d118a6b8c8
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
wpa_supplicant/dbus/dbus_new_handlers_wps.c
View file

@ -247,48 +247,48 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
dbus_message_iter_next(&dict_iter); dbus_message_iter_next(&dict_iter);
} }
#ifdef CONFIG_AP
if (wpa_s->ap_iface && params.type == 1) {
if (params.pin == NULL) {
wpa_printf(MSG_DEBUG,
"dbus: WPS.Start - Pin required for registrar role");
return wpas_dbus_error_invalid_args(
message, "Pin required for registrar role.");
}
ret = wpa_supplicant_ap_wps_pin(wpa_s,
params.bssid,
params.pin,
npin, sizeof(npin), 0);
} else if (wpa_s->ap_iface) {
ret = wpa_supplicant_ap_wps_pbc(wpa_s,
params.bssid,
params.p2p_dev_addr);
} else
#endif /* CONFIG_AP */
if (params.role == 0) { if (params.role == 0) {
wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Role not specified"); wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Role not specified");
return wpas_dbus_error_invalid_args(message, return wpas_dbus_error_invalid_args(message,
"Role not specified"); "Role not specified");
} else if (params.role == 1 && params.type == 0) { } else if (params.role == 2) {
if (params.pin == NULL) {
wpa_printf(MSG_DEBUG,
"dbus: WPS.Start - Pin required for registrar role");
return wpas_dbus_error_invalid_args(
message, "Pin required for registrar role.");
}
ret = wpas_wps_start_reg(wpa_s, params.bssid, params.pin,
NULL);
} else if (params.type == 0) {
wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Type not specified"); wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Type not specified");
return wpas_dbus_error_invalid_args(message, return wpas_dbus_error_invalid_args(message,
"Type not specified"); "Type not specified");
} else if (params.role == 2 && params.pin == NULL) { } else if (params.type == 1) {
wpa_printf(MSG_DEBUG, ret = wpas_wps_start_pin(wpa_s, params.bssid,
"dbus: WPS.Start - Pin required for registrar role"); params.pin, 0,
return wpas_dbus_error_invalid_args( DEV_PW_DEFAULT);
message, "Pin required for registrar role."); if (ret > 0)
} os_snprintf(npin, sizeof(npin), "%08d", ret);
if (params.role == 2)
ret = wpas_wps_start_reg(wpa_s, params.bssid, params.pin,
NULL);
else if (params.type == 1) {
#ifdef CONFIG_AP
if (wpa_s->ap_iface)
ret = wpa_supplicant_ap_wps_pin(wpa_s,
params.bssid,
params.pin,
npin, sizeof(npin), 0);
else
#endif /* CONFIG_AP */
{
ret = wpas_wps_start_pin(wpa_s, params.bssid,
params.pin, 0,
DEV_PW_DEFAULT);
if (ret > 0)
os_snprintf(npin, sizeof(npin), "%08d", ret);
}
} else { } else {
#ifdef CONFIG_AP
if (wpa_s->ap_iface)
ret = wpa_supplicant_ap_wps_pbc(wpa_s,
params.bssid,
params.p2p_dev_addr);
else
#endif /* CONFIG_AP */
ret = wpas_wps_start_pbc(wpa_s, params.bssid, 0); ret = wpas_wps_start_pbc(wpa_s, params.bssid, 0);
} }