Service reconnect functions are not doing anything useful anymore,
service->ignore prevents a service from being autoconnected.
---
src/service.c | 50 --------------------------------------------------
1 file changed, 50 deletions(-)
diff --git a/src/service.c b/src/service.c
index 078f9e0..e470a90 100644
--- a/src/service.c
+++ b/src/service.c
@@ -3833,35 +3833,6 @@ static gboolean connect_timeout(gpointer user_data)
return FALSE;
}
-static void set_reconnect_state(struct connman_service *service,
- bool reconnect)
-{
- struct connman_device *device;
-
- if (!service->network)
- return;
-
- device = connman_network_get_device(service->network);
- if (!device)
- return;
-
- __connman_device_set_reconnect(device, reconnect);
-}
-
-static bool get_reconnect_state(struct connman_service *service)
-{
- struct connman_device *device;
-
- if (!service->network)
- return false;
-
- device = connman_network_get_device(service->network);
- if (!device)
- return false;
-
- return __connman_device_get_reconnect(device);
-}
-
static bool is_interface_available(struct connman_service *service,
struct connman_service *other_service)
{
@@ -3925,8 +3896,6 @@ static DBusMessage *connect_service(DBusConnection *conn,
service->pending = dbus_message_ref(msg);
- set_reconnect_state(service, false);
-
err = __connman_service_connect(service);
if (err < 0) {
if (!service->pending)
@@ -3955,8 +3924,6 @@ static DBusMessage *disconnect_service(DBusConnection
*conn,
service->ignore = true;
- set_reconnect_state(service, false);
-
err = __connman_service_disconnect(service);
if (err < 0) {
if (err != -EINPROGRESS)
@@ -3979,8 +3946,6 @@ bool __connman_service_remove(struct connman_service
*service)
CONNMAN_SERVICE_STATE_FAILURE)
return false;
- set_reconnect_state(service, false);
-
__connman_service_disconnect(service);
g_free(service->passphrase);
@@ -5293,14 +5258,6 @@ static int service_indicate_state(struct connman_service
*service)
}
}
- if (new_state == CONNMAN_SERVICE_STATE_IDLE) {
- bool reconnect;
-
- reconnect = get_reconnect_state(service);
- if (reconnect)
- __connman_service_auto_connect();
- }
-
if (new_state == CONNMAN_SERVICE_STATE_READY) {
enum connman_ipconfig_method method;
@@ -5325,8 +5282,6 @@ static int service_indicate_state(struct connman_service
*service)
service_update_preferred_order(def_service, service, new_state);
- set_reconnect_state(service, true);
-
__connman_service_set_favorite(service, true);
reply_pending(service, 0);
@@ -5465,9 +5420,6 @@ int __connman_service_clear_error(struct connman_service
*service)
CONNMAN_SERVICE_STATE_UNKNOWN;
set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
- if (service->favorite)
- set_reconnect_state(service, true);
-
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV6);
@@ -6062,8 +6014,6 @@ int __connman_service_disconnect_all(void)
service->ignore = true;
- set_reconnect_state(service, false);
-
__connman_service_disconnect(service);
}
--
1.7.10.4
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
