From a4c2f9ece63554272d206f197e0ed4712a551a43 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 14 Aug 2009 20:23:59 -0700 Subject: [PATCH] Fix wrong service state handling on timeouts --- src/service.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/service.c b/src/service.c index 09d2534..7287c0d 100644 --- a/src/service.c +++ b/src/service.c @@ -698,29 +698,10 @@ static gboolean connect_timeout(gpointer user_data) service->timeout = 0; - if (service->network != NULL) { - connman_bool_t connected; - - connected = connman_network_get_connected(service->network); - if (connected == TRUE) { - __connman_service_indicate_state(service, - CONNMAN_SERVICE_STATE_READY); - return FALSE; - } - + if (service->network != NULL) __connman_network_disconnect(service->network); - } else if (service->device != NULL) { - connman_bool_t disconnected; - - disconnected = connman_device_get_disconnected(service->device); - if (disconnected == FALSE) { - __connman_service_indicate_state(service, - CONNMAN_SERVICE_STATE_READY); - return FALSE; - } - + else if (service->device != NULL) __connman_device_disconnect(service->device); - } if (service->pending != NULL) { DBusMessage *reply; -- 2.7.4