network: Move up code about set_connected() and set_disconnected
authorTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Wed, 16 Jan 2013 10:57:13 +0000 (12:57 +0200)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Wed, 16 Jan 2013 14:53:09 +0000 (16:53 +0200)
src/network.c

index 0e64c35..ac4608b 100644 (file)
@@ -122,1257 +122,1259 @@ static gboolean match_driver(struct connman_network *network,
        return FALSE;
 }
 
-static int network_probe(struct connman_network *network)
+static void set_configuration(struct connman_network *network,
+                       enum connman_ipconfig_type type)
 {
-       GSList *list;
-       struct connman_network_driver *driver = NULL;
+       struct connman_service *service;
 
-       DBG("network %p name %s", network, network->name);
+       DBG("network %p", network);
 
-       if (network->driver != NULL)
-               return -EALREADY;
+       if (network->device == NULL)
+               return;
 
-       for (list = driver_list; list; list = list->next) {
-               driver = list->data;
+       __connman_device_set_network(network->device, network);
 
-               if (match_driver(network, driver) == FALSE)
-                       continue;
+       connman_device_set_disconnected(network->device, FALSE);
 
-               DBG("driver %p name %s", driver, driver->name);
+       service = connman_service_lookup_from_network(network);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
+                                       type);
+}
 
-               if (driver->probe(network) == 0)
-                       break;
+static void dhcp_success(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       int err;
 
-               driver = NULL;
-       }
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
+               goto err;
 
-       if (driver == NULL)
-               return -ENODEV;
+       connman_network_set_associating(network, FALSE);
 
-       if (network->group == NULL)
-               return -EINVAL;
+       network->connecting = FALSE;
 
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-               return 0;
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIFI:
-               network->driver = driver;
-               if (__connman_service_create_from_network(network) == NULL) {
-                       network->driver = NULL;
-                       return -EINVAL;
-               }
-       }
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       err = __connman_ipconfig_address_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
 
-       return 0;
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
+
+       return;
+
+err:
+       connman_network_set_error(network,
+                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 }
 
-static void network_remove(struct connman_network *network)
+static void dhcp_failure(struct connman_network *network)
 {
-       DBG("network %p name %s", network, network->name);
+       struct connman_service *service;
 
-       if (network->driver == NULL)
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
                return;
 
-       connman_network_set_connected(network, FALSE);
-
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-               break;
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIFI:
-               if (network->group != NULL) {
-                       __connman_service_remove_from_network(network);
-
-                       g_free(network->group);
-                       network->group = NULL;
-               }
-               break;
-       }
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_IDLE,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+}
 
-       if (network->driver->remove)
-               network->driver->remove(network);
+static void dhcp_callback(struct connman_network *network,
+                       connman_bool_t success)
+{
+       DBG("success %d", success);
 
-       network->driver = NULL;
+       if (success == TRUE)
+               dhcp_success(network);
+       else
+               dhcp_failure(network);
 }
 
-static void network_change(struct connman_network *network)
+static int set_connected_fixed(struct connman_network *network)
 {
-       DBG("network %p name %s", network, network->name);
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       int err;
 
-       if (network->connected == FALSE)
-               return;
+       DBG("");
 
-       connman_device_set_disconnected(network->device, TRUE);
+       service = connman_service_lookup_from_network(network);
 
-       if (network->driver && network->driver->disconnect) {
-               network->driver->disconnect(network);
-               return;
-       }
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
 
-       network->connected = FALSE;
-}
+       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
 
-static void probe_driver(struct connman_network_driver *driver)
-{
-       GSList *list;
+       network->connecting = FALSE;
 
-       DBG("driver %p name %s", driver, driver->name);
+       connman_network_set_associating(network, FALSE);
 
-       for (list = network_list; list != NULL; list = list->next) {
-               struct connman_network *network = list->data;
+       err = __connman_ipconfig_address_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
 
-               if (network->driver != NULL)
-                       continue;
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
 
-               if (driver->type != network->type)
-                       continue;
+       return 0;
 
-               if (driver->probe(network) < 0)
-                       continue;
+err:
+       connman_network_set_error(network,
+                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 
-               network->driver = driver;
-       }
+       return err;
 }
 
-static void remove_driver(struct connman_network_driver *driver)
+static void set_connected_manual(struct connman_network *network)
 {
-       GSList *list;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+       int err;
 
-       DBG("driver %p name %s", driver, driver->name);
+       DBG("network %p", network);
 
-       for (list = network_list; list != NULL; list = list->next) {
-               struct connman_network *network = list->data;
+       service = connman_service_lookup_from_network(network);
 
-               if (network->driver == driver)
-                       network_remove(network);
-       }
-}
+       ipconfig = __connman_service_get_ip4config(service);
 
-static gint compare_priority(gconstpointer a, gconstpointer b)
-{
-       const struct connman_network_driver *driver1 = a;
-       const struct connman_network_driver *driver2 = b;
+       if (__connman_ipconfig_get_local(ipconfig) == NULL)
+               __connman_service_read_ip4config(service);
 
-       return driver2->priority - driver1->priority;
-}
+       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
 
-/**
- * connman_network_driver_register:
- * @driver: network driver definition
- *
- * Register a new network driver
- *
- * Returns: %0 on success
- */
-int connman_network_driver_register(struct connman_network_driver *driver)
-{
-       GSList *list;
+       err = __connman_ipconfig_address_add(ipconfig);
+       if (err < 0)
+               goto err;
 
-       DBG("driver %p name %s", driver, driver->name);
+       err = __connman_ipconfig_gateway_add(ipconfig);
+       if (err < 0)
+               goto err;
 
-       for (list = driver_list; list; list = list->next) {
-               struct connman_network_driver *tmp = list->data;
+       network->connecting = FALSE;
 
-               if (tmp->type == driver->type)
-                       return -EALREADY;
+       connman_network_set_associating(network, FALSE);
 
-       }
+       return;
 
-       driver_list = g_slist_insert_sorted(driver_list, driver,
-                                                       compare_priority);
+err:
+       connman_network_set_error(network,
+                                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+       return;
+}
 
-       probe_driver(driver);
+static int set_connected_dhcp(struct connman_network *network)
+{
+       int err;
+
+       DBG("network %p", network);
+
+       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       err = __connman_dhcp_start(network, dhcp_callback);
+       if (err < 0) {
+               connman_error("Can not request DHCP lease");
+               return err;
+       }
 
        return 0;
 }
 
-/**
- * connman_network_driver_unregister:
- * @driver: network driver definition
- *
- * Remove a previously registered network driver
- */
-void connman_network_driver_unregister(struct connman_network_driver *driver)
+static int manual_ipv6_set(struct connman_network *network,
+                               struct connman_ipconfig *ipconfig_ipv6)
 {
-       DBG("driver %p name %s", driver, driver->name);
+       struct connman_service *service;
+       int err;
 
-       driver_list = g_slist_remove(driver_list, driver);
+       DBG("network %p ipv6 %p", network, ipconfig_ipv6);
 
-       remove_driver(driver);
-}
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return -EINVAL;
 
-static void network_destruct(struct connman_network *network)
-{
-       DBG("network %p name %s", network, network->name);
+       if (__connman_ipconfig_get_local(ipconfig_ipv6) == NULL)
+               __connman_service_read_ip6config(service);
 
-       g_free(network->wifi.ssid);
-       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);
-       g_free(network->wifi.private_key_passphrase);
-       g_free(network->wifi.phase2_auth);
-       g_free(network->wifi.pin_wps);
-
-       g_free(network->path);
-       g_free(network->group);
-       g_free(network->node);
-       g_free(network->name);
-       g_free(network->identifier);
-
-       network->device = NULL;
-
-       g_free(network);
-}
-
-/**
- * connman_network_create:
- * @identifier: network identifier (for example an unqiue name)
- *
- * Allocate a new network and assign the #identifier to it.
- *
- * Returns: a newly-allocated #connman_network structure
- */
-struct connman_network *connman_network_create(const char *identifier,
-                                               enum connman_network_type type)
-{
-       struct connman_network *network;
-       char *ident;
-
-       DBG("identifier %s type %d", identifier, type);
-
-       network = g_try_new0(struct connman_network, 1);
-       if (network == NULL)
-               return NULL;
+       __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
 
-       DBG("network %p", network);
+       err = __connman_ipconfig_address_add(ipconfig_ipv6);
+       if (err < 0) {
+               connman_network_set_error(network,
+                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+               return err;
+       }
 
-       network->refcount = 1;
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+       if (err < 0)
+               return err;
 
-       ident = g_strdup(identifier);
+       __connman_connection_gateway_activate(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
 
-       if (ident == NULL) {
-               g_free(network);
-               return NULL;
-       }
+       __connman_device_set_network(network->device, network);
 
-       network->type       = type;
-       network->identifier = ident;
+       connman_device_set_disconnected(network->device, FALSE);
 
-       network_list = g_slist_prepend(network_list, network);
+       network->connecting = FALSE;
 
-       return network;
+       return 0;
 }
 
-/**
- * connman_network_ref:
- * @network: network structure
- *
- * Increase reference counter of  network
- */
-struct connman_network *
-connman_network_ref_debug(struct connman_network *network,
-                       const char *file, int line, const char *caller)
+static void stop_dhcpv6(struct connman_network *network)
 {
-       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);
-
-       return network;
+       __connman_dhcpv6_stop(network);
 }
 
-/**
- * connman_network_unref:
- * @network: network structure
- *
- * Decrease reference counter of network
- */
-void connman_network_unref_debug(struct connman_network *network,
-                               const char *file, int line, const char *caller)
+static void dhcpv6_release_callback(struct connman_network *network,
+                               connman_bool_t success)
 {
-       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;
-
-       network_list = g_slist_remove(network_list, network);
+       DBG("success %d", success);
 
-       network_destruct(network);
+       stop_dhcpv6(network);
 }
 
-const char *__connman_network_get_type(struct connman_network *network)
+static void release_dhcpv6(struct connman_network *network)
 {
-       return type2string(network->type);
+       __connman_dhcpv6_start_release(network, dhcpv6_release_callback);
+       stop_dhcpv6(network);
 }
 
-/**
- * connman_network_get_type:
- * @network: network structure
- *
- * Get type of network
- */
-enum connman_network_type connman_network_get_type(struct connman_network *network)
+static void dhcpv6_info_callback(struct connman_network *network,
+                               connman_bool_t success)
 {
-       return network->type;
-}
+       DBG("success %d", success);
 
-/**
- * connman_network_get_identifier:
- * @network: network structure
- *
- * Get identifier of network
- */
-const char *connman_network_get_identifier(struct connman_network *network)
-{
-       return network->identifier;
+       stop_dhcpv6(network);
 }
 
-/**
- * connman_network_set_index:
- * @network: network structure
- * @index: index number
- *
- * Set index number of network
- */
-void connman_network_set_index(struct connman_network *network, int index)
+static gboolean dhcpv6_set_addresses(struct connman_network *network)
 {
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
+       struct connman_ipconfig *ipconfig_ipv6;
+       int err = -EINVAL;
 
        service = connman_service_lookup_from_network(network);
        if (service == NULL)
-               goto done;
+               goto err;
 
-       ipconfig = __connman_service_get_ip4config(service);
-       if (ipconfig == NULL)
-               goto done;
+       connman_network_set_associating(network, FALSE);
 
-       /* If index changed, the index of ipconfig must be reset. */
-       __connman_ipconfig_set_index(ipconfig, index);
+       network->connecting = FALSE;
 
-       DBG("index %d service %p ip4config %p", network->index,
-               service, ipconfig);
-done:
-       network->index = index;
-}
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+       err = __connman_ipconfig_address_add(ipconfig_ipv6);
+       if (err < 0)
+               goto err;
 
-/**
- * connman_network_get_index:
- * @network: network structure
- *
- * Get index number of network
- */
-int connman_network_get_index(struct connman_network *network)
-{
-       return network->index;
+       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;
 }
 
-/**
- * connman_network_set_group:
- * @network: network structure
- * @group: group name
- *
- * Set group name for automatic clustering
+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.
  */
-void connman_network_set_group(struct connman_network *network,
-                                                       const char *group)
+static void dhcpv6_renew_callback(struct connman_network *network,
+                                       connman_bool_t success)
 {
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-               return;
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIFI:
-               break;
-       }
+       if (success == TRUE)
+               dhcpv6_callback(network, success);
+       else {
+               stop_dhcpv6(network);
 
-       if (g_strcmp0(network->group, group) == 0) {
-               if (group != NULL)
-                       __connman_service_update_from_network(network);
-               return;
+               /* restart and do solicit again. */
+               autoconf_ipv6_set(network);
        }
+}
 
-       if (network->group != NULL) {
-               __connman_service_remove_from_network(network);
+static void dhcpv6_callback(struct connman_network *network,
+                                       connman_bool_t success)
+{
+       DBG("success %d", success);
 
-               g_free(network->group);
-       }
+       /* Start the renew process if necessary */
+       if (success == TRUE) {
 
-       network->group = g_strdup(group);
+               if (dhcpv6_set_addresses(network) < 0) {
+                       stop_dhcpv6(network);
+                       return;
+               }
 
-       if (network->group != NULL)
-               network_probe(network);
+               if (__connman_dhcpv6_start_renew(network,
+                                       dhcpv6_renew_callback) == -ETIMEDOUT)
+                       dhcpv6_renew_callback(network, FALSE);
+       } else
+               stop_dhcpv6(network);
 }
 
-/**
- * connman_network_get_group:
- * @network: network structure
- *
- * Get group name for automatic clustering
- */
-const char *connman_network_get_group(struct connman_network *network)
+static void check_dhcpv6(struct nd_router_advert *reply,
+                       unsigned int length, void *user_data)
 {
-       return network->group;
-}
-
-const char *__connman_network_get_ident(struct connman_network *network)
-{
-       if (network->device == NULL)
-               return NULL;
+       struct connman_network *network = user_data;
+       GSList *prefixes;
 
-       return connman_device_get_ident(network->device);
-}
+       DBG("reply %p", reply);
 
-connman_bool_t __connman_network_get_weakness(struct connman_network *network)
-{
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-               break;
-       case CONNMAN_NETWORK_TYPE_WIFI:
-               if (g_strcmp0(network->wifi.mode, "adhoc") == 0)
-                       return TRUE;
-               if (network->strength > 0 && network->strength < 20)
-                       return TRUE;
-               break;
+       if (reply == NULL) {
+               /*
+                * Router solicitation message seem to get lost easily so
+                * try to send it again.
+                */
+               if (network->router_solicit_count > 0) {
+                       DBG("re-send router solicitation %d",
+                                               network->router_solicit_count);
+                       network->router_solicit_count--;
+                       __connman_inet_ipv6_send_rs(network->index, 1,
+                                               check_dhcpv6, network);
+                       return;
+               }
+               connman_network_unref(network);
+               return;
        }
 
-       return FALSE;
-}
-
-connman_bool_t connman_network_get_connecting(struct connman_network *network)
-{
-       return network->connecting;
-}
-
-/**
- * connman_network_set_available:
- * @network: network structure
- * @available: availability state
- *
- * Change availability state of network (in range)
- */
-int connman_network_set_available(struct connman_network *network,
-                                               connman_bool_t available)
-{
-       DBG("network %p available %d", network, available);
+       network->router_solicit_count = 0;
 
-       if (network->available == available)
-               return -EALREADY;
+       /*
+        * 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;
+       }
 
-       network->available = available;
+       prefixes = __connman_inet_ipv6_get_prefixes(reply, length);
 
-       return 0;
-}
+       /*
+        * 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_get_available:
- * @network: network structure
- *
- * Get network available setting
- */
-connman_bool_t connman_network_get_available(struct connman_network *network)
-{
-       return network->available;
+       connman_network_unref(network);
 }
 
-/**
- * connman_network_set_associating:
- * @network: network structure
- * @associating: associating state
- *
- * Change associating state of network
- */
-int connman_network_set_associating(struct connman_network *network,
-                                               connman_bool_t associating)
+static void receive_refresh_rs_reply(struct nd_router_advert *reply,
+               unsigned int length, void *user_data)
 {
-       DBG("network %p associating %d", network, associating);
-
-       if (network->associating == associating)
-               return -EALREADY;
-
-       network->associating = associating;
+       struct connman_network *network = user_data;
 
-       if (associating == TRUE) {
-               struct connman_service *service;
+       DBG("reply %p", reply);
 
-               service = connman_service_lookup_from_network(network);
-               __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
-               __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       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;
+               }
        }
 
-       return 0;
+       /* RS refresh not in progress anymore */
+       network->router_solicit_refresh_count = 0;
+
+       connman_network_unref(network);
+       return;
 }
 
-static void set_associate_error(struct connman_network *network)
+int __connman_refresh_rs_ipv6(struct connman_network *network, int index)
 {
-       struct connman_service *service;
+       int ret = 0;
 
-       service = connman_service_lookup_from_network(network);
+       DBG("network %p index %d", network, index);
 
-       __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
-}
+       /* 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;
+       }
 
-static void set_configure_error(struct connman_network *network)
-{
-       struct connman_service *service;
+       network->router_solicit_refresh_count = RS_REFRESH_COUNT;
 
-       service = connman_service_lookup_from_network(network);
+       connman_network_ref(network);
 
-       __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+       ret = __connman_inet_ipv6_send_rs(index, RS_REFRESH_TIMEOUT,
+                       receive_refresh_rs_reply, network);
+       return ret;
 }
 
-static void set_invalid_key_error(struct connman_network *network)
+static void autoconf_ipv6_set(struct connman_network *network)
 {
        struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+       int index;
 
-       service = connman_service_lookup_from_network(network);
-
-       __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_INVALID_KEY);
-}
+       DBG("network %p", network);
 
-static void set_connect_error(struct connman_network *network)
-{
-       struct connman_service *service;
+       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;
+       }
 
-       service = connman_service_lookup_from_network(network);
+       __connman_device_set_network(network->device, network);
 
-       __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
-}
+       connman_device_set_disconnected(network->device, FALSE);
 
-void connman_network_set_ipv4_method(struct connman_network *network,
-                                       enum connman_ipconfig_method method)
-{
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
+       network->connecting = FALSE;
 
        service = connman_service_lookup_from_network(network);
        if (service == NULL)
                return;
 
-       ipconfig = __connman_service_get_ip4config(service);
+       ipconfig = __connman_service_get_ip6config(service);
        if (ipconfig == NULL)
                return;
 
-       __connman_ipconfig_set_method(ipconfig, method);
+       index = __connman_ipconfig_get_index(ipconfig);
+
+       connman_network_ref(network);
+
+       /* Try to get stateless DHCPv6 information, RFC 3736 */
+       network->router_solicit_count = 3;
+       __connman_inet_ipv6_send_rs(index, 1, check_dhcpv6, network);
 }
 
-void connman_network_set_ipv6_method(struct connman_network *network,
-                                       enum connman_ipconfig_method method)
+static void set_connected(struct connman_network *network)
 {
+       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
+       enum connman_ipconfig_method ipv4_method, ipv6_method;
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
+       int ret;
 
-       service = connman_service_lookup_from_network(network);
-       if (service == NULL)
+       if (network->connected == TRUE)
                return;
 
-       ipconfig = __connman_service_get_ip6config(service);
-       if (ipconfig == NULL)
-               return;
+       network->connected = TRUE;
 
-       __connman_ipconfig_set_method(ipconfig, method);
-}
+       service = connman_service_lookup_from_network(network);
 
-void connman_network_set_error(struct connman_network *network,
-                                       enum connman_network_error error)
-{
-       DBG("network %p error %d", network, error);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
 
-       network->connecting = FALSE;
-       network->associating = FALSE;
+       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
+               ipconfig_ipv6);
 
-       switch (error) {
-       case CONNMAN_NETWORK_ERROR_UNKNOWN:
-               return;
-       case CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL:
-               set_associate_error(network);
+       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+
+       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+
+       switch (ipv6_method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
                break;
-       case CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL:
-               set_configure_error(network);
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               autoconf_ipv6_set(network);
                break;
-       case CONNMAN_NETWORK_ERROR_INVALID_KEY:
-               set_invalid_key_error(network);
-               break;
-       case CONNMAN_NETWORK_ERROR_CONNECT_FAIL:
-               set_connect_error(network);
+       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;
+               }
                break;
        }
 
-       network_change(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;
+               }
+               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;
+               }
+       }
+
+       network->connecting = FALSE;
+
+       connman_network_set_associating(network, FALSE);
 }
 
-void connman_network_clear_error(struct connman_network *network)
+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;
 
-       DBG("network %p", network);
-
-       if (network == NULL)
+       if (network->connected == FALSE)
                return;
 
-       if (network->connecting == TRUE || network->associating == TRUE)
-               return;
+       network->connected = FALSE;
 
        service = connman_service_lookup_from_network(network);
-       __connman_service_clear_error(service);
-}
 
-static void set_configuration(struct connman_network *network,
-                       enum connman_ipconfig_type type)
-{
-       struct connman_service *service;
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
 
-       DBG("network %p", network);
+       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
+               ipconfig_ipv6);
 
-       if (network->device == NULL)
-               return;
+       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
 
-       __connman_device_set_network(network->device, network);
+       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
 
-       connman_device_set_disconnected(network->device, FALSE);
+       /*
+        * Resetting solicit count here will prevent the RS resend loop
+        * from sending packets in check_dhcpv6()
+        */
+       network->router_solicit_count = 0;
 
-       service = connman_service_lookup_from_network(network);
-       __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
-                                       type);
-}
+       __connman_device_set_network(network->device, NULL);
 
-static void dhcp_success(struct connman_network *network)
-{
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
-       int err;
+       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;
+       }
 
-       service = connman_service_lookup_from_network(network);
-       if (service == NULL)
-               goto err;
+       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;
+       }
 
-       connman_network_set_associating(network, 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);
 
-       network->connecting = FALSE;
+       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);
-       err = __connman_ipconfig_address_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
+       __connman_connection_gateway_remove(service,
+                                       CONNMAN_IPCONFIG_TYPE_ALL);
 
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
+       __connman_ipconfig_address_unset(ipconfig_ipv4);
+       __connman_ipconfig_address_unset(ipconfig_ipv6);
 
-       return;
+       /*
+        * 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);
+       }
 
-err:
-       connman_network_set_error(network,
-                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-}
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
 
-static void dhcp_failure(struct connman_network *network)
-{
-       struct connman_service *service;
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
 
-       service = connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return;
+       network->connecting = FALSE;
 
-       __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_IDLE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       connman_network_set_associating(network, FALSE);
 }
 
-static void dhcp_callback(struct connman_network *network,
-                       connman_bool_t success)
-{
-       DBG("success %d", success);
 
-       if (success == TRUE)
-               dhcp_success(network);
-       else
-               dhcp_failure(network);
-}
 
-static int set_connected_fixed(struct connman_network *network)
+static int network_probe(struct connman_network *network)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
-       int err;
+       GSList *list;
+       struct connman_network_driver *driver = NULL;
 
-       DBG("");
+       DBG("network %p name %s", network, network->name);
 
-       service = connman_service_lookup_from_network(network);
+       if (network->driver != NULL)
+               return -EALREADY;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       for (list = driver_list; list; list = list->next) {
+               driver = list->data;
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+               if (match_driver(network, driver) == FALSE)
+                       continue;
 
-       network->connecting = FALSE;
+               DBG("driver %p name %s", driver, driver->name);
 
-       connman_network_set_associating(network, FALSE);
+               if (driver->probe(network) == 0)
+                       break;
 
-       err = __connman_ipconfig_address_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
+               driver = NULL;
+       }
 
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
+       if (driver == NULL)
+               return -ENODEV;
 
-       return 0;
+       if (network->group == NULL)
+               return -EINVAL;
 
-err:
-       connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+               return 0;
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               network->driver = driver;
+               if (__connman_service_create_from_network(network) == NULL) {
+                       network->driver = NULL;
+                       return -EINVAL;
+               }
+       }
 
-       return err;
+       return 0;
 }
 
-static void set_connected_manual(struct connman_network *network)
+static void network_remove(struct connman_network *network)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
-       int err;
-
-       DBG("network %p", network);
-
-       service = connman_service_lookup_from_network(network);
+       DBG("network %p name %s", network, network->name);
 
-       ipconfig = __connman_service_get_ip4config(service);
+       if (network->driver == NULL)
+               return;
 
-       if (__connman_ipconfig_get_local(ipconfig) == NULL)
-               __connman_service_read_ip4config(service);
+       connman_network_set_connected(network, FALSE);
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
-
-       err = __connman_ipconfig_address_add(ipconfig);
-       if (err < 0)
-               goto err;
-
-       err = __connman_ipconfig_gateway_add(ipconfig);
-       if (err < 0)
-               goto err;
-
-       network->connecting = FALSE;
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+               break;
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               if (network->group != NULL) {
+                       __connman_service_remove_from_network(network);
 
-       connman_network_set_associating(network, FALSE);
+                       g_free(network->group);
+                       network->group = NULL;
+               }
+               break;
+       }
 
-       return;
+       if (network->driver->remove)
+               network->driver->remove(network);
 
-err:
-       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-       return;
+       network->driver = NULL;
 }
 
-static int set_connected_dhcp(struct connman_network *network)
+static void network_change(struct connman_network *network)
 {
-       int err;
+       DBG("network %p name %s", network, network->name);
 
-       DBG("network %p", network);
+       if (network->connected == FALSE)
+               return;
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+       connman_device_set_disconnected(network->device, TRUE);
 
-       err = __connman_dhcp_start(network, dhcp_callback);
-       if (err < 0) {
-               connman_error("Can not request DHCP lease");
-               return err;
+       if (network->driver && network->driver->disconnect) {
+               network->driver->disconnect(network);
+               return;
        }
 
-       return 0;
+       network->connected = FALSE;
 }
 
-static int manual_ipv6_set(struct connman_network *network,
-                               struct connman_ipconfig *ipconfig_ipv6)
+static void probe_driver(struct connman_network_driver *driver)
 {
-       struct connman_service *service;
-       int err;
-
-       DBG("network %p ipv6 %p", network, ipconfig_ipv6);
-
-       service = connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return -EINVAL;
-
-       if (__connman_ipconfig_get_local(ipconfig_ipv6) == NULL)
-               __connman_service_read_ip6config(service);
-
-       __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
-
-       err = __connman_ipconfig_address_add(ipconfig_ipv6);
-       if (err < 0) {
-               connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-               return err;
-       }
+       GSList *list;
 
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
-       if (err < 0)
-               return err;
+       DBG("driver %p name %s", driver, driver->name);
 
-       __connman_connection_gateway_activate(service,
-                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+       for (list = network_list; list != NULL; list = list->next) {
+               struct connman_network *network = list->data;
 
-       __connman_device_set_network(network->device, network);
+               if (network->driver != NULL)
+                       continue;
 
-       connman_device_set_disconnected(network->device, FALSE);
+               if (driver->type != network->type)
+                       continue;
 
-       network->connecting = FALSE;
+               if (driver->probe(network) < 0)
+                       continue;
 
-       return 0;
+               network->driver = driver;
+       }
 }
 
-static void stop_dhcpv6(struct connman_network *network)
+static void remove_driver(struct connman_network_driver *driver)
 {
-       __connman_dhcpv6_stop(network);
-}
+       GSList *list;
 
-static void dhcpv6_release_callback(struct connman_network *network,
-                               connman_bool_t success)
-{
-       DBG("success %d", success);
+       DBG("driver %p name %s", driver, driver->name);
 
-       stop_dhcpv6(network);
-}
+       for (list = network_list; list != NULL; list = list->next) {
+               struct connman_network *network = list->data;
 
-static void release_dhcpv6(struct connman_network *network)
-{
-       __connman_dhcpv6_start_release(network, dhcpv6_release_callback);
-       stop_dhcpv6(network);
+               if (network->driver == driver)
+                       network_remove(network);
+       }
 }
 
-static void dhcpv6_info_callback(struct connman_network *network,
-                               connman_bool_t success)
+static gint compare_priority(gconstpointer a, gconstpointer b)
 {
-       DBG("success %d", success);
+       const struct connman_network_driver *driver1 = a;
+       const struct connman_network_driver *driver2 = b;
 
-       stop_dhcpv6(network);
+       return driver2->priority - driver1->priority;
 }
 
-static gboolean dhcpv6_set_addresses(struct connman_network *network)
+/**
+ * connman_network_driver_register:
+ * @driver: network driver definition
+ *
+ * Register a new network driver
+ *
+ * Returns: %0 on success
+ */
+int connman_network_driver_register(struct connman_network_driver *driver)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv6;
-       int err = -EINVAL;
+       GSList *list;
 
-       service = connman_service_lookup_from_network(network);
-       if (service == NULL)
-               goto err;
+       DBG("driver %p name %s", driver, driver->name);
 
-       connman_network_set_associating(network, FALSE);
+       for (list = driver_list; list; list = list->next) {
+               struct connman_network_driver *tmp = list->data;
 
-       network->connecting = FALSE;
+               if (tmp->type == driver->type)
+                       return -EALREADY;
 
-       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;
+       driver_list = g_slist_insert_sorted(driver_list, driver,
+                                                       compare_priority);
 
-       return 0;
+       probe_driver(driver);
 
-err:
-       connman_network_set_error(network,
-                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-       return err;
+       return 0;
 }
 
-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.
+/**
+ * connman_network_driver_unregister:
+ * @driver: network driver definition
+ *
+ * Remove a previously registered network driver
  */
-static void dhcpv6_renew_callback(struct connman_network *network,
-                                       connman_bool_t success)
+void connman_network_driver_unregister(struct connman_network_driver *driver)
 {
-       if (success == TRUE)
-               dhcpv6_callback(network, success);
-       else {
-               stop_dhcpv6(network);
+       DBG("driver %p name %s", driver, driver->name);
 
-               /* restart and do solicit again. */
-               autoconf_ipv6_set(network);
-       }
+       driver_list = g_slist_remove(driver_list, driver);
+
+       remove_driver(driver);
 }
 
-static void dhcpv6_callback(struct connman_network *network,
-                                       connman_bool_t success)
+static void network_destruct(struct connman_network *network)
 {
-       DBG("success %d", success);
+       DBG("network %p name %s", network, network->name);
 
-       /* Start the renew process if necessary */
-       if (success == TRUE) {
+       g_free(network->wifi.ssid);
+       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);
+       g_free(network->wifi.private_key_passphrase);
+       g_free(network->wifi.phase2_auth);
+       g_free(network->wifi.pin_wps);
 
-               if (dhcpv6_set_addresses(network) < 0) {
-                       stop_dhcpv6(network);
-                       return;
-               }
+       g_free(network->path);
+       g_free(network->group);
+       g_free(network->node);
+       g_free(network->name);
+       g_free(network->identifier);
 
-               if (__connman_dhcpv6_start_renew(network,
-                                       dhcpv6_renew_callback) == -ETIMEDOUT)
-                       dhcpv6_renew_callback(network, FALSE);
-       } else
-               stop_dhcpv6(network);
+       network->device = NULL;
+
+       g_free(network);
 }
 
-static void check_dhcpv6(struct nd_router_advert *reply,
-                       unsigned int length, void *user_data)
+/**
+ * connman_network_create:
+ * @identifier: network identifier (for example an unqiue name)
+ *
+ * Allocate a new network and assign the #identifier to it.
+ *
+ * Returns: a newly-allocated #connman_network structure
+ */
+struct connman_network *connman_network_create(const char *identifier,
+                                               enum connman_network_type type)
 {
-       struct connman_network *network = user_data;
-       GSList *prefixes;
+       struct connman_network *network;
+       char *ident;
 
-       DBG("reply %p", reply);
+       DBG("identifier %s type %d", identifier, type);
 
-       if (reply == NULL) {
-               /*
-                * Router solicitation message seem to get lost easily so
-                * try to send it again.
-                */
-               if (network->router_solicit_count > 0) {
-                       DBG("re-send router solicitation %d",
-                                               network->router_solicit_count);
-                       network->router_solicit_count--;
-                       __connman_inet_ipv6_send_rs(network->index, 1,
-                                               check_dhcpv6, network);
-                       return;
-               }
-               connman_network_unref(network);
-               return;
+       network = g_try_new0(struct connman_network, 1);
+       if (network == NULL)
+               return NULL;
+
+       DBG("network %p", network);
+
+       network->refcount = 1;
+
+       ident = g_strdup(identifier);
+
+       if (ident == NULL) {
+               g_free(network);
+               return NULL;
        }
 
-       network->router_solicit_count = 0;
+       network->type       = type;
+       network->identifier = ident;
 
-       /*
-        * If we were disconnected while waiting router advertisement,
-        * we just quit and do not start DHCPv6
-        */
-       if (network->connected == FALSE) {
-               connman_network_unref(network);
+       network_list = g_slist_prepend(network_list, network);
+
+       return network;
+}
+
+/**
+ * connman_network_ref:
+ * @network: network structure
+ *
+ * Increase reference counter of  network
+ */
+struct connman_network *
+connman_network_ref_debug(struct connman_network *network,
+                       const char *file, int line, const char *caller)
+{
+       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);
+
+       return network;
+}
+
+/**
+ * connman_network_unref:
+ * @network: network structure
+ *
+ * Decrease reference counter of network
+ */
+void connman_network_unref_debug(struct connman_network *network,
+                               const char *file, int line, const char *caller)
+{
+       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;
-       }
 
-       prefixes = __connman_inet_ipv6_get_prefixes(reply, length);
+       network_list = g_slist_remove(network_list, network);
 
-       /*
-        * 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);
+       network_destruct(network);
+}
 
-       connman_network_unref(network);
+const char *__connman_network_get_type(struct connman_network *network)
+{
+       return type2string(network->type);
 }
 
-static void receive_refresh_rs_reply(struct nd_router_advert *reply,
-               unsigned int length, void *user_data)
+/**
+ * connman_network_get_type:
+ * @network: network structure
+ *
+ * Get type of network
+ */
+enum connman_network_type connman_network_get_type(struct connman_network *network)
 {
-       struct connman_network *network = user_data;
+       return network->type;
+}
 
-       DBG("reply %p", reply);
+/**
+ * connman_network_get_identifier:
+ * @network: network structure
+ *
+ * Get identifier of network
+ */
+const char *connman_network_get_identifier(struct connman_network *network)
+{
+       return network->identifier;
+}
 
-       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;
-               }
+/**
+ * connman_network_set_index:
+ * @network: network structure
+ * @index: index number
+ *
+ * Set index number of network
+ */
+void connman_network_set_index(struct connman_network *network, int index)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
+               goto done;
+
+       ipconfig = __connman_service_get_ip4config(service);
+       if (ipconfig == NULL)
+               goto done;
+
+       /* If index changed, the index of ipconfig must be reset. */
+       __connman_ipconfig_set_index(ipconfig, index);
+
+       DBG("index %d service %p ip4config %p", network->index,
+               service, ipconfig);
+done:
+       network->index = index;
+}
+
+/**
+ * connman_network_get_index:
+ * @network: network structure
+ *
+ * Get index number of network
+ */
+int connman_network_get_index(struct connman_network *network)
+{
+       return network->index;
+}
+
+/**
+ * connman_network_set_group:
+ * @network: network structure
+ * @group: group name
+ *
+ * Set group name for automatic clustering
+ */
+void connman_network_set_group(struct connman_network *network,
+                                                       const char *group)
+{
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+               return;
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               break;
        }
 
-       /* RS refresh not in progress anymore */
-       network->router_solicit_refresh_count = 0;
+       if (g_strcmp0(network->group, group) == 0) {
+               if (group != NULL)
+                       __connman_service_update_from_network(network);
+               return;
+       }
 
-       connman_network_unref(network);
-       return;
+       if (network->group != NULL) {
+               __connman_service_remove_from_network(network);
+
+               g_free(network->group);
+       }
+
+       network->group = g_strdup(group);
+
+       if (network->group != NULL)
+               network_probe(network);
 }
 
-int __connman_refresh_rs_ipv6(struct connman_network *network, int index)
+/**
+ * connman_network_get_group:
+ * @network: network structure
+ *
+ * Get group name for automatic clustering
+ */
+const char *connman_network_get_group(struct connman_network *network)
 {
-       int ret = 0;
+       return network->group;
+}
 
-       DBG("network %p index %d", network, index);
+const char *__connman_network_get_ident(struct connman_network *network)
+{
+       if (network->device == NULL)
+               return NULL;
 
-       /* 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;
+       return connman_device_get_ident(network->device);
+}
+
+connman_bool_t __connman_network_get_weakness(struct connman_network *network)
+{
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+               break;
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               if (g_strcmp0(network->wifi.mode, "adhoc") == 0)
+                       return TRUE;
+               if (network->strength > 0 && network->strength < 20)
+                       return TRUE;
+               break;
        }
 
-       network->router_solicit_refresh_count = RS_REFRESH_COUNT;
+       return FALSE;
+}
 
-       connman_network_ref(network);
+connman_bool_t connman_network_get_connecting(struct connman_network *network)
+{
+       return network->connecting;
+}
 
-       ret = __connman_inet_ipv6_send_rs(index, RS_REFRESH_TIMEOUT,
-                       receive_refresh_rs_reply, network);
-       return ret;
+/**
+ * connman_network_set_available:
+ * @network: network structure
+ * @available: availability state
+ *
+ * Change availability state of network (in range)
+ */
+int connman_network_set_available(struct connman_network *network,
+                                               connman_bool_t available)
+{
+       DBG("network %p available %d", network, available);
+
+       if (network->available == available)
+               return -EALREADY;
+
+       network->available = available;
+
+       return 0;
+}
+
+/**
+ * connman_network_get_available:
+ * @network: network structure
+ *
+ * Get network available setting
+ */
+connman_bool_t connman_network_get_available(struct connman_network *network)
+{
+       return network->available;
 }
 
-static void autoconf_ipv6_set(struct connman_network *network)
-{
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
-       int index;
+/**
+ * connman_network_set_associating:
+ * @network: network structure
+ * @associating: associating state
+ *
+ * Change associating state of network
+ */
+int connman_network_set_associating(struct connman_network *network,
+                                               connman_bool_t associating)
+{
+       DBG("network %p associating %d", network, associating);
+
+       if (network->associating == associating)
+               return -EALREADY;
+
+       network->associating = associating;
 
-       DBG("network %p", network);
+       if (associating == TRUE) {
+               struct connman_service *service;
 
-       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;
+               service = connman_service_lookup_from_network(network);
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
        }
 
-       __connman_device_set_network(network->device, network);
-
-       connman_device_set_disconnected(network->device, FALSE);
+       return 0;
+}
 
-       network->connecting = FALSE;
+static void set_associate_error(struct connman_network *network)
+{
+       struct connman_service *service;
 
        service = connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return;
 
-       ipconfig = __connman_service_get_ip6config(service);
-       if (ipconfig == NULL)
-               return;
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+}
 
-       index = __connman_ipconfig_get_index(ipconfig);
+static void set_configure_error(struct connman_network *network)
+{
+       struct connman_service *service;
 
-       connman_network_ref(network);
+       service = connman_service_lookup_from_network(network);
 
-       /* Try to get stateless DHCPv6 information, RFC 3736 */
-       network->router_solicit_count = 3;
-       __connman_inet_ipv6_send_rs(index, 1, check_dhcpv6, network);
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
 }
 
-static void set_connected(struct connman_network *network)
+static void set_invalid_key_error(struct connman_network *network)
 {
-       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);
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_INVALID_KEY);
+}
 
-       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
-               ipconfig_ipv6);
+static void set_connect_error(struct connman_network *network)
+{
+       struct connman_service *service;
 
-       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
-       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+       service = connman_service_lookup_from_network(network);
 
-       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+}
 
-       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;
-               }
-               break;
-       }
+void connman_network_set_ipv4_method(struct connman_network *network,
+                                       enum connman_ipconfig_method method)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
 
-       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;
-               }
-               return;
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               set_connected_manual(network);
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
                return;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               if (set_connected_dhcp(network) < 0) {
-                       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
-               }
-       }
 
-       network->connecting = FALSE;
+       ipconfig = __connman_service_get_ip4config(service);
+       if (ipconfig == NULL)
+               return;
 
-       connman_network_set_associating(network, FALSE);
+       __connman_ipconfig_set_method(ipconfig, method);
 }
 
-static void set_disconnected(struct connman_network *network)
+void connman_network_set_ipv6_method(struct connman_network *network,
+                                       enum connman_ipconfig_method method)
 {
-       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
-       enum connman_ipconfig_method ipv4_method, ipv6_method;
-       enum connman_service_state state;
        struct connman_service *service;
-
-       if (network->connected == FALSE)
-               return;
-
-       network->connected = FALSE;
+       struct connman_ipconfig *ipconfig;
 
        service = connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       ipconfig_ipv6 = __connman_service_get_ip6config(service);
-
-       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
-               ipconfig_ipv6);
-
-       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
-       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+       ipconfig = __connman_service_get_ip6config(service);
+       if (ipconfig == NULL)
+               return;
 
-       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+       __connman_ipconfig_set_method(ipconfig, method);
+}
 
-       /*
-        * Resetting solicit count here will prevent the RS resend loop
-        * from sending packets in check_dhcpv6()
-        */
-       network->router_solicit_count = 0;
+void connman_network_set_error(struct connman_network *network,
+                                       enum connman_network_error error)
+{
+       DBG("network %p error %d", network, error);
 
-       __connman_device_set_network(network->device, NULL);
+       network->connecting = FALSE;
+       network->associating = FALSE;
 
-       switch (ipv6_method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+       switch (error) {
+       case CONNMAN_NETWORK_ERROR_UNKNOWN:
+               return;
+       case CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL:
+               set_associate_error(network);
                break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-               release_dhcpv6(network);
+       case CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL:
+               set_configure_error(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:
+       case CONNMAN_NETWORK_ERROR_INVALID_KEY:
+               set_invalid_key_error(network);
                break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               __connman_dhcp_stop(network);
+       case CONNMAN_NETWORK_ERROR_CONNECT_FAIL:
+               set_connect_error(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_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_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);
+       network_change(network);
+}
 
-       /*
-        * 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);
-       }
+void connman_network_clear_error(struct connman_network *network)
+{
+       struct connman_service *service;
 
-       __connman_service_ipconfig_indicate_state(service,
-                                               CONNMAN_SERVICE_STATE_IDLE,
-                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+       DBG("network %p", network);
 
-       __connman_service_ipconfig_indicate_state(service,
-                                               CONNMAN_SERVICE_STATE_IDLE,
-                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+       if (network == NULL)
+               return;
 
-       network->connecting = FALSE;
+       if (network->connecting == TRUE || network->associating == TRUE)
+               return;
 
-       connman_network_set_associating(network, FALSE);
+       service = connman_service_lookup_from_network(network);
+       __connman_service_clear_error(service);
 }
 
 /**