service: Simplify nameserver route adding and removing
[framework/connectivity/connman.git] / src / network.c
index e2266d0..6fe1d9c 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
 
 #include "connman.h"
 
+/*
+ * How many times to send RS with the purpose of
+ * refreshing RDNSS entries before they actually expire.
+ * With a value of 1, one RS will be sent, with no retries.
+ */
+#define RS_REFRESH_COUNT       1
+
+/*
+ * Value in seconds to wait for RA after RS was sent.
+ * After this time elapsed, we can send another RS.
+ */
+#define RS_REFRESH_TIMEOUT     3
+
 static GSList *network_list = NULL;
 static GSList *driver_list = NULL;
 
@@ -46,6 +59,7 @@ struct connman_network {
        char *path;
        int index;
        int router_solicit_count;
+       int router_solicit_refresh_count;
 
        struct connman_network_driver *driver;
        void *driver_data;
@@ -104,14 +118,6 @@ static const char *type2string(enum connman_network_type type)
        return NULL;
 }
 
-connman_bool_t __connman_network_has_driver(struct connman_network *network)
-{
-       if (network == NULL || network->driver == NULL)
-               return FALSE;
-
-       return TRUE;
-}
-
 static gboolean match_driver(struct connman_network *network,
                                        struct connman_network_driver *driver)
 {
@@ -387,10 +393,12 @@ struct connman_network *connman_network_create(const char *identifier,
  *
  * Increase reference counter of  network
  */
-struct connman_network *connman_network_ref(struct connman_network *network)
+struct connman_network *
+connman_network_ref_debug(struct connman_network *network,
+                       const char *file, int line, const char *caller)
 {
-       DBG("network %p name %s refcount %d", network, network->name,
-               network->refcount + 1);
+       DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
+               network->refcount + 1, file, line, caller);
 
        __sync_fetch_and_add(&network->refcount, 1);
 
@@ -403,10 +411,11 @@ struct connman_network *connman_network_ref(struct connman_network *network)
  *
  * Decrease reference counter of network
  */
-void connman_network_unref(struct connman_network *network)
+void connman_network_unref_debug(struct connman_network *network,
+                               const char *file, int line, const char *caller)
 {
-       DBG("network %p name %s refcount %d", network, network->name,
-               network->refcount - 1);
+       DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
+               network->refcount - 1, file, line, caller);
 
        if (__sync_fetch_and_sub(&network->refcount, 1) != 1)
                return;
@@ -704,7 +713,7 @@ void connman_network_set_ipv4_method(struct connman_network *network,
        if (ipconfig == NULL)
                return;
 
-       connman_ipconfig_set_method(ipconfig, method);
+       __connman_ipconfig_set_method(ipconfig, method);
 }
 
 void connman_network_set_ipv6_method(struct connman_network *network,
@@ -721,7 +730,7 @@ void connman_network_set_ipv6_method(struct connman_network *network,
        if (ipconfig == NULL)
                return;
 
-       connman_ipconfig_set_method(ipconfig, method);
+       __connman_ipconfig_set_method(ipconfig, method);
 }
 
 void connman_network_set_error(struct connman_network *network,
@@ -974,6 +983,20 @@ static void stop_dhcpv6(struct connman_network *network)
        __connman_dhcpv6_stop(network);
 }
 
+static void dhcpv6_release_callback(struct connman_network *network,
+                               connman_bool_t success)
+{
+       DBG("success %d", success);
+
+       stop_dhcpv6(network);
+}
+
+static void release_dhcpv6(struct connman_network *network)
+{
+       __connman_dhcpv6_start_release(network, dhcpv6_release_callback);
+       stop_dhcpv6(network);
+}
+
 static void dhcpv6_info_callback(struct connman_network *network,
                                connman_bool_t success)
 {
@@ -982,10 +1005,84 @@ static void dhcpv6_info_callback(struct connman_network *network,
        stop_dhcpv6(network);
 }
 
+static gboolean dhcpv6_set_addresses(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv6;
+       int err = -EINVAL;
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               goto err;
+
+       connman_network_set_associating(network, FALSE);
+
+       network->connecting = FALSE;
+
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+       err = __connman_ipconfig_address_add(ipconfig_ipv6);
+       if (err < 0)
+               goto err;
+
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+       if (err < 0)
+               goto err;
+
+       return 0;
+
+err:
+       connman_network_set_error(network,
+                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+       return err;
+}
+
+static void autoconf_ipv6_set(struct connman_network *network);
+static void dhcpv6_callback(struct connman_network *network,
+                       connman_bool_t success);
+
+/*
+ * Have a separate callback for renew so that we do not do autoconf
+ * in wrong phase as the dhcpv6_callback() is also called when doing
+ * DHCPv6 solicitation.
+ */
+static void dhcpv6_renew_callback(struct connman_network *network,
+                                       connman_bool_t success)
+{
+       if (success == TRUE)
+               dhcpv6_callback(network, success);
+       else {
+               stop_dhcpv6(network);
+
+               /* restart and do solicit again. */
+               autoconf_ipv6_set(network);
+       }
+}
+
+static void dhcpv6_callback(struct connman_network *network,
+                                       connman_bool_t success)
+{
+       DBG("success %d", success);
+
+       /* Start the renew process if necessary */
+       if (success == TRUE) {
+
+               if (dhcpv6_set_addresses(network) < 0) {
+                       stop_dhcpv6(network);
+                       return;
+               }
+
+               if (__connman_dhcpv6_start_renew(network,
+                                       dhcpv6_renew_callback) == -ETIMEDOUT)
+                       dhcpv6_renew_callback(network, FALSE);
+       } else
+               stop_dhcpv6(network);
+}
+
 static void check_dhcpv6(struct nd_router_advert *reply,
                        unsigned int length, void *user_data)
 {
        struct connman_network *network = user_data;
+       GSList *prefixes;
 
        DBG("reply %p", reply);
 
@@ -1008,13 +1105,80 @@ static void check_dhcpv6(struct nd_router_advert *reply,
 
        network->router_solicit_count = 0;
 
-       /* We do stateless DHCPv6 only if router advertisement says so */
-       if (reply->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
+       /*
+        * If we were disconnected while waiting router advertisement,
+        * we just quit and do not start DHCPv6
+        */
+       if (network->connected == FALSE) {
+               connman_network_unref(network);
+               return;
+       }
+
+       prefixes = __connman_inet_ipv6_get_prefixes(reply, length);
+
+       /*
+        * We do stateful/stateless DHCPv6 if router advertisement says so.
+        */
+       if (reply->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)
+               __connman_dhcpv6_start(network, prefixes, dhcpv6_callback);
+       else if (reply->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
                __connman_dhcpv6_start_info(network, dhcpv6_info_callback);
 
        connman_network_unref(network);
 }
 
+static void receive_refresh_rs_reply(struct nd_router_advert *reply,
+               unsigned int length, void *user_data)
+{
+       struct connman_network *network = user_data;
+
+       DBG("reply %p", reply);
+
+       if (reply == NULL) {
+               /*
+                * Router solicitation message seem to get lost easily so
+                * try to send it again.
+                */
+               if (network->router_solicit_refresh_count > 1) {
+                       network->router_solicit_refresh_count--;
+                       DBG("re-send router solicitation %d",
+                                       network->router_solicit_refresh_count);
+                       __connman_inet_ipv6_send_rs(network->index,
+                                       RS_REFRESH_TIMEOUT,
+                                       receive_refresh_rs_reply,
+                                       network);
+                       return;
+               }
+       }
+
+       /* RS refresh not in progress anymore */
+       network->router_solicit_refresh_count = 0;
+
+       connman_network_unref(network);
+       return;
+}
+
+int __connman_refresh_rs_ipv6(struct connman_network *network, int index)
+{
+       int ret = 0;
+
+       DBG("network %p index %d", network, index);
+
+       /* Send only one RS for all RDNSS entries which are about to expire */
+       if (network->router_solicit_refresh_count > 0) {
+               DBG("RS refresh already started");
+               return 0;
+       }
+
+       network->router_solicit_refresh_count = RS_REFRESH_COUNT;
+
+       connman_network_ref(network);
+
+       ret = __connman_inet_ipv6_send_rs(index, RS_REFRESH_TIMEOUT,
+                       receive_refresh_rs_reply, network);
+       return ret;
+}
+
 static void autoconf_ipv6_set(struct connman_network *network)
 {
        struct connman_service *service;
@@ -1023,6 +1187,16 @@ static void autoconf_ipv6_set(struct connman_network *network)
 
        DBG("network %p", network);
 
+       if (network->router_solicit_count > 0) {
+               /*
+                * The autoconfiguration is already pending and we have sent
+                * router solicitation messages and are now waiting answers.
+                * There is no need to continue any further.
+                */
+               DBG("autoconfiguration already started");
+               return;
+       }
+
        __connman_device_set_network(network->device, network);
 
        connman_device_set_disconnected(network->device, FALSE);
@@ -1037,7 +1211,7 @@ static void autoconf_ipv6_set(struct connman_network *network)
        if (ipconfig == NULL)
                return;
 
-       index = connman_ipconfig_get_index(ipconfig);
+       index = __connman_ipconfig_get_index(ipconfig);
 
        connman_network_ref(network);
 
@@ -1046,12 +1220,17 @@ static void autoconf_ipv6_set(struct connman_network *network)
        __connman_inet_ipv6_send_rs(index, 1, check_dhcpv6, network);
 }
 
-static gboolean set_connected(gpointer user_data)
+static void set_connected(struct connman_network *network)
 {
-       struct connman_network *network = user_data;
-       struct connman_service *service;
        struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
        enum connman_ipconfig_method ipv4_method, ipv6_method;
+       struct connman_service *service;
+       int ret;
+
+       if (network->connected == TRUE)
+               return;
+
+       network->connected = TRUE;
 
        service = __connman_service_lookup_from_network(network);
 
@@ -1065,141 +1244,160 @@ static gboolean set_connected(gpointer user_data)
        ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
 
        DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
-       DBG("network connected %d", network->connected);
 
-       if (network->connected == TRUE) {
-               int ret;
-
-               switch (ipv6_method) {
-               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       autoconf_ipv6_set(network);
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
-               case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       ret = manual_ipv6_set(network, ipconfig_ipv6);
-                       if (ret != 0) {
-                               connman_network_set_error(network,
+       switch (ipv6_method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+               break;
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               autoconf_ipv6_set(network);
+               break;
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               ret = manual_ipv6_set(network, ipconfig_ipv6);
+               if (ret != 0) {
+                       connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return FALSE;
-                       }
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       break;
+                       return;
                }
+               break;
+       }
 
-               switch (ipv4_method) {
-               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
-               case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       return FALSE;
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
-                       if (set_connected_fixed(network) < 0) {
-                               connman_network_set_error(network,
+       switch (ipv4_method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               return;
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+               if (set_connected_fixed(network) < 0) {
+                       connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return FALSE;
-                       }
-                       return TRUE;
-               case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       set_connected_manual(network);
-                       return TRUE;
-               case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       if (set_connected_dhcp(network) < 0) {
-                               connman_network_set_error(network,
+                       return;
+               }
+               return;
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               set_connected_manual(network);
+               return;
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+               if (set_connected_dhcp(network) < 0) {
+                       connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return FALSE;
-                       }
+                       return;
                }
+       }
 
-       } else {
-               enum connman_service_state state;
+       network->connecting = FALSE;
 
-               /*
-                * Resetting solicit count here will prevent the RS resend loop
-                * from sending packets in check_dhcpv6()
-                */
-               network->router_solicit_count = 0;
+       connman_network_set_associating(network, FALSE);
+}
 
-               __connman_device_set_network(network->device, NULL);
+static void set_disconnected(struct connman_network *network)
+{
+       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
+       enum connman_ipconfig_method ipv4_method, ipv6_method;
+       enum connman_service_state state;
+       struct connman_service *service;
 
-               switch (ipv6_method) {
-               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
-               case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       stop_dhcpv6(network);
-                       break;
-               }
+       if (network->connected == FALSE)
+               return;
 
-               switch (ipv4_method) {
-               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
-               case CONNMAN_IPCONFIG_METHOD_AUTO:
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
-               case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       __connman_dhcp_stop(network);
-                       break;
-               }
+       network->connected = FALSE;
 
-               /*
-                * 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);
+       service = __connman_service_lookup_from_network(network);
 
-               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);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
 
-               __connman_connection_gateway_remove(service,
-                                               CONNMAN_IPCONFIG_TYPE_ALL);
+       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
+               ipconfig_ipv6);
 
-               __connman_ipconfig_address_unset(ipconfig_ipv4);
-               __connman_ipconfig_address_unset(ipconfig_ipv6);
+       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
 
-               /*
-                * Special handling for IPv6 autoconfigured address.
-                * The simplest way to remove autoconfigured routes is to
-                * disable IPv6 temporarily so that kernel will do the cleanup
-                * automagically.
-                */
-               if (ipv6_method == CONNMAN_IPCONFIG_METHOD_AUTO) {
-                       __connman_ipconfig_disable_ipv6(ipconfig_ipv6);
-                       __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
-               }
+       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+
+       /*
+        * Resetting solicit count here will prevent the RS resend loop
+        * from sending packets in check_dhcpv6()
+        */
+       network->router_solicit_count = 0;
+
+       __connman_device_set_network(network->device, NULL);
+
+       switch (ipv6_method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               break;
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               release_dhcpv6(network);
+               break;
+       }
+
+       switch (ipv4_method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               break;
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+               __connman_dhcp_stop(network);
+               break;
+       }
 
+       /*
+        * 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_IDLE,
+                                       CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
+       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_IDLE,
+                                       CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
+
+       __connman_connection_gateway_remove(service,
+                                       CONNMAN_IPCONFIG_TYPE_ALL);
+
+       __connman_ipconfig_address_unset(ipconfig_ipv4);
+       __connman_ipconfig_address_unset(ipconfig_ipv6);
+
+       /*
+        * Special handling for IPv6 autoconfigured address.
+        * The simplest way to remove autoconfigured routes is to
+        * disable IPv6 temporarily so that kernel will do the cleanup
+        * automagically.
+        */
+       if (ipv6_method == CONNMAN_IPCONFIG_METHOD_AUTO) {
+               __connman_ipconfig_disable_ipv6(ipconfig_ipv6);
+               __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
        }
 
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+
        network->connecting = FALSE;
 
        connman_network_set_associating(network, FALSE);
-
-       return FALSE;
 }
 
 /**
@@ -1212,21 +1410,25 @@ static gboolean set_connected(gpointer user_data)
 int connman_network_set_connected(struct connman_network *network,
                                                connman_bool_t connected)
 {
-       DBG("network %p connected %d", network, connected);
+       DBG("network %p connected %d/%d connecting %d associating %d",
+               network, network->connected, connected, network->connecting,
+               network->associating);
 
        if ((network->connecting == TRUE || network->associating == TRUE) &&
                                                        connected == FALSE) {
                connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
-               __connman_network_disconnect(network);
+               if (__connman_network_disconnect(network) == 0)
+                       return 0;
        }
 
        if (network->connected == connected)
                return -EALREADY;
 
-       network->connected = connected;
-
-       set_connected(network);
+       if (connected == FALSE)
+               set_disconnected(network);
+       else
+               set_connected(network);
 
        return 0;
 }
@@ -1256,6 +1458,7 @@ connman_bool_t connman_network_get_associating(struct connman_network *network)
 int connman_network_connect_hidden(struct connman_network *network,
                                char *identity, char* passphrase)
 {
+       int err = 0;
        struct connman_service *service;
 
        DBG("");
@@ -1268,9 +1471,17 @@ int connman_network_connect_hidden(struct connman_network *network,
                __connman_service_set_agent_identity(service, identity);
 
        if (passphrase != NULL)
-               __connman_service_add_passphrase(service, passphrase);
+               err = __connman_service_add_passphrase(service, passphrase);
 
-       return __connman_service_connect(service);
+       if (err == -ENOKEY) {
+               __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_INVALID_KEY);
+               return err;
+       } else {
+               __connman_service_set_hidden(service);
+               __connman_service_set_userconnect(service, TRUE);
+               return __connman_service_connect(service);
+       }
 }
 
 /**
@@ -1315,7 +1526,6 @@ int __connman_network_connect(struct connman_network *network)
                return err;
        }
 
-       network->connected = TRUE;
        set_connected(network);
 
        return err;
@@ -1346,10 +1556,8 @@ int __connman_network_disconnect(struct connman_network *network)
        network->connecting = FALSE;
 
        err = network->driver->disconnect(network);
-       if (err == 0) {
-               connman_network_set_connected(network, FALSE);
-               set_connected(network);
-       }
+       if (err == 0)
+               set_disconnected(network);
 
        return err;
 }
@@ -1392,8 +1600,10 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
        case CONNMAN_IPCONFIG_METHOD_OFF:
        case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
                return -EINVAL;
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               release_dhcpv6(network);
+               break;
        case CONNMAN_IPCONFIG_METHOD_MANUAL:
                __connman_ipconfig_address_remove(ipconfig);
                break;