Currently only if the service state is CONNMAN_SERVICE_STATE_FAILURE, the service is allowed to be removed. This commit allows removing the service when service state is CONNMAN_SERVICE_STATE_IDLE and CONNMAN_SERVICE_STATE_DISCONNECT. This is needed if a connection attempt fails and the service State is in CONNMAN_SERVICE_STATE_IDLE or CONNMAN_SERVICE_STATE_DISCONNECT, Remove() method can be used to reset the service to clear any wrong passphrase given. Signed-off-by: Harish Jenny K N <harish_kandiga(a)mentor.com&gt; --- doc/service-api.txt | 4 ++-- src/service.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/service-api.txt b/doc/service-api.txt index e2e9e84..c3682e2 100644 --- a/doc/service-api.txt +++ b/doc/service-api.txt @@ -91,8 +91,8 @@ Methods dict GetProperties() [deprecated] to false, but that is currently not supported. In the case a connection attempt failed and the - service is in the State=failure, this method can - also be used to reset the service. + service is in the State=FAILURE|IDLE|DISCONNECT, this + method can also be used to reset the service. Calling this method on Ethernet devices, hidden WiFi services or provisioned services will cause an error diff --git a/src/service.c b/src/service.c index 0d08b5c..2289d54 100644 --- a/src/service.c +++ b/src/service.c @@ -4242,8 +4242,7 @@ bool __connman_service_remove(struct connman_service *service) __connman_provider_is_immutable(service->provider)) return false; - if (!service->favorite && service->state != - CONNMAN_SERVICE_STATE_FAILURE) + if (!service->favorite && !is_idle(service->state)) return false; __connman_service_disconnect(service); -- 1.9.1