X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=bf017676498d80eadda82a75870ac14d1c7876d2;hb=af22afbaf54aaadb85d6df5d60c5b43f37ea5fc0;hp=83ba5181687b52eb4a77a1ca2962a39002e89352;hpb=e4932cc390e77c7af2f7085e1caedad44b3420f2;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/network.c b/src/network.c
index 83ba518..bf01767 100644
--- a/src/network.c
+++ b/src/network.c
@@ -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
@@ -28,21 +28,38 @@
 
 #include "connman.h"
 
-static unsigned int hidden_counter = 0;
+/*
+ * 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;
 
 struct connman_network {
-	struct connman_element element;
+	int refcount;
 	enum connman_network_type type;
 	connman_bool_t available;
 	connman_bool_t connected;
 	connman_bool_t roaming;
-	connman_bool_t hidden;
 	connman_uint8_t strength;
 	connman_uint16_t frequency;
 	char *identifier;
 	char *name;
 	char *node;
 	char *group;
+	char *path;
+	int index;
+	int router_solicit_count;
+	int router_solicit_refresh_count;
 
 	struct connman_network_driver *driver;
 	void *driver_data;
@@ -59,8 +76,10 @@ struct connman_network {
 		unsigned short channel;
 		char *security;
 		char *passphrase;
+		char *agent_passphrase;
 		char *eap;
 		char *identity;
+		char *agent_identity;
 		char *ca_cert_path;
 		char *client_cert_path;
 		char *private_key_path;
@@ -70,6 +89,11 @@ struct connman_network {
 		connman_bool_t use_wps;
 		char *pin_wps;
 	} wifi;
+
+	struct {
+		char *nsp_name;
+		int nsp_name_len;
+	} wimax;
 };
 
 static const char *type2string(enum connman_network_type type)
@@ -94,15 +118,152 @@ static const char *type2string(enum connman_network_type type)
 	return NULL;
 }
 
-connman_bool_t __connman_network_has_driver(struct connman_network *network)
+static gboolean match_driver(struct connman_network *network,
+					struct connman_network_driver *driver)
 {
-	if (network == NULL || network->driver == NULL)
-		return FALSE;
+	if (network->type == driver->type ||
+			driver->type == CONNMAN_NETWORK_TYPE_UNKNOWN)
+		return TRUE;
 
-	return TRUE;
+	return FALSE;
 }
 
-static GSList *driver_list = NULL;
+static int network_probe(struct connman_network *network)
+{
+	GSList *list;
+	struct connman_network_driver *driver = NULL;
+
+	DBG("network %p name %s", network, network->name);
+
+	if (network->driver != NULL)
+		return -EALREADY;
+
+	for (list = driver_list; list; list = list->next) {
+		driver = list->data;
+
+		if (match_driver(network, driver) == FALSE)
+			continue;
+
+		DBG("driver %p name %s", driver, driver->name);
+
+		if (driver->probe(network) == 0)
+			break;
+
+		driver = NULL;
+	}
+
+	if (driver == NULL)
+		return -ENODEV;
+
+	if (network->group == NULL)
+		return -EINVAL;
+
+	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:
+	case CONNMAN_NETWORK_TYPE_WIMAX:
+		network->driver = driver;
+		if (__connman_service_create_from_network(network) == NULL) {
+			network->driver = NULL;
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+static void network_remove(struct connman_network *network)
+{
+	DBG("network %p name %s", network, network->name);
+
+	if (network->driver == 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:
+	case CONNMAN_NETWORK_TYPE_WIMAX:
+		if (network->group != NULL) {
+			__connman_service_remove_from_network(network);
+
+			g_free(network->group);
+			network->group = NULL;
+		}
+		break;
+	}
+
+	if (network->driver->remove)
+		network->driver->remove(network);
+
+	network->driver = NULL;
+}
+
+static void network_change(struct connman_network *network)
+{
+	DBG("network %p name %s", network, network->name);
+
+	if (network->connected == FALSE)
+		return;
+
+	connman_device_set_disconnected(network->device, TRUE);
+
+	if (network->driver && network->driver->disconnect) {
+		network->driver->disconnect(network);
+		return;
+	}
+
+	network->connected = FALSE;
+}
+
+static void probe_driver(struct connman_network_driver *driver)
+{
+	GSList *list;
+
+	DBG("driver %p name %s", driver, driver->name);
+
+	for (list = network_list; list != NULL; list = list->next) {
+		struct connman_network *network = list->data;
+
+		if (network->driver != NULL)
+			continue;
+
+		if (driver->type != network->type)
+			continue;
+
+		if (driver->probe(network) < 0)
+			continue;
+
+		network->driver = driver;
+	}
+}
+
+static void remove_driver(struct connman_network_driver *driver)
+{
+	GSList *list;
+
+	DBG("driver %p name %s", driver, driver->name);
+
+	for (list = network_list; list != NULL; list = list->next) {
+		struct connman_network *network = list->data;
+
+		if (network->driver == driver)
+			network_remove(network);
+	}
+}
 
 static gint compare_priority(gconstpointer a, gconstpointer b)
 {
@@ -137,6 +298,8 @@ int connman_network_driver_register(struct connman_network_driver *driver)
 	driver_list = g_slist_insert_sorted(driver_list, driver,
 							compare_priority);
 
+	probe_driver(driver);
+
 	return 0;
 }
 
@@ -151,20 +314,22 @@ void connman_network_driver_unregister(struct connman_network_driver *driver)
 	DBG("driver %p name %s", driver, driver->name);
 
 	driver_list = g_slist_remove(driver_list, driver);
+
+	remove_driver(driver);
 }
 
-static void network_destruct(struct connman_element *element)
+static void network_destruct(struct connman_network *network)
 {
-	struct connman_network *network = element->network;
-
-	DBG("element %p name %s", element, element->name);
+	DBG("network %p name %s", network, network->name);
 
 	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);
@@ -172,12 +337,15 @@ static void network_destruct(struct connman_element *element)
 	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);
 }
 
 /**
@@ -192,9 +360,7 @@ struct connman_network *connman_network_create(const char *identifier,
 						enum connman_network_type type)
 {
 	struct connman_network *network;
-	connman_uint8_t strength = 0;
-	const char *str;
-	char *temp;
+	char *ident;
 
 	DBG("identifier %s type %d", identifier, type);
 
@@ -204,33 +370,19 @@ struct connman_network *connman_network_create(const char *identifier,
 
 	DBG("network %p", network);
 
-	__connman_element_initialize(&network->element);
+	network->refcount = 1;
 
-	if (identifier == NULL) {
-		temp = g_strdup_printf("hidden_%d", hidden_counter++);
-		network->hidden = TRUE;
-	} else
-		temp = g_strdup(identifier);
+	ident = g_strdup(identifier);
 
-	if (temp == NULL) {
+	if (ident == NULL) {
 		g_free(network);
 		return NULL;
 	}
 
-	network->element.name = temp;
-	network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK;
-
-	network->element.network = network;
-	network->element.destruct = network_destruct;
-
-	str = type2string(type);
-	if (str != NULL)
-		connman_element_set_string(&network->element, "Type", str);
-
-	connman_element_set_uint8(&network->element, "Strength", strength);
-
 	network->type       = type;
-	network->identifier = g_strdup(temp);
+	network->identifier = ident;
+
+	network_list = g_slist_append(network_list, network);
 
 	return network;
 }
@@ -241,10 +393,14 @@ 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)
 {
-	if (connman_element_ref(&network->element) == NULL)
-		return NULL;
+	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;
 }
@@ -255,9 +411,18 @@ 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)
 {
-	connman_element_unref(&network->element);
+	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);
+
+	network_destruct(network);
 }
 
 const char *__connman_network_get_type(struct connman_network *network)
@@ -305,10 +470,10 @@ void connman_network_set_index(struct connman_network *network, int index)
 
 	ipconfig = __connman_service_get_ip4config(service);
 
-	DBG("index %d service %p ip4config %p", network->element.index,
+	DBG("index %d service %p ip4config %p", network->index,
 		service, ipconfig);
 
-	if (network->element.index < 0 && ipconfig == NULL) {
+	if (network->index < 0 && ipconfig == NULL) {
 
 		ipconfig = __connman_service_get_ip4config(service);
 		if (ipconfig == NULL)
@@ -330,7 +495,7 @@ void connman_network_set_index(struct connman_network *network, int index)
 	}
 
 done:
-	network->element.index = index;
+	network->index = index;
 }
 
 /**
@@ -341,19 +506,7 @@ done:
  */
 int connman_network_get_index(struct connman_network *network)
 {
-	return network->element.index;
-}
-
-/**
- * connman_network_get_element:
- * @network: network structure
- *
- * Get connman_element of network
- */
-struct connman_element *connman_network_get_element(
-				struct connman_network *network)
-{
-	return &network->element;
+	return network->index;
 }
 
 /**
@@ -381,12 +534,12 @@ void connman_network_set_group(struct connman_network *network,
 
 	if (g_strcmp0(network->group, group) == 0) {
 		if (group != NULL)
-			__connman_profile_update_network(network);
+			__connman_service_update_from_network(network);
 		return;
 	}
 
 	if (network->group != NULL) {
-		__connman_profile_remove_network(network);
+		__connman_service_remove_from_network(network);
 
 		g_free(network->group);
 	}
@@ -394,7 +547,7 @@ void connman_network_set_group(struct connman_network *network,
 	network->group = g_strdup(group);
 
 	if (network->group != NULL)
-			__connman_profile_add_network(network);
+		network_probe(network);
 }
 
 /**
@@ -438,7 +591,7 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network)
 	return FALSE;
 }
 
-connman_bool_t __connman_network_get_connecting(struct connman_network *network)
+connman_bool_t connman_network_get_connecting(struct connman_network *network)
 {
 	return network->connecting;
 }
@@ -471,9 +624,6 @@ int connman_network_set_available(struct connman_network *network,
  */
 connman_bool_t connman_network_get_available(struct connman_network *network)
 {
-	if (network->hidden == TRUE)
-		return TRUE;
-
 	return network->available;
 }
 
@@ -498,9 +648,12 @@ int connman_network_set_associating(struct connman_network *network,
 		struct connman_service *service;
 
 		service = __connman_service_lookup_from_network(network);
-		__connman_service_indicate_state(service,
+		__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);
 	}
 
 	return 0;
@@ -510,29 +663,20 @@ static void set_associate_error(struct connman_network *network)
 {
 	struct connman_service *service;
 
-	if (network->associating == FALSE)
-		return ;
-
-	network->associating = FALSE;
-
 	service = __connman_service_lookup_from_network(network);
 
-	__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_FAILURE,
-					CONNMAN_IPCONFIG_TYPE_IPV4);
+	__connman_service_indicate_error(service,
+					CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
 }
 
 static void set_configure_error(struct connman_network *network)
 {
 	struct connman_service *service;
 
-	network->connecting = FALSE;
-
 	service = __connman_service_lookup_from_network(network);
 
-	__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_FAILURE,
-					CONNMAN_IPCONFIG_TYPE_IPV4);
+	__connman_service_indicate_error(service,
+					CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
 }
 
 static void set_invalid_key_error(struct connman_network *network)
@@ -545,14 +689,22 @@ static void set_invalid_key_error(struct connman_network *network)
 					CONNMAN_SERVICE_ERROR_INVALID_KEY);
 }
 
+static void set_connect_error(struct connman_network *network)
+{
+	struct connman_service *service;
+
+	service = __connman_service_lookup_from_network(network);
+
+	__connman_service_indicate_error(service,
+					CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+}
+
 void connman_network_set_ipv4_method(struct connman_network *network,
 					enum connman_ipconfig_method method)
 {
 	struct connman_service *service;
 	struct connman_ipconfig *ipconfig;
 
-	network->element.ipv4.method = method;
-
 	service = __connman_service_lookup_from_network(network);
 	if (service == NULL)
 		return;
@@ -561,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,
@@ -570,8 +722,6 @@ void connman_network_set_ipv6_method(struct connman_network *network,
 	struct connman_service *service;
 	struct connman_ipconfig *ipconfig;
 
-	network->element.ipv6.method = method;
-
 	service = __connman_service_lookup_from_network(network);
 	if (service == NULL)
 		return;
@@ -580,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,
@@ -589,6 +739,7 @@ void connman_network_set_error(struct connman_network *network,
 	DBG("nework %p, error %d", network, error);
 
 	network->connecting = FALSE;
+	network->associating = FALSE;
 
 	switch (error) {
 	case CONNMAN_NETWORK_ERROR_UNKNOWN:
@@ -602,7 +753,12 @@ void connman_network_set_error(struct connman_network *network,
 	case CONNMAN_NETWORK_ERROR_INVALID_KEY:
 		set_invalid_key_error(network);
 		break;
+	case CONNMAN_NETWORK_ERROR_CONNECT_FAIL:
+		set_connect_error(network);
+		break;
 	}
+
+	network_change(network);
 }
 
 void connman_network_clear_error(struct connman_network *network)
@@ -621,70 +777,119 @@ void connman_network_clear_error(struct connman_network *network)
 	__connman_service_clear_error(service);
 }
 
-static void set_configuration(struct connman_network *network)
+static void set_configuration(struct connman_network *network,
+			enum connman_ipconfig_type type)
 {
 	struct connman_service *service;
 
 	DBG("network %p", network);
 
-	__connman_device_increase_connections(network->device);
+	if (network->device == NULL)
+		return;
 
 	__connman_device_set_network(network->device, network);
 
 	connman_device_set_disconnected(network->device, FALSE);
 
 	service = __connman_service_lookup_from_network(network);
-	__connman_service_indicate_state(service,
+	__connman_service_ipconfig_indicate_state(service,
 					CONNMAN_SERVICE_STATE_CONFIGURATION,
-					CONNMAN_IPCONFIG_TYPE_IPV4);
+					type);
 }
 
-static int set_connected_fixed(struct connman_network *network)
+static void dhcp_success(struct connman_network *network)
 {
 	struct connman_service *service;
-	struct connman_element *parent, *element;
+	struct connman_ipconfig *ipconfig_ipv4;
+	int err;
 
-	DBG("");
+	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
+		goto err;
+
+	connman_network_set_associating(network, FALSE);
+
+	network->connecting = FALSE;
+
+	ipconfig_ipv4 = __connman_service_get_ip4config(service);
+	err = __connman_ipconfig_address_add(ipconfig_ipv4);
+	if (err < 0)
+		goto err;
+
+	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 dhcp_failure(struct connman_network *network)
+{
+	struct connman_service *service;
 
 	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
+		return;
 
-	parent = connman_network_get_element(network);
+	__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_IDLE,
+					CONNMAN_IPCONFIG_TYPE_IPV4);
+}
 
-	set_configuration(network);
+static void dhcp_callback(struct connman_network *network,
+			connman_bool_t success)
+{
+	DBG("success %d", success);
 
-	if (parent->ipv4.address == NULL)
-		return -EINVAL;
+	if (success == TRUE)
+		dhcp_success(network);
+	else
+		dhcp_failure(network);
+}
 
-	if (parent->ipv4.netmask == NULL)
-		return -EINVAL;
+static int set_connected_fixed(struct connman_network *network)
+{
+	struct connman_service *service;
+	struct connman_ipconfig *ipconfig_ipv4;
+	int err;
 
-	element = connman_element_create(NULL);
-	if (element == NULL) {
-		connman_error("Can not create connman_element");
-		return -ENOMEM;
-	}
+	DBG("");
 
-	element->type = CONNMAN_ELEMENT_TYPE_IPV4;
-	element->index = parent->index;
+	service = __connman_service_lookup_from_network(network);
 
-	if (connman_element_register(element, parent) < 0) {
-		connman_error("Can not register connman_element");
-		return -EINVAL;
-	}
+	ipconfig_ipv4 = __connman_service_get_ip4config(service);
+
+	set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
 
 	network->connecting = FALSE;
 
 	connman_network_set_associating(network, FALSE);
 
+	err = __connman_ipconfig_address_add(ipconfig_ipv4);
+	if (err < 0)
+		goto err;
+
+	err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+	if (err < 0)
+		goto err;
+
 	return 0;
+
+err:
+	connman_network_set_error(network,
+			CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+
+	return err;
 }
 
 static void set_connected_manual(struct connman_network *network)
 {
 	struct connman_service *service;
 	struct connman_ipconfig *ipconfig;
-	const char *nameserver = NULL;
-	const char *gateway;
 	int err;
 
 	DBG("network %p", network);
@@ -693,32 +898,24 @@ static void set_connected_manual(struct connman_network *network)
 
 	ipconfig = __connman_service_get_ip4config(service);
 
-	set_configuration(network);
+	if (__connman_ipconfig_get_local(ipconfig) == NULL)
+		__connman_service_read_ip4config(service);
+
+	set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
 
 	err = __connman_ipconfig_address_add(ipconfig);
 	if (err < 0)
 		goto err;
 
-	connman_element_get_value(&network->element,
-			CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver);
-	if (nameserver != NULL)
-		__connman_service_nameserver_append(service, nameserver);
-
-	connman_element_get_value(&network->element,
-				CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
-	if (gateway != NULL) {
-		__connman_ipconfig_set_gateway(ipconfig, gateway);
-		err = __connman_ipconfig_gateway_add(ipconfig);
-		if (err < 0)
-			goto err;
-	}
+	err = __connman_ipconfig_gateway_add(ipconfig);
+	if (err < 0)
+		goto err;
 
 	network->connecting = FALSE;
 
 	connman_network_set_associating(network, FALSE);
 
-	__connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY,
-					CONNMAN_IPCONFIG_TYPE_IPV4);
+	return;
 
 err:
 	connman_network_set_error(network,
@@ -728,26 +925,18 @@ err:
 
 static int set_connected_dhcp(struct connman_network *network)
 {
-	struct connman_element *element;
-	int error;
+	int err;
 
 	DBG("network %p", network);
 
-	element = connman_element_create(NULL);
-	if (element == NULL)
-		return -ENOMEM;
+	set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
 
-	element->type  = CONNMAN_ELEMENT_TYPE_DHCP;
-	element->index = network->element.index;
-
-	error = connman_element_register(element, &network->element);
-	if (error < 0) {
-		connman_element_unref(element);
-		return error;
+	err = __connman_dhcp_start(network, dhcp_callback);
+	if (err < 0) {
+		connman_error("Can not request DHCP lease");
+		return err;
 	}
 
-	set_configuration(network);
-
 	return 0;
 }
 
@@ -757,10 +946,15 @@ static int manual_ipv6_set(struct connman_network *network,
 	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);
+
 	err = __connman_ipconfig_address_add(ipconfig_ipv6);
 	if (err < 0) {
 		connman_network_set_error(network,
@@ -768,50 +962,275 @@ static int manual_ipv6_set(struct connman_network *network,
 		return err;
 	}
 
-	/*
-	 * READY state will be indicated by IPV4 setting
-	 * gateway will be set by IPV4 setting
-	 */
+	err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+	if (err < 0)
+		return err;
+
+	__connman_connection_gateway_activate(service,
+						CONNMAN_IPCONFIG_TYPE_IPV6);
+
+	__connman_device_set_network(network->device, network);
+
+	connman_device_set_disconnected(network->device, FALSE);
+
+	network->connecting = FALSE;
 
 	return 0;
 }
 
-static void autoconf_ipv6_set(struct connman_network *network)
+static void stop_dhcpv6(struct connman_network *network)
 {
-	struct connman_service *service;
-	struct connman_ipconfig *ipconfig;
-	const char *nameserver = NULL;
+	__connman_dhcpv6_stop(network);
+}
 
-	DBG("network %p", network);
+static void dhcpv6_release_callback(struct connman_network *network,
+				connman_bool_t success)
+{
+	DBG("success %d", success);
 
-	service = __connman_service_lookup_from_network(network);
+	stop_dhcpv6(network);
+}
 
-	ipconfig = __connman_service_get_ip6config(service);
+static void release_dhcpv6(struct connman_network *network)
+{
+	__connman_dhcpv6_start_release(network, dhcpv6_release_callback);
+	stop_dhcpv6(network);
+}
 
-	__connman_device_increase_connections(network->device);
+static void dhcpv6_info_callback(struct connman_network *network,
+				connman_bool_t success)
+{
+	DBG("success %d", success);
 
-	__connman_device_set_network(network->device, network);
+	stop_dhcpv6(network);
+}
 
-	connman_device_set_disconnected(network->device, FALSE);
+static gboolean dhcpv6_set_addresses(struct connman_network *network)
+{
+	struct connman_service *service;
+	struct connman_ipconfig *ipconfig_ipv6;
+	int err = -EINVAL;
 
-	connman_element_get_value(&network->element,
-			CONNMAN_PROPERTY_ID_IPV6_NAMESERVER, &nameserver);
-	if (nameserver != NULL)
-		__connman_service_nameserver_append(service, nameserver);
+	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
+		goto err;
+
+	connman_network_set_associating(network, FALSE);
 
 	network->connecting = FALSE;
 
-	__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_READY,
-					CONNMAN_IPCONFIG_TYPE_IPV6);
+	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);
+
+	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->router_solicit_count = 0;
+
+	/*
+	 * 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 gboolean set_connected(gpointer user_data)
+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;
+	struct connman_ipconfig *ipconfig;
+	int index;
+
+	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);
+
+	network->connecting = FALSE;
+
+	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
+		return;
+
+	ipconfig = __connman_service_get_ip6config(service);
+	if (ipconfig == NULL)
+		return;
+
+	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);
+}
+
+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;
+	int ret;
+
+	if (network->connected == TRUE)
+		return;
+
+	network->connected = TRUE;
 
 	service = __connman_service_lookup_from_network(network);
 
@@ -825,85 +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 {
-		struct connman_service *service;
+	network->connecting = FALSE;
 
-		connman_element_unregister_children(&network->element);
+	connman_network_set_associating(network, FALSE);
+}
 
-		__connman_device_set_network(network->device, NULL);
-		network->hidden = FALSE;
+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;
 
-		service = __connman_service_lookup_from_network(network);
+	if (network->connected == FALSE)
+		return;
 
-		__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_IDLE,
+	network->connected = FALSE;
+
+	service = __connman_service_lookup_from_network(network);
+
+	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);
+
+	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_DISCONNECT,
 					CONNMAN_IPCONFIG_TYPE_IPV4);
 
-		/* TODO: eventually the IPv6 disconnect state should be handled
-		 * in connection.c
-		 */
-		__connman_service_indicate_state(service,
+	state = __connman_service_ipconfig_get_state(service,
+						CONNMAN_IPCONFIG_TYPE_IPV6);
+	if (state != CONNMAN_SERVICE_STATE_IDLE &&
+				state != CONNMAN_SERVICE_STATE_FAILURE)
+		__connman_service_ipconfig_indicate_state(service,
 					CONNMAN_SERVICE_STATE_DISCONNECT,
 					CONNMAN_IPCONFIG_TYPE_IPV6);
 
-		__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_IDLE,
-					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;
 }
 
 /**
@@ -916,24 +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_element_set_error(&network->element,
-					CONNMAN_ELEMENT_ERROR_CONNECT_FAILED);
-		__connman_network_disconnect(network);
+		connman_network_set_error(network,
+					CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
+		if (__connman_network_disconnect(network) == 0)
+			return 0;
 	}
 
 	if (network->connected == connected)
 		return -EALREADY;
 
 	if (connected == FALSE)
-		__connman_device_decrease_connections(network->device);
-
-	network->connected = connected;
-
-	set_connected(network);
+		set_disconnected(network);
+	else
+		set_connected(network);
 
 	return 0;
 }
@@ -960,6 +1455,59 @@ connman_bool_t connman_network_get_associating(struct connman_network *network)
 	return network->associating;
 }
 
+void connman_network_clear_hidden(void *user_data)
+{
+	if (user_data == NULL)
+		return;
+
+	DBG("user_data %p", user_data);
+
+	/*
+	 * Hidden service does not have a connect timeout so
+	 * we do not need to remove it. We can just return
+	 * error to the caller telling that we could not find
+	 * any network that we could connect to.
+	 */
+	__connman_service_reply_dbus_pending(user_data, EIO);
+}
+
+int connman_network_connect_hidden(struct connman_network *network,
+			char *identity, char* passphrase, void *user_data)
+{
+	int err = 0;
+	struct connman_service *service;
+
+	service = __connman_service_lookup_from_network(network);
+
+	DBG("network %p service %p user_data %p", network, service, user_data);
+
+	if (service == NULL) {
+		err = -EINVAL;
+		goto out;
+	}
+
+	if (identity != NULL)
+		__connman_service_set_agent_identity(service, identity);
+
+	if (passphrase != NULL)
+		err = __connman_service_add_passphrase(service, passphrase);
+
+	if (err == -ENOKEY) {
+		__connman_service_indicate_error(service,
+					CONNMAN_SERVICE_ERROR_INVALID_KEY);
+		goto out;
+	} else {
+		__connman_service_set_hidden(service);
+		__connman_service_set_userconnect(service, TRUE);
+		__connman_service_set_hidden_data(service, user_data);
+		return __connman_service_connect(service);
+	}
+
+out:
+	__connman_service_return_error(service, -err, user_data);
+	return err;
+}
+
 /**
  * __connman_network_connect:
  * @network: network structure
@@ -968,7 +1516,6 @@ connman_bool_t connman_network_get_associating(struct connman_network *network)
  */
 int __connman_network_connect(struct connman_network *network)
 {
-	struct connman_service *service;
 	int err;
 
 	DBG("network %p", network);
@@ -992,21 +1539,17 @@ int __connman_network_connect(struct connman_network *network)
 
 	__connman_device_disconnect(network->device);
 
-	service = __connman_service_lookup_from_network(network);
-
 	err = network->driver->connect(network);
 	if (err < 0) {
 		if (err == -EINPROGRESS)
 			connman_network_set_associating(network, TRUE);
 		else {
 			network->connecting = FALSE;
-			network->hidden = FALSE;
 		}
 
 		return err;
 	}
 
-	network->connected = TRUE;
 	set_connected(network);
 
 	return err;
@@ -1037,50 +1580,16 @@ 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;
 }
 
-static int dhcp_start(struct connman_network *network)
-{
-	struct connman_element *element;
-	int error;
-
-	element = connman_element_create(NULL);
-	if (element == NULL)
-		return -ENOMEM;
-
-	element->type  = CONNMAN_ELEMENT_TYPE_DHCP;
-	element->index = network->element.index;
-
-	error = connman_element_register(element, &network->element);
-	if (error < 0) {
-		connman_element_unref(element);
-		return error;
-	}
-
-	return 0;
-}
-
-static int dhcp_stop(struct connman_network *network)
-{
-	connman_element_unregister_children_type(&network->element,
-						CONNMAN_ELEMENT_TYPE_IPV4);
-	connman_element_unregister_children_type(&network->element,
-						CONNMAN_ELEMENT_TYPE_DHCP);
-
-	return 0;
-}
-
 static int manual_ipv4_set(struct connman_network *network,
 				struct connman_ipconfig *ipconfig)
 {
 	struct connman_service *service;
-	const char *gateway;
 	int err;
 
 	service = __connman_service_lookup_from_network(network);
@@ -1094,17 +1603,7 @@ static int manual_ipv4_set(struct connman_network *network,
 		return err;
 	}
 
-	connman_element_get_value(&network->element,
-				CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
-	if (gateway != NULL) {
-		__connman_ipconfig_set_gateway(ipconfig, gateway);
-		__connman_ipconfig_gateway_add(ipconfig);
-	}
-
-	__connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY,
-					CONNMAN_IPCONFIG_TYPE_IPV4);
-
-	return 0;
+	return __connman_ipconfig_gateway_add(ipconfig);
 }
 
 int __connman_network_clear_ipconfig(struct connman_network *network,
@@ -1125,22 +1624,24 @@ 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;
 	case CONNMAN_IPCONFIG_METHOD_DHCP:
-		dhcp_stop(network);
+		__connman_dhcp_stop(network);
 		break;
 	}
 
 	if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
-		__connman_service_indicate_state(service,
+		__connman_service_ipconfig_indicate_state(service,
 					CONNMAN_SERVICE_STATE_CONFIGURATION,
 					CONNMAN_IPCONFIG_TYPE_IPV6);
 	else if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
-		__connman_service_indicate_state(service,
+		__connman_service_ipconfig_indicate_state(service,
 					CONNMAN_SERVICE_STATE_CONFIGURATION,
 					CONNMAN_IPCONFIG_TYPE_IPV4);
 
@@ -1154,6 +1655,9 @@ int __connman_network_set_ipconfig(struct connman_network *network,
 	enum connman_ipconfig_method method;
 	int ret;
 
+	if (network == NULL)
+		return -EINVAL;
+
 	if (ipconfig_ipv6) {
 		method = __connman_ipconfig_get_method(ipconfig_ipv6);
 
@@ -1170,7 +1674,7 @@ int __connman_network_set_ipconfig(struct connman_network *network,
 			if (ret != 0) {
 				connman_network_set_error(network,
 					CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-				return FALSE;
+				return ret;
 			}
 			break;
 		case CONNMAN_IPCONFIG_METHOD_DHCP:
@@ -1190,7 +1694,7 @@ int __connman_network_set_ipconfig(struct connman_network *network,
 		case CONNMAN_IPCONFIG_METHOD_MANUAL:
 			return manual_ipv4_set(network, ipconfig_ipv4);
 		case CONNMAN_IPCONFIG_METHOD_DHCP:
-			return dhcp_start(network);
+			return __connman_dhcp_start(network, dhcp_callback);
 		}
 	}
 
@@ -1209,11 +1713,7 @@ int connman_network_set_ipaddress(struct connman_network *network,
 	if (service == NULL)
 		return -EINVAL;
 
-	if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV4)
-		ipconfig = __connman_service_get_ip4config(service);
-	else if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV6)
-		ipconfig = __connman_service_get_ip6config(service);
-
+	ipconfig = __connman_service_get_ipconfig(service, ipaddress->family);
 	if (ipconfig == NULL)
 		return -EINVAL;
 
@@ -1223,22 +1723,6 @@ int connman_network_set_ipaddress(struct connman_network *network,
 	__connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
 	__connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
 
-	return __connman_ipconfig_gateway_add(ipconfig);
-}
-
-int connman_network_set_pac(struct connman_network *network,
-				const char *pac)
-{
-	struct connman_service *service;
-
-	DBG("network %p pac %s", network, pac);
-
-	service = __connman_service_lookup_from_network(network);
-	if (service == NULL)
-		return -EINVAL;
-
-	__connman_service_set_pac(service, pac);
-
 	return 0;
 }
 
@@ -1246,7 +1730,7 @@ int connman_network_set_nameservers(struct connman_network *network,
 				const char *nameservers)
 {
 	struct connman_service *service;
-	char **nameservers_array = NULL;
+	char **nameservers_array;
 	int i;
 
 	DBG("network %p nameservers %s", network, nameservers);
@@ -1257,14 +1741,18 @@ int connman_network_set_nameservers(struct connman_network *network,
 
 	__connman_service_nameserver_clear(service);
 
-	if (nameservers != NULL)
-		nameservers_array = g_strsplit(nameservers, " ", 0);
+	if (nameservers == NULL)
+		return 0;
+
+	nameservers_array = g_strsplit(nameservers, " ", 0);
 
-	for (i = 0; nameservers_array[i] == NULL; i++) {
+	for (i = 0; nameservers_array[i] != NULL; i++) {
 		__connman_service_nameserver_append(service,
-						nameservers_array[i]);
+						nameservers_array[i], FALSE);
 	}
 
+	g_strfreev(nameservers_array);
+
 	return 0;
 }
 
@@ -1299,7 +1787,7 @@ int connman_network_set_name(struct connman_network *network,
 	g_free(network->name);
 	network->name = g_strdup(name);
 
-	return connman_element_set_string(&network->element, "Name", name);
+	return 0;
 }
 
 /**
@@ -1309,6 +1797,7 @@ int connman_network_set_name(struct connman_network *network,
  *
  * Set signal strength value for network
  */
+
 int connman_network_set_strength(struct connman_network *network,
 						connman_uint8_t strength)
 {
@@ -1316,26 +1805,42 @@ int connman_network_set_strength(struct connman_network *network,
 
 	network->strength = strength;
 
-	return connman_element_set_uint8(&network->element,
-						"Strength", strength);
+	return 0;
 }
 
-/**
- * connman_network_set_roaming:
- * @network: network structure
- * @roaming: roaming state
- *
- * Set roaming state for network
- */
-int connman_network_set_roaming(struct connman_network *network,
-						connman_bool_t roaming)
+connman_uint8_t connman_network_get_strength(struct connman_network *network)
+{
+	return network->strength;
+}
+
+int connman_network_set_frequency(struct connman_network *network,
+						connman_uint16_t frequency)
+{
+	DBG("network %p frequency %d", network, frequency);
+
+	network->frequency = frequency;
+
+	return 0;
+}
+
+connman_uint16_t connman_network_get_frequency(struct connman_network *network)
+{
+	return network->frequency;
+}
+
+int connman_network_set_wifi_channel(struct connman_network *network,
+						connman_uint16_t channel)
 {
-	DBG("network %p roaming %d", network, roaming);
+	DBG("network %p wifi channel %d", network, channel);
+
+	network->wifi.channel = channel;
 
-	network->roaming = roaming;
+	return 0;
+}
 
-	return connman_element_set_bool(&network->element,
-						"Roaming", roaming);
+connman_uint16_t connman_network_get_wifi_channel(struct connman_network *network)
+{
+	return network->wifi.channel;
 }
 
 /**
@@ -1349,14 +1854,15 @@ int connman_network_set_roaming(struct connman_network *network,
 int connman_network_set_string(struct connman_network *network,
 					const char *key, const char *value)
 {
-	int err;
-
 	DBG("network %p key %s value %s", network, key, value);
 
 	if (g_strcmp0(key, "Name") == 0)
 		return connman_network_set_name(network, value);
 
-	if (g_str_equal(key, "Node") == TRUE) {
+	if (g_str_equal(key, "Path") == TRUE) {
+		g_free(network->path);
+		network->path = g_strdup(value);
+	} else if (g_str_equal(key, "Node") == TRUE) {
 		g_free(network->node);
 		network->node = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.Mode") == TRUE) {
@@ -1368,12 +1874,18 @@ int connman_network_set_string(struct connman_network *network,
 	} else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) {
 		g_free(network->wifi.passphrase);
 		network->wifi.passphrase = g_strdup(value);
+	} else if (g_str_equal(key, "WiFi.AgentPassphrase") == TRUE) {
+		g_free(network->wifi.agent_passphrase);
+		network->wifi.agent_passphrase = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.EAP") == TRUE) {
 		g_free(network->wifi.eap);
 		network->wifi.eap = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.Identity") == TRUE) {
 		g_free(network->wifi.identity);
 		network->wifi.identity = g_strdup(value);
+	} else if (g_str_equal(key, "WiFi.AgentIdentity") == TRUE) {
+		g_free(network->wifi.agent_identity);
+		network->wifi.agent_identity = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.CACertFile") == TRUE) {
 		g_free(network->wifi.ca_cert_path);
 		network->wifi.ca_cert_path = g_strdup(value);
@@ -1392,18 +1904,10 @@ int connman_network_set_string(struct connman_network *network,
 	} else if (g_str_equal(key, "WiFi.PinWPS") == TRUE) {
 		g_free(network->wifi.pin_wps);
 		network->wifi.pin_wps = g_strdup(value);
+	} else {
+		return -EINVAL;
 	}
 
-	err = connman_element_set_string(&network->element, key, value);
-	if (err < 0)
-		return err;
-
-	if (network->driver == NULL)
-		return 0;
-
-	if (network->driver->setup)
-		return network->driver->setup(network, key);
-
 	return 0;
 }
 
@@ -1419,7 +1923,9 @@ const char *connman_network_get_string(struct connman_network *network,
 {
 	DBG("network %p key %s", network, key);
 
-	if (g_str_equal(key, "Name") == TRUE)
+	if (g_str_equal(key, "Path") == TRUE)
+		return network->path;
+	else if (g_str_equal(key, "Name") == TRUE)
 		return network->name;
 	else if (g_str_equal(key, "Node") == TRUE)
 		return network->node;
@@ -1429,10 +1935,14 @@ const char *connman_network_get_string(struct connman_network *network,
 		return network->wifi.security;
 	else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
 		return network->wifi.passphrase;
+	else if (g_str_equal(key, "WiFi.AgentPassphrase") == TRUE)
+		return network->wifi.agent_passphrase;
 	else if (g_str_equal(key, "WiFi.EAP") == TRUE)
 		return network->wifi.eap;
 	else if (g_str_equal(key, "WiFi.Identity") == TRUE)
 		return network->wifi.identity;
+	else if (g_str_equal(key, "WiFi.AgentIdentity") == TRUE)
+		return network->wifi.agent_identity;
 	else if (g_str_equal(key, "WiFi.CACertFile") == TRUE)
 		return network->wifi.ca_cert_path;
 	else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE)
@@ -1446,7 +1956,7 @@ const char *connman_network_get_string(struct connman_network *network,
 	else if (g_str_equal(key, "WiFi.PinWPS") == TRUE)
 		return network->wifi.pin_wps;
 
-	return connman_element_get_string(&network->element, key);
+	return NULL;
 }
 
 /**
@@ -1463,13 +1973,13 @@ int connman_network_set_bool(struct connman_network *network,
 	DBG("network %p key %s value %d", network, key, value);
 
 	if (g_strcmp0(key, "Roaming") == 0)
-		return connman_network_set_roaming(network, value);
+		network->roaming = value;
 	else if (g_strcmp0(key, "WiFi.WPS") == 0)
 		network->wifi.wps = value;
 	else if (g_strcmp0(key, "WiFi.UseWPS") == 0)
 		network->wifi.use_wps = value;
 
-	return connman_element_set_bool(&network->element, key, value);
+	return -EINVAL;
 }
 
 /**
@@ -1491,85 +2001,7 @@ connman_bool_t connman_network_get_bool(struct connman_network *network,
 	else if (g_str_equal(key, "WiFi.UseWPS") == TRUE)
 		return network->wifi.use_wps;
 
-	return connman_element_get_bool(&network->element, key);
-}
-
-/**
- * connman_network_set_uint8:
- * @network: network structure
- * @key: unique identifier
- * @value: integer value
- *
- * Set integer value for specific key
- */
-int connman_network_set_uint8(struct connman_network *network,
-					const char *key, connman_uint8_t value)
-{
-	DBG("network %p key %s value %d", network, key, value);
-
-	if (g_strcmp0(key, "Strength") == 0)
-		return connman_network_set_strength(network, value);
-
-	return connman_element_set_uint8(&network->element, key, value);
-}
-
-/**
- * connman_network_get_uint8:
- * @network: network structure
- * @key: unique identifier
- *
- * Get integer value for specific key
- */
-connman_uint8_t connman_network_get_uint8(struct connman_network *network,
-							const char *key)
-{
-	DBG("network %p key %s", network, key);
-
-	if (g_str_equal(key, "Strength") == TRUE)
-		return network->strength;
-
-	return connman_element_get_uint8(&network->element, key);
-}
-
-/**
- * connman_network_set_uint16:
- * @network: network structure
- * @key: unique identifier
- * @value: integer value
- *
- * Set integer value for specific key
- */
-int connman_network_set_uint16(struct connman_network *network,
-				const char *key, connman_uint16_t value)
-{
-	DBG("network %p key %s value %d", network, key, value);
-
-	if (g_str_equal(key, "Frequency") == TRUE)
-		network->frequency = value;
-	else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-		network->wifi.channel = value;
-
-	return -EINVAL;
-}
-
-/**
- * connman_network_get_uint16:
- * @network: network structure
- * @key: unique identifier
- *
- * Get integer value for specific key
- */
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
-							const char *key)
-{
-	DBG("network %p key %s", network, key);
-
-	if (g_str_equal(key, "Frequency") == TRUE)
-		return network->frequency;
-	else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-		return network->wifi.channel;
-
-	return 0;
+	return FALSE;
 }
 
 /**
@@ -1594,9 +2026,11 @@ int connman_network_set_blob(struct connman_network *network,
 			network->wifi.ssid_len = size;
 		} else
 			network->wifi.ssid_len = 0;
+	} else {
+		return -EINVAL;
 	}
 
-	return connman_element_set_blob(&network->element, key, data, size);
+	return 0;
 }
 
 /**
@@ -1618,13 +2052,22 @@ const void *connman_network_get_blob(struct connman_network *network,
 		return network->wifi.ssid;
 	}
 
-	return connman_element_get_blob(&network->element, key, size);
+	return NULL;
 }
 
 void __connman_network_set_device(struct connman_network *network,
 					struct connman_device *device)
 {
+	if (network->device == device)
+		return;
+
+	if (network->device != NULL)
+		network_remove(network);
+
 	network->device = device;
+
+	if (network->device != NULL)
+		network_probe(network);
 }
 
 /**
@@ -1678,146 +2121,16 @@ void connman_network_update(struct connman_network *network)
 
 	if (network->group != NULL)
 		__connman_service_update_from_network(network);
-
-	return;
-}
-
-static gboolean match_driver(struct connman_network *network,
-					struct connman_network_driver *driver)
-{
-	if (network->type == driver->type ||
-			driver->type == CONNMAN_NETWORK_TYPE_UNKNOWN)
-		return TRUE;
-
-	return FALSE;
-}
-
-static int network_probe(struct connman_element *element)
-{
-	struct connman_network *network = element->network;
-	GSList *list;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (network == NULL)
-		return -ENODEV;
-
-	for (list = driver_list; list; list = list->next) {
-		struct connman_network_driver *driver = list->data;
-
-		if (match_driver(network, driver) == FALSE)
-			continue;
-
-		DBG("driver %p name %s", driver, driver->name);
-
-		if (driver->probe(network) == 0) {
-			network->driver = driver;
-			break;
-		}
-	}
-
-	if (network->driver == NULL)
-		return -ENODEV;
-
-	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:
-	case CONNMAN_NETWORK_TYPE_WIMAX:
-		if (network->group != NULL)
-			__connman_profile_add_network(network);
-		break;
-	}
-
-	return 0;
-}
-
-static void network_remove(struct connman_element *element)
-{
-	struct connman_network *network = element->network;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (network == NULL)
-		return;
-
-	if (network->driver == NULL)
-		return;
-
-	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:
-	case CONNMAN_NETWORK_TYPE_WIMAX:
-		if (network->group != NULL) {
-			__connman_profile_remove_network(network);
-
-			g_free(network->group);
-			network->group = NULL;
-		}
-		break;
-	}
-
-	if (network->driver->remove)
-		network->driver->remove(network);
-}
-
-static void network_change(struct connman_element *element)
-{
-	struct connman_network *network = element->network;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (element->state != CONNMAN_ELEMENT_STATE_ERROR)
-		return;
-
-	if (element->error != CONNMAN_ELEMENT_ERROR_DHCP_FAILED)
-		return;
-
-	if (network->connected == FALSE)
-		return;
-
-	connman_element_unregister_children(element);
-
-	connman_device_set_disconnected(network->device, TRUE);
-
-	if (network->driver && network->driver->disconnect) {
-		network->driver->disconnect(network);
-		return;
-	}
-
-	network->connected = FALSE;
 }
 
-static struct connman_driver network_driver = {
-	.name		= "network",
-	.type		= CONNMAN_ELEMENT_TYPE_NETWORK,
-	.priority	= CONNMAN_DRIVER_PRIORITY_LOW,
-	.probe		= network_probe,
-	.remove		= network_remove,
-	.change		= network_change,
-};
-
 int __connman_network_init(void)
 {
 	DBG("");
 
-	return connman_driver_register(&network_driver);
+	return 0;
 }
 
 void __connman_network_cleanup(void)
 {
 	DBG("");
-
-	connman_driver_unregister(&network_driver);
 }