network: Fix failed to reconnect to 3G network when connect failed

[platform/upstream/connman.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 95aecc7..f9dfada 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -32,7 +32,7 @@ static GSList *network_list = NULL;
 static GSList *driver_list = NULL;
 
 struct connman_network {
-       gint refcount;
+       int refcount;
        enum connman_network_type type;
        connman_bool_t available;
        connman_bool_t connected;
@@ -178,6 +178,8 @@ static void network_remove(struct connman_network *network)
        if (network->driver == NULL)
                return;
 
+       connman_network_set_connected(network, FALSE);
+
        switch (network->type) {
        case CONNMAN_NETWORK_TYPE_UNKNOWN:
        case CONNMAN_NETWORK_TYPE_VENDOR:
@@ -387,9 +389,9 @@ struct connman_network *connman_network_create(const char *identifier,
 struct connman_network *connman_network_ref(struct connman_network *network)
 {
        DBG("network %p name %s refcount %d", network, network->name,
-               g_atomic_int_get(&network->refcount) + 1);
+               network->refcount + 1);
 
-       g_atomic_int_inc(&network->refcount);
+       __sync_fetch_and_add(&network->refcount, 1);
 
        return network;
 }
@@ -403,9 +405,9 @@ struct connman_network *connman_network_ref(struct connman_network *network)
 void connman_network_unref(struct connman_network *network)
 {
        DBG("network %p name %s refcount %d", network, network->name,
-               g_atomic_int_get(&network->refcount) - 1);
+               network->refcount - 1);
 
-       if (g_atomic_int_dec_and_test(&network->refcount) == FALSE)
+       if (__sync_fetch_and_sub(&network->refcount, 1) != 1)
                return;
 
        network_list = g_slist_remove(network_list, network);
@@ -651,11 +653,6 @@ static void set_associate_error(struct connman_network *network)
 {
        struct connman_service *service;
 
-       if (network->associating == FALSE)
-               return ;
-
-       network->associating = FALSE;
-
        service = __connman_service_lookup_from_network(network);
 
        __connman_service_ipconfig_indicate_state(service,
@@ -667,8 +664,6 @@ static void set_configure_error(struct connman_network *network)
 {
        struct connman_service *service;
 
-       network->connecting = FALSE;
-
        service = __connman_service_lookup_from_network(network);
 
        __connman_service_ipconfig_indicate_state(service,
@@ -736,6 +731,7 @@ void connman_network_set_error(struct connman_network *network,
        DBG("nework %p, error %d", network, error);
 
        network->connecting = FALSE;
+       network->associating = FALSE;
 
        switch (error) {
        case CONNMAN_NETWORK_ERROR_UNKNOWN:
@@ -779,7 +775,8 @@ static void set_configuration(struct connman_network *network)
 
        DBG("network %p", network);
 
-       __connman_device_increase_connections(network->device);
+       if (network->device == NULL)
+               return;
 
        __connman_device_set_network(network->device, network);
 
@@ -890,10 +887,11 @@ static void set_connected_manual(struct connman_network *network)
 
        service = __connman_service_lookup_from_network(network);
 
-       __connman_service_read_ip4config(service);
-
        ipconfig = __connman_service_get_ip4config(service);
 
+       if (__connman_ipconfig_get_local(ipconfig) == NULL)
+               __connman_service_read_ip4config(service);
+
        set_configuration(network);
 
        err = __connman_ipconfig_address_add(ipconfig);
@@ -945,7 +943,8 @@ static int manual_ipv6_set(struct connman_network *network,
        if (service == NULL)
                return -EINVAL;
 
-       __connman_service_read_ip6config(service);
+       if (__connman_ipconfig_get_local(ipconfig_ipv6) == NULL)
+               __connman_service_read_ip6config(service);
 
        err = __connman_ipconfig_address_add(ipconfig_ipv6);
        if (err < 0) {
@@ -961,8 +960,6 @@ static int manual_ipv6_set(struct connman_network *network,
        __connman_connection_gateway_activate(service,
                                                CONNMAN_IPCONFIG_TYPE_IPV6);
 
-       __connman_device_increase_connections(network->device);
-
        __connman_device_set_network(network->device, network);
 
        connman_device_set_disconnected(network->device, FALSE);
@@ -976,8 +973,6 @@ static void autoconf_ipv6_set(struct connman_network *network)
 {
        DBG("network %p", network);
 
-       __connman_device_increase_connections(network->device);
-
        __connman_device_set_network(network->device, network);
 
        connman_device_set_disconnected(network->device, FALSE);
@@ -1055,12 +1050,10 @@ static gboolean set_connected(gpointer user_data)
                }
 
        } else {
-               struct connman_service *service;
+               enum connman_service_state state;
 
                __connman_device_set_network(network->device, NULL);
 
-               service = __connman_service_lookup_from_network(network);
-
                switch (ipv4_method) {
                case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
                case CONNMAN_IPCONFIG_METHOD_OFF:
@@ -1073,11 +1066,24 @@ static gboolean set_connected(gpointer user_data)
                        break;
                }
 
-               __connman_service_ipconfig_indicate_state(service,
+               /*
+                * We only set the disconnect state if we were not in idle
+                * or in failure. It does not make sense to go to disconnect
+                * state if we were not connected.
+                */
+               state = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+               if (state != CONNMAN_SERVICE_STATE_IDLE &&
+                                       state != CONNMAN_SERVICE_STATE_FAILURE)
+                       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
-               __connman_service_ipconfig_indicate_state(service,
+               state = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+               if (state != CONNMAN_SERVICE_STATE_IDLE &&
+                                       state != CONNMAN_SERVICE_STATE_FAILURE)
+                       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
 
@@ -1136,9 +1142,6 @@ int connman_network_set_connected(struct connman_network *network,
        if (network->connected == connected)
                return -EALREADY;
 
-       if (connected == FALSE)
-               __connman_device_decrease_connections(network->device);
-
        network->connected = connected;
 
        set_connected(network);
@@ -1316,6 +1319,9 @@ int __connman_network_set_ipconfig(struct connman_network *network,
        enum connman_ipconfig_method method;
        int ret;
 
+       if (network == NULL)
+               return -EINVAL;
+
        if (ipconfig_ipv6) {
                method = __connman_ipconfig_get_method(ipconfig_ipv6);