From c863ccb24e75656d90b533f1505f9f8000d9e006 Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 3 May 2012 12:55:19 +0300 Subject: service: Do not stay on failure state when it is due to wrong user input --- src/service.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.c b/src/service.c index 3a046eab..75c392eb 100644 --- a/src/service.c +++ b/src/service.c @@ -4339,6 +4339,10 @@ static void report_error_cb(struct connman_service *service, if (retry == TRUE) __connman_service_connect(service); else { + /* It is not relevant to stay on Failure state + * when failing is due to wrong user input */ + service->state = CONNMAN_SERVICE_STATE_IDLE; + service_complete(service); __connman_connection_update_gateway(); } @@ -4464,7 +4468,11 @@ static void request_input_cb (struct connman_service *service, __connman_agent_report_error(service, error2string(service->error), report_error_cb, NULL); - } else if (err == -EINVAL) { + } else { + /* It is not relevant to stay on Failure state + * when failing is due to wrong user input */ + service->state = CONNMAN_SERVICE_STATE_IDLE; + service_complete(service); __connman_connection_update_gateway(); } -- cgit v1.2.3