From: Julien Massot <[email protected]>
---
src/agent.c | 18 ------------------
src/service.c | 10 ++++++++++
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/agent.c b/src/agent.c
index 7374138..e3433c8 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -172,24 +172,6 @@ static void request_input_passphrase_reply(DBusPendingCall
*call, void *user_dat
dbus_message_iter_next(&dict);
}
- if (wps == TRUE) {
- struct connman_network *network;
-
- network = __connman_service_get_network(
- passphrase_reply->service);
- if (network == NULL)
- goto done;
-
- connman_network_set_bool(network, "WiFi.UseWPS", wps);
-
- if (wpspin != NULL && strlen(wpspin) > 0)
- connman_network_set_string(network,
- "WiFi.PinWPS", wpspin);
- else
- connman_network_set_string(network,
- "WiFi.PinWPS", NULL);
- }
-
done:
passphrase_reply->callback(passphrase_reply->service, values_received,
name, name_len,
diff --git a/src/service.c b/src/service.c
index b471465..8bb7fb3 100644
--- a/src/service.c
+++ b/src/service.c
@@ -4325,12 +4325,22 @@ static void request_input_cb (struct connman_service
*service,
return;
}
+ err = check_wpspin(wpspin);
+ if (err < 0)
+ goto done;
+ if (service->network != NULL) {
+ connman_network_set_bool(service->network, "Wifi.UseWPS", wps);
+ connman_network_set_string(service->network, "Wifi.PinWPS",
+ wpspin);
+ }
+
if (identity != NULL)
__connman_service_set_agent_identity(service, identity);
if (passphrase != NULL)
err = __connman_service_add_passphrase(service, passphrase);
+ done:
if (err >= 0) {
__connman_service_connect(service);
--
1.7.5.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
