core: Add SOCK_CLOEXEC to socket()

[framework/connectivity/connman.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 7690112..b58409f 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -779,8 +779,6 @@ static void set_configuration(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);
@@ -892,6 +890,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);
@@ -943,6 +944,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,
@@ -957,8 +961,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);
@@ -972,8 +974,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);
@@ -1051,12 +1051,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:
@@ -1069,11 +1067,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);
 
@@ -1132,9 +1143,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);
@@ -1312,6 +1320,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);