diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2010-07-18 14:30:24 -0700 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2010-09-09 07:17:16 -0700 |
| commit | 9fa243b2953e6d46f2b88775ed466b1a3d650439 (patch) | |
| tree | 6e63dc5793b55243e73db400f37914c29f38d860 /wpa_supplicant/dbus | |
| parent | e3768e7c943d97687a8dfc195355995a00981564 (diff) | |
| download | external_wpa_supplicant_8_ti-9fa243b2953e6d46f2b88775ed466b1a3d650439.zip external_wpa_supplicant_8_ti-9fa243b2953e6d46f2b88775ed466b1a3d650439.tar.gz external_wpa_supplicant_8_ti-9fa243b2953e6d46f2b88775ed466b1a3d650439.tar.bz2 | |
P2P: Let WPS code know if it is used in a P2P group
Diffstat (limited to 'wpa_supplicant/dbus')
| -rw-r--r-- | wpa_supplicant/dbus/dbus_new_handlers_wps.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/dbus/dbus_old_handlers_wps.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wpa_supplicant/dbus/dbus_new_handlers_wps.c b/wpa_supplicant/dbus/dbus_new_handlers_wps.c index dc44a59..a4715cb 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers_wps.c +++ b/wpa_supplicant/dbus/dbus_new_handlers_wps.c @@ -231,11 +231,11 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message, ret = wpas_wps_start_reg(wpa_s, params.bssid, params.pin, NULL); else if (params.type == 1) { - ret = wpas_wps_start_pin(wpa_s, params.bssid, params.pin); + ret = wpas_wps_start_pin(wpa_s, params.bssid, params.pin, 0); if (ret > 0) os_snprintf(npin, sizeof(npin), "%08d", ret); } else - ret = wpas_wps_start_pbc(wpa_s, params.bssid); + ret = wpas_wps_start_pbc(wpa_s, params.bssid, 0); if (ret < 0) { wpa_printf(MSG_DEBUG, "dbus: WPS.Start wpas_wps_failed in " diff --git a/wpa_supplicant/dbus/dbus_old_handlers_wps.c b/wpa_supplicant/dbus/dbus_old_handlers_wps.c index b5879f3..4c748bf 100644 --- a/wpa_supplicant/dbus/dbus_old_handlers_wps.c +++ b/wpa_supplicant/dbus/dbus_old_handlers_wps.c @@ -43,9 +43,9 @@ DBusMessage * wpas_dbus_iface_wps_pbc(DBusMessage *message, return wpas_dbus_new_invalid_opts_error(message, NULL); if (!os_strcmp(arg_bssid, "any")) - ret = wpas_wps_start_pbc(wpa_s, NULL); + ret = wpas_wps_start_pbc(wpa_s, NULL, 0); else if (!hwaddr_aton(arg_bssid, bssid)) - ret = wpas_wps_start_pbc(wpa_s, bssid); + ret = wpas_wps_start_pbc(wpa_s, bssid, 0); else { return wpas_dbus_new_invalid_opts_error(message, "Invalid BSSID"); @@ -94,9 +94,9 @@ DBusMessage * wpas_dbus_iface_wps_pin(DBusMessage *message, } if (os_strlen(pin) > 0) - ret = wpas_wps_start_pin(wpa_s, _bssid, pin); + ret = wpas_wps_start_pin(wpa_s, _bssid, pin, 0); else - ret = wpas_wps_start_pin(wpa_s, _bssid, NULL); + ret = wpas_wps_start_pin(wpa_s, _bssid, NULL, 0); if (ret < 0) { return dbus_message_new_error(message, |