X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=f9dfada266a4cb6b294cf794efe3a00c0d4597b4;hb=f3158371a6391828f55a0418015772a7db6348ee;hp=13d6e8949a5d38573cca31970d4ad7f22434acc2;hpb=3583d87ad728b9fda4aa8710a930f3035796fc56;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/network.c b/src/network.c
index 13d6e89..f9dfada 100644
--- a/src/network.c
+++ b/src/network.c
@@ -28,22 +28,23 @@
 
 #include "connman.h"
 
-static unsigned int hidden_counter = 0;
+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 *address;
 	char *name;
 	char *node;
 	char *group;
+	char *path;
+	int index;
 
 	struct connman_network_driver *driver;
 	void *driver_data;
@@ -60,14 +61,24 @@ 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;
 		char *private_key_passphrase;
 		char *phase2_auth;
+		connman_bool_t wps;
+		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)
@@ -100,7 +111,152 @@ connman_bool_t __connman_network_has_driver(struct connman_network *network)
 	return TRUE;
 }
 
-static GSList *driver_list = NULL;
+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_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)
 {
@@ -135,6 +291,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;
 }
 
@@ -149,26 +307,38 @@ 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);
+	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->address);
 	g_free(network->identifier);
 
 	network->device = NULL;
+
+	g_free(network);
 }
 
 /**
@@ -183,9 +353,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);
 
@@ -195,33 +363,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;
 }
@@ -234,8 +388,10 @@ struct connman_network *connman_network_create(const char *identifier,
  */
 struct connman_network *connman_network_ref(struct connman_network *network)
 {
-	if (connman_element_ref(&network->element) == NULL)
-		return NULL;
+	DBG("network %p name %s refcount %d", network, network->name,
+		network->refcount + 1);
+
+	__sync_fetch_and_add(&network->refcount, 1);
 
 	return network;
 }
@@ -248,7 +404,15 @@ struct connman_network *connman_network_ref(struct connman_network *network)
  */
 void connman_network_unref(struct connman_network *network)
 {
-	connman_element_unref(&network->element);
+	DBG("network %p name %s refcount %d", network, network->name,
+		network->refcount - 1);
+
+	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)
@@ -296,10 +460,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)
@@ -321,7 +485,7 @@ void connman_network_set_index(struct connman_network *network, int index)
 	}
 
 done:
-	network->element.index = index;
+	network->index = index;
 }
 
 /**
@@ -332,19 +496,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;
 }
 
 /**
@@ -372,12 +524,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);
 	}
@@ -385,7 +537,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);
 }
 
 /**
@@ -429,7 +581,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;
 }
@@ -462,9 +614,6 @@ int connman_network_set_available(struct connman_network *network,
  */
 connman_bool_t connman_network_get_available(struct connman_network *network)
 {
-	if (network->hidden == TRUE)
-		return TRUE;
-
 	return network->available;
 }
 
@@ -489,8 +638,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_STATE_ASSOCIATION);
+		__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;
@@ -500,27 +653,42 @@ static void set_associate_error(struct connman_network *network)
 {
 	struct connman_service *service;
 
-	if (network->associating == FALSE)
-		return ;
+	service = __connman_service_lookup_from_network(network);
 
-	network->associating = FALSE;
+	__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_FAILURE,
+					CONNMAN_IPCONFIG_TYPE_IPV4);
+}
+
+static void set_configure_error(struct connman_network *network)
+{
+	struct connman_service *service;
 
 	service = __connman_service_lookup_from_network(network);
 
-	__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_FAILURE);
+	__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_FAILURE,
+					CONNMAN_IPCONFIG_TYPE_IPV4);
 }
 
-static void set_configure_error(struct connman_network *network)
+static void set_invalid_key_error(struct connman_network *network)
 {
 	struct connman_service *service;
 
-	network->connecting = FALSE;
+	service = __connman_service_lookup_from_network(network);
+
+	__connman_service_indicate_error(service,
+					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_state(service,
-					CONNMAN_SERVICE_STATE_FAILURE);
+	__connman_service_indicate_error(service,
+					CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
 }
 
 void connman_network_set_ipv4_method(struct connman_network *network,
@@ -529,8 +697,6 @@ void connman_network_set_ipv4_method(struct connman_network *network,
 	struct connman_service *service;
 	struct connman_ipconfig *ipconfig;
 
-	network->element.ipv4.method = method;
-
 	service = __connman_service_lookup_from_network(network);
 	if (service == NULL)
 		return;
@@ -548,8 +714,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;
@@ -567,6 +731,7 @@ void connman_network_set_error(struct connman_network *network,
 	DBG("nework %p, error %d", network, error);
 
 	network->connecting = FALSE;
+	network->associating = FALSE;
 
 	switch (error) {
 	case CONNMAN_NETWORK_ERROR_UNKNOWN:
@@ -577,7 +742,31 @@ void connman_network_set_error(struct connman_network *network,
 	case CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL:
 		set_configure_error(network);
 		break;
+	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)
+{
+	struct connman_service *service;
+
+	DBG("network %p", network);
+
+	if (network == NULL)
+		return;
+
+	if (network->connecting == TRUE || network->associating == TRUE)
+		return;
+
+	service = __connman_service_lookup_from_network(network);
+	__connman_service_clear_error(service);
 }
 
 static void set_configuration(struct connman_network *network)
@@ -586,62 +775,112 @@ static void set_configuration(struct connman_network *network)
 
 	DBG("network %p", network);
 
-	__connman_device_increase_connections(network->device);
+	if (network->device == NULL)
+		return;
 
 	__connman_device_set_network(network->device, network);
 
 	connman_device_set_disconnected(network->device, FALSE);
 
 	service = __connman_service_lookup_from_network(network);
-	__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_CONFIGURATION);
+	__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_CONFIGURATION,
+					CONNMAN_IPCONFIG_TYPE_IPV4);
 }
 
-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);
 
 	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;
 	int err;
 
 	DBG("network %p", network);
@@ -650,51 +889,45 @@ 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);
 
-	err = __connman_ipconfig_set_address(ipconfig);
-	if (err < 0) {
-		connman_network_set_error(network,
-			CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-		return;
-	}
+	set_configuration(network);
 
-	connman_element_get_value(&network->element,
-			CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver);
-	if (nameserver != NULL)
-		__connman_service_append_nameserver(service, nameserver);
+	err = __connman_ipconfig_address_add(ipconfig);
+	if (err < 0)
+		goto err;
 
-	__connman_ipconfig_set_gateway(ipconfig, &network->element);
+	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);
+	return;
+
+err:
+	connman_network_set_error(network,
+					CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+	return;
 }
 
 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;
-
-	element->type  = CONNMAN_ELEMENT_TYPE_DHCP;
-	element->index = network->element.index;
+	set_configuration(network);
 
-	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;
 }
 
@@ -704,24 +937,50 @@ 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;
 
-	err = __connman_ipconfig_set_address(ipconfig_ipv6);
+	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,
 			CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 		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;
 
-	return 0;
-}
+	__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)
+{
+	DBG("network %p", network);
+
+	__connman_device_set_network(network->device, network);
+
+	connman_device_set_disconnected(network->device, FALSE);
+
+	/* XXX: Append IPv6 nameservers here */
+
+	network->connecting = FALSE;
+}
 
 static gboolean set_connected(gpointer user_data)
 {
@@ -738,15 +997,8 @@ static gboolean set_connected(gpointer user_data)
 	DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
 		ipconfig_ipv6);
 
-	if (ipconfig_ipv4)
-		ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
-	else
-		ipv4_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
-
-	if (ipconfig_ipv6)
-		ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
-	else
-		ipv6_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+	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);
 	DBG("network connected %d", network->connected);
@@ -758,6 +1010,9 @@ static gboolean set_connected(gpointer user_data)
 		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);
@@ -774,6 +1029,7 @@ static gboolean set_connected(gpointer user_data)
 		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) {
@@ -794,17 +1050,67 @@ static gboolean set_connected(gpointer user_data)
 		}
 
 	} else {
-		struct connman_service *service;
-
-		connman_element_unregister_children(&network->element);
+		enum connman_service_state state;
 
 		__connman_device_set_network(network->device, NULL);
-		network->hidden = FALSE;
 
-		service = __connman_service_lookup_from_network(network);
+		switch (ipv4_method) {
+		case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+		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);
+
+		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);
+
+		/*
+		 * 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_indicate_state(service,
-						CONNMAN_SERVICE_STATE_IDLE);
+		__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_IDLE,
+					CONNMAN_IPCONFIG_TYPE_IPV6);
 	}
 
 	network->connecting = FALSE;
@@ -828,17 +1134,14 @@ int connman_network_set_connected(struct connman_network *network,
 
 	if ((network->connecting == TRUE || network->associating == TRUE) &&
 							connected == FALSE) {
-		connman_element_set_error(&network->element,
-					CONNMAN_ELEMENT_ERROR_CONNECT_FAILED);
+		connman_network_set_error(network,
+					CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
 		__connman_network_disconnect(network);
 	}
 
 	if (network->connected == connected)
 		return -EALREADY;
 
-	if (connected == FALSE)
-		__connman_device_decrease_connections(network->device);
-
 	network->connected = connected;
 
 	set_connected(network);
@@ -876,7 +1179,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);
@@ -900,15 +1202,12 @@ 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;
@@ -953,39 +1252,6 @@ int __connman_network_disconnect(struct connman_network *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_CONNECTION);
-	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)
 {
@@ -996,18 +1262,14 @@ static int manual_ipv4_set(struct connman_network *network,
 	if (service == NULL)
 		return -EINVAL;
 
-	err = __connman_ipconfig_set_address(ipconfig);
+	err = __connman_ipconfig_address_add(ipconfig);
 	if (err < 0) {
 		connman_network_set_error(network,
 			CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 		return err;
 	}
 
-	__connman_ipconfig_set_gateway(ipconfig, &network->element);
-
-	__connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY);
-
-	return 0;
+	return __connman_ipconfig_gateway_add(ipconfig);
 }
 
 int __connman_network_clear_ipconfig(struct connman_network *network,
@@ -1015,30 +1277,37 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
 {
 	struct connman_service *service;
 	enum connman_ipconfig_method method;
+	enum connman_ipconfig_type type;
 
 	service = __connman_service_lookup_from_network(network);
 	if (service == NULL)
 		return -EINVAL;
 
 	method = __connman_ipconfig_get_method(ipconfig);
+	type = __connman_ipconfig_get_config_type(ipconfig);
 
 	switch (method) {
 	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_MANUAL:
-		connman_element_unregister_children_type(&network->element,
-					CONNMAN_ELEMENT_TYPE_CONNECTION);
-		__connman_ipconfig_clear_address(ipconfig);
+		__connman_ipconfig_address_remove(ipconfig);
 		break;
 	case CONNMAN_IPCONFIG_METHOD_DHCP:
-		dhcp_stop(network);
+		__connman_dhcp_stop(network);
 		break;
 	}
 
-	__connman_service_indicate_state(service,
-					CONNMAN_SERVICE_STATE_CONFIGURATION);
+	if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+		__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_CONFIGURATION,
+					CONNMAN_IPCONFIG_TYPE_IPV6);
+	else if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+		__connman_service_ipconfig_indicate_state(service,
+					CONNMAN_SERVICE_STATE_CONFIGURATION,
+					CONNMAN_IPCONFIG_TYPE_IPV4);
 
 	return 0;
 }
@@ -1050,6 +1319,9 @@ int __connman_network_set_ipconfig(struct connman_network *network,
 	enum connman_ipconfig_method method;
 	int ret;
 
+	if (network == NULL)
+		return -EINVAL;
+
 	if (ipconfig_ipv6) {
 		method = __connman_ipconfig_get_method(ipconfig_ipv6);
 
@@ -1057,13 +1329,16 @@ int __connman_network_set_ipconfig(struct connman_network *network,
 		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,
 					CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-				return FALSE;
+				return ret;
 			}
 			break;
 		case CONNMAN_IPCONFIG_METHOD_DHCP:
@@ -1078,47 +1353,85 @@ int __connman_network_set_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_MANUAL:
 			return manual_ipv4_set(network, ipconfig_ipv4);
 		case CONNMAN_IPCONFIG_METHOD_DHCP:
-			return dhcp_start(network);
+			return __connman_dhcp_start(network, dhcp_callback);
 		}
 	}
 
 	return 0;
 }
 
-/**
- * connman_network_set_address:
- * @network: network structure
- * @address: binary address value
- * @size: binary address length
- *
- * Set unique address value for network
- */
-int connman_network_set_address(struct connman_network *network,
-				const void *address, unsigned int size)
+int connman_network_set_ipaddress(struct connman_network *network,
+					struct connman_ipaddress *ipaddress)
 {
-	const unsigned char *addr_octet = address;
-	char *str;
+	struct connman_service *service;
+	struct connman_ipconfig *ipconfig = NULL;
 
-	DBG("network %p size %d", network, size);
+	DBG("network %p", network);
 
-	if (size != 6)
+	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
 		return -EINVAL;
 
-	str = g_strdup_printf("%02X:%02X:%02X:%02X:%02X:%02X",
-				addr_octet[0], addr_octet[1], addr_octet[2],
-				addr_octet[3], addr_octet[4], addr_octet[5]);
-	if (str == NULL)
-		return -ENOMEM;
+	ipconfig = __connman_service_get_ipconfig(service, ipaddress->family);
+	if (ipconfig == NULL)
+		return -EINVAL;
 
-	g_free(network->address);
-	network->address = str;
+	__connman_ipconfig_set_local(ipconfig, ipaddress->local);
+	__connman_ipconfig_set_peer(ipconfig, ipaddress->peer);
+	__connman_ipconfig_set_broadcast(ipconfig, ipaddress->broadcast);
+	__connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
+	__connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
 
-	return connman_element_set_string(&network->element,
-						"Address", network->address);
+	return 0;
+}
+
+int connman_network_set_nameservers(struct connman_network *network,
+				const char *nameservers)
+{
+	struct connman_service *service;
+	char **nameservers_array = NULL;
+	int i;
+
+	DBG("network %p nameservers %s", network, nameservers);
+
+	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
+		return -EINVAL;
+
+	__connman_service_nameserver_clear(service);
+
+	if (nameservers != NULL)
+		nameservers_array = g_strsplit(nameservers, " ", 0);
+
+	for (i = 0; nameservers_array[i] != NULL; i++) {
+		__connman_service_nameserver_append(service,
+						nameservers_array[i]);
+	}
+
+	g_strfreev(nameservers_array);
+
+	return 0;
+}
+
+int connman_network_set_domain(struct connman_network *network,
+				const char *domain)
+{
+	struct connman_service *service;
+
+	DBG("network %p domain %s", network, domain);
+
+	service = __connman_service_lookup_from_network(network);
+	if (service == NULL)
+		return -EINVAL;
+
+	__connman_service_set_domainname(service, domain);
+
+	return 0;
 }
 
 /**
@@ -1136,7 +1449,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;
 }
 
 /**
@@ -1146,6 +1459,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)
 {
@@ -1153,8 +1467,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_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 wifi channel %d", network, channel);
+
+	network->wifi.channel = channel;
+
+	return 0;
+}
+
+connman_uint16_t connman_network_get_wifi_channel(struct connman_network *network)
+{
+	return network->wifi.channel;
 }
 
 /**
@@ -1171,8 +1519,7 @@ int connman_network_set_roaming(struct connman_network *network,
 
 	network->roaming = roaming;
 
-	return connman_element_set_bool(&network->element,
-						"Roaming", roaming);
+	return 0;
 }
 
 /**
@@ -1186,16 +1533,14 @@ 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, "Address") == TRUE) {
-		g_free(network->address);
-		network->address = g_strdup(value);
+	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);
@@ -1208,12 +1553,18 @@ int connman_network_set_string(struct connman_network *network,
 	} else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) {
 		g_free(network->wifi.passphrase);
 		network->wifi.passphrase = g_strdup(value);
+	} else if (g_str_equal(key, "WiFi.AgentPassphrase") == TRUE) {
+		g_free(network->wifi.agent_passphrase);
+		network->wifi.agent_passphrase = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.EAP") == TRUE) {
 		g_free(network->wifi.eap);
 		network->wifi.eap = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.Identity") == TRUE) {
 		g_free(network->wifi.identity);
 		network->wifi.identity = g_strdup(value);
+	} else if (g_str_equal(key, "WiFi.AgentIdentity") == TRUE) {
+		g_free(network->wifi.agent_identity);
+		network->wifi.agent_identity = g_strdup(value);
 	} else if (g_str_equal(key, "WiFi.CACertFile") == TRUE) {
 		g_free(network->wifi.ca_cert_path);
 		network->wifi.ca_cert_path = g_strdup(value);
@@ -1229,18 +1580,13 @@ int connman_network_set_string(struct connman_network *network,
 	} else if (g_str_equal(key, "WiFi.Phase2") == TRUE) {
 		g_free(network->wifi.phase2_auth);
 		network->wifi.phase2_auth = g_strdup(value);
+	} 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;
 }
 
@@ -1256,8 +1602,8 @@ const char *connman_network_get_string(struct connman_network *network,
 {
 	DBG("network %p key %s", network, key);
 
-	if (g_str_equal(key, "Address") == TRUE)
-		return network->address;
+	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)
@@ -1268,10 +1614,14 @@ const char *connman_network_get_string(struct connman_network *network,
 		return network->wifi.security;
 	else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
 		return network->wifi.passphrase;
+	else if (g_str_equal(key, "WiFi.AgentPassphrase") == TRUE)
+		return network->wifi.agent_passphrase;
 	else if (g_str_equal(key, "WiFi.EAP") == TRUE)
 		return network->wifi.eap;
 	else if (g_str_equal(key, "WiFi.Identity") == TRUE)
 		return network->wifi.identity;
+	else if (g_str_equal(key, "WiFi.AgentIdentity") == TRUE)
+		return network->wifi.agent_identity;
 	else if (g_str_equal(key, "WiFi.CACertFile") == TRUE)
 		return network->wifi.ca_cert_path;
 	else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE)
@@ -1282,8 +1632,10 @@ const char *connman_network_get_string(struct connman_network *network,
 		return network->wifi.private_key_passphrase;
 	else if (g_str_equal(key, "WiFi.Phase2") == TRUE)
 		return network->wifi.phase2_auth;
+	else if (g_str_equal(key, "WiFi.PinWPS") == TRUE)
+		return network->wifi.pin_wps;
 
-	return connman_element_get_string(&network->element, key);
+	return NULL;
 }
 
 /**
@@ -1301,8 +1653,12 @@ int connman_network_set_bool(struct connman_network *network,
 
 	if (g_strcmp0(key, "Roaming") == 0)
 		return connman_network_set_roaming(network, 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;
 }
 
 /**
@@ -1319,86 +1675,12 @@ connman_bool_t connman_network_get_bool(struct connman_network *network,
 
 	if (g_str_equal(key, "Roaming") == TRUE)
 		return network->roaming;
+	else if (g_str_equal(key, "WiFi.WPS") == TRUE)
+		return network->wifi.wps;
+	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;
 }
 
 /**
@@ -1415,9 +1697,6 @@ int connman_network_set_blob(struct connman_network *network,
 {
 	DBG("network %p key %s size %d", network, key, size);
 
-	if (g_strcmp0(key, "Address") == 0)
-		return connman_network_set_address(network, data, size);
-
 	if (g_str_equal(key, "WiFi.SSID") == TRUE) {
 		g_free(network->wifi.ssid);
 		network->wifi.ssid = g_try_malloc(size);
@@ -1426,9 +1705,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;
 }
 
 /**
@@ -1450,13 +1731,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);
 }
 
 /**
@@ -1510,146 +1800,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);
 }