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 06aec05..f9dfada 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -30,15 +30,13 @@
 
 static GSList *network_list = NULL;
 static GSList *driver_list = NULL;
-static unsigned int hidden_counter = 0;
 
 struct connman_network {
-       gint refcount;
+       int refcount;
        enum connman_network_type type;
        connman_bool_t available;
        connman_bool_t connected;
        connman_bool_t roaming;
-       connman_bool_t hidden;
        connman_uint8_t strength;
        connman_uint16_t frequency;
        char *identifier;
@@ -63,8 +61,10 @@ struct connman_network {
                unsigned short channel;
                char *security;
                char *passphrase;
+               char *agent_passphrase;
                char *eap;
                char *identity;
+               char *agent_identity;
                char *ca_cert_path;
                char *client_cert_path;
                char *private_key_path;
@@ -162,8 +162,10 @@ static int network_probe(struct connman_network *network)
        case CONNMAN_NETWORK_TYPE_WIFI:
        case CONNMAN_NETWORK_TYPE_WIMAX:
                network->driver = driver;
-               if (__connman_service_create_from_network(network) == NULL)
+               if (__connman_service_create_from_network(network) == NULL) {
+                       network->driver = NULL;
                        return -EINVAL;
+               }
        }
 
        return 0;
@@ -176,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:
@@ -208,8 +212,6 @@ static void network_change(struct connman_network *network)
        if (network->connected == FALSE)
                return;
 
-       connman_network_unref(network);
-
        connman_device_set_disconnected(network->device, TRUE);
 
        if (network->driver && network->driver->disconnect) {
@@ -242,21 +244,6 @@ static void probe_driver(struct connman_network_driver *driver)
        }
 }
 
-int connman_network_register(struct connman_network *network)
-{
-       network_list = g_slist_append(network_list, network);
-
-       return network_probe(network);
-}
-
-
-void connman_network_unregister(struct connman_network *network)
-{
-       network_list = g_slist_remove(network_list, network);
-
-       network_remove(network);
-}
-
 static void remove_driver(struct connman_network_driver *driver)
 {
        GSList *list;
@@ -332,8 +319,10 @@ static void network_destruct(struct connman_network *network)
        g_free(network->wifi.mode);
        g_free(network->wifi.security);
        g_free(network->wifi.passphrase);
+       g_free(network->wifi.agent_passphrase);
        g_free(network->wifi.eap);
        g_free(network->wifi.identity);
+       g_free(network->wifi.agent_identity);
        g_free(network->wifi.ca_cert_path);
        g_free(network->wifi.client_cert_path);
        g_free(network->wifi.private_key_path);
@@ -346,7 +335,6 @@ static void network_destruct(struct connman_network *network)
        g_free(network->node);
        g_free(network->name);
        g_free(network->identifier);
-       g_free(network->path);
 
        network->device = NULL;
 
@@ -377,11 +365,7 @@ struct connman_network *connman_network_create(const char *identifier,
 
        network->refcount = 1;
 
-       if (identifier == NULL) {
-               ident = g_strdup_printf("hidden_%d", hidden_counter++);
-               network->hidden = TRUE;
-       } else
-               ident = g_strdup(identifier);
+       ident = g_strdup(identifier);
 
        if (ident == NULL) {
                g_free(network);
@@ -391,6 +375,8 @@ struct connman_network *connman_network_create(const char *identifier,
        network->type       = type;
        network->identifier = ident;
 
+       network_list = g_slist_append(network_list, network);
+
        return network;
 }
 
@@ -403,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;
 }
@@ -419,11 +405,13 @@ 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);
+
        network_destruct(network);
 }
 
@@ -626,9 +614,6 @@ int connman_network_set_available(struct connman_network *network,
  */
 connman_bool_t connman_network_get_available(struct connman_network *network)
 {
-       if (network->hidden == TRUE)
-               return TRUE;
-
        return network->available;
 }
 
@@ -668,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,
@@ -684,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,
@@ -753,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:
@@ -796,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);
 
@@ -909,6 +889,9 @@ static void set_connected_manual(struct connman_network *network)
 
        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);
@@ -960,6 +943,9 @@ static int manual_ipv6_set(struct connman_network *network,
        if (service == NULL)
                return -EINVAL;
 
+       if (__connman_ipconfig_get_local(ipconfig_ipv6) == NULL)
+               __connman_service_read_ip6config(service);
+
        err = __connman_ipconfig_address_add(ipconfig_ipv6);
        if (err < 0) {
                connman_network_set_error(network,
@@ -974,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);
@@ -989,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);
@@ -1068,12 +1050,9 @@ static gboolean set_connected(gpointer user_data)
                }
 
        } else {
-               struct connman_service *service;
+               enum connman_service_state state;
 
                __connman_device_set_network(network->device, NULL);
-               network->hidden = FALSE;
-
-               service = __connman_service_lookup_from_network(network);
 
                switch (ipv4_method) {
                case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
@@ -1087,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);
 
@@ -1150,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);
@@ -1219,7 +1208,6 @@ int __connman_network_connect(struct connman_network *network)
                        connman_network_set_associating(network, TRUE);
                else {
                        network->connecting = FALSE;
-                       network->hidden = FALSE;
                }
 
                return err;
@@ -1331,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);
 
@@ -1399,22 +1390,6 @@ int connman_network_set_ipaddress(struct connman_network *network,
        return 0;
 }
 
-int connman_network_set_pac(struct connman_network *network,
-                               const char *pac)
-{
-       struct connman_service *service;
-
-       DBG("network %p pac %s", network, pac);
-
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return -EINVAL;
-
-       __connman_service_set_pac(service, pac);
-
-       return 0;
-}
-
 int connman_network_set_nameservers(struct connman_network *network,
                                const char *nameservers)
 {
@@ -1578,12 +1553,18 @@ int connman_network_set_string(struct connman_network *network,
        } else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) {
                g_free(network->wifi.passphrase);
                network->wifi.passphrase = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.AgentPassphrase") == TRUE) {
+               g_free(network->wifi.agent_passphrase);
+               network->wifi.agent_passphrase = g_strdup(value);
        } else if (g_str_equal(key, "WiFi.EAP") == TRUE) {
                g_free(network->wifi.eap);
                network->wifi.eap = g_strdup(value);
        } else if (g_str_equal(key, "WiFi.Identity") == TRUE) {
                g_free(network->wifi.identity);
                network->wifi.identity = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.AgentIdentity") == TRUE) {
+               g_free(network->wifi.agent_identity);
+               network->wifi.agent_identity = g_strdup(value);
        } else if (g_str_equal(key, "WiFi.CACertFile") == TRUE) {
                g_free(network->wifi.ca_cert_path);
                network->wifi.ca_cert_path = g_strdup(value);
@@ -1633,10 +1614,14 @@ const char *connman_network_get_string(struct connman_network *network,
                return network->wifi.security;
        else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
                return network->wifi.passphrase;
+       else if (g_str_equal(key, "WiFi.AgentPassphrase") == TRUE)
+               return network->wifi.agent_passphrase;
        else if (g_str_equal(key, "WiFi.EAP") == TRUE)
                return network->wifi.eap;
        else if (g_str_equal(key, "WiFi.Identity") == TRUE)
                return network->wifi.identity;
+       else if (g_str_equal(key, "WiFi.AgentIdentity") == TRUE)
+               return network->wifi.agent_identity;
        else if (g_str_equal(key, "WiFi.CACertFile") == TRUE)
                return network->wifi.ca_cert_path;
        else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE)