X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdevice.c;h=3a5e467d5a2a522946344b4f9548f3822a4595c4;hb=230905c20905f2bc5ccf4b8fab75c1b5df2ac31d;hp=72b8656598b34cea7a1e71b3675da57c1f9f0d09;hpb=ad5c558e4c3ec8180d44c288339eefbc664cbba6;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/device.c b/src/device.c
index 72b8656..3a5e467 100644
--- a/src/device.c
+++ b/src/device.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,27 +28,35 @@
 
 #include "connman.h"
 
+static GSList *device_list = NULL;
+static gchar **device_filter = NULL;
+static gchar **nodevice_filter = NULL;
+
+enum connman_pending_type {
+	PENDING_NONE	= 0,
+	PENDING_ENABLE	= 1,
+	PENDING_DISABLE = 2,
+};
+
 struct connman_device {
-	struct connman_element element;
+	int refcount;
 	enum connman_device_type type;
-	connman_bool_t offlinemode;
-	connman_bool_t blocked;
+	enum connman_pending_type powered_pending;	/* Indicates a pending
+							enable/disable request */
 	connman_bool_t powered;
-	connman_bool_t powered_pending;
-	connman_bool_t powered_persistent;
 	connman_bool_t scanning;
 	connman_bool_t disconnected;
 	connman_bool_t reconnect;
-	connman_uint16_t scan_interval;
-	connman_uint16_t backoff_interval;
 	char *name;
 	char *node;
 	char *address;
 	char *interface;
 	char *ident;
+	char *path;
+	char *devname;
 	int phyindex;
-	unsigned int connections;
-	guint scan_timeout;
+	int index;
+	guint pending_timeout;
 
 	struct connman_device_driver *driver;
 	void *driver_data;
@@ -58,71 +66,14 @@ struct connman_device {
 	GHashTable *networks;
 };
 
-#define SCAN_INITIAL_DELAY 10
-
-static gboolean device_scan_trigger(gpointer user_data)
+static void clear_pending_trigger(struct connman_device *device)
 {
-	struct connman_device *device = user_data;
-
-	DBG("device %p", device);
-
-	if (device->driver == NULL) {
-		device->scan_timeout = 0;
-		return FALSE;
-	}
-
-	if (device->driver->scan)
-		device->driver->scan(device);
-
-	return TRUE;
-}
-
-static void clear_scan_trigger(struct connman_device *device)
-{
-	if (device->scan_timeout > 0) {
-		g_source_remove(device->scan_timeout);
-		device->scan_timeout = 0;
+	if (device->pending_timeout > 0) {
+		g_source_remove(device->pending_timeout);
+		device->pending_timeout = 0;
 	}
 }
 
-static void reset_scan_trigger(struct connman_device *device)
-{
-	clear_scan_trigger(device);
-
-	if (device->scan_interval > 0) {
-		guint interval;
-
-		if (g_hash_table_size(device->networks) == 0) {
-			if (device->backoff_interval >= device->scan_interval)
-				device->backoff_interval = SCAN_INITIAL_DELAY;
-			interval = device->backoff_interval;
-		} else
-			interval = device->scan_interval;
-
-		DBG("interval %d", interval);
-
-		device->scan_timeout = g_timeout_add_seconds(interval,
-					device_scan_trigger, device);
-
-		device->backoff_interval *= 2;
-		if (device->backoff_interval > device->scan_interval)
-			device->backoff_interval = device->scan_interval;
-	}
-}
-
-static void force_scan_trigger(struct connman_device *device)
-{
-	clear_scan_trigger(device);
-
-	device->scan_timeout = g_timeout_add_seconds(5,
-					device_scan_trigger, device);
-}
-
-void connman_device_schedule_scan(struct connman_device *device)
-{
-	reset_scan_trigger(device);
-}
-
 static const char *type2description(enum connman_device_type type)
 {
 	switch (type) {
@@ -202,134 +153,134 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
 	return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
+static gboolean device_pending_reset(gpointer user_data)
+{
+	struct connman_device *device = user_data;
+
+	DBG("device %p", device);
+
+	/* Power request timedout, reset power pending state. */
+	device->pending_timeout = 0;
+	device->powered_pending = PENDING_NONE;
+
+	return FALSE;
+}
+
 int __connman_device_enable(struct connman_device *device)
 {
 	int err;
-	enum connman_service_type type;
 
-	DBG("device %p %d", device, device->blocked);
+	DBG("device %p", device);
 
 	if (!device->driver || !device->driver->enable)
 		return -EOPNOTSUPP;
 
-	if (device->powered_pending == TRUE)
+	/* There is an ongoing power disable request. */
+	if (device->powered_pending == PENDING_DISABLE)
+		return -EBUSY;
+
+	if (device->powered_pending == PENDING_ENABLE)
 		return -EALREADY;
 
-	if (device->blocked == TRUE)
-		return -ENOLINK;
+	if (device->powered_pending == PENDING_NONE && device->powered == TRUE)
+		return -EALREADY;
 
-	connman_device_set_disconnected(device, FALSE);
-	device->scanning = FALSE;
+	device->powered_pending = PENDING_ENABLE;
 
 	err = device->driver->enable(device);
-	if (err < 0 && err != -EALREADY) {
-		if (err == -EINPROGRESS) {
-			device->powered_pending = TRUE;
-			device->offlinemode = FALSE;
-			if (__connman_profile_get_offlinemode() == TRUE)
-				__connman_profile_set_offlinemode(FALSE, FALSE);
-		}
-		return err;
+	/*
+	 * device gets enabled right away.
+	 * Invoke the callback
+	 */
+	if (err == 0) {
+		connman_device_set_powered(device, TRUE);
+		goto done;
 	}
 
-	device->powered_pending = TRUE;
-	device->powered = TRUE;
-	device->offlinemode = FALSE;
-	if (__connman_profile_get_offlinemode() == TRUE)
-		__connman_profile_set_offlinemode(FALSE, FALSE);
-
-	type = __connman_device_get_service_type(device);
-	__connman_technology_enable(type);
-
-	return 0;
+	if (err == -EALREADY) {
+		/* If device is already powered, but connman is not updated */
+		connman_device_set_powered(device, TRUE);
+		goto done;
+	}
+	/*
+	 * if err == -EINPROGRESS, then the DBus call to the respective daemon
+	 * was successful. We set a 4 sec timeout so if the daemon never
+	 * returns a reply, we would reset the pending request.
+	 */
+	if (err == -EINPROGRESS)
+		device->pending_timeout = g_timeout_add_seconds(4,
+					device_pending_reset, device);
+done:
+	return err;
 }
 
 int __connman_device_disable(struct connman_device *device)
 {
 	int err;
-	enum connman_service_type type;
 
 	DBG("device %p", device);
 
 	if (!device->driver || !device->driver->disable)
 		return -EOPNOTSUPP;
 
-	if (device->powered == FALSE)
-		return -ENOLINK;
+	/* Ongoing power enable request */
+	if (device->powered_pending == PENDING_ENABLE)
+		return -EBUSY;
 
-	if (device->powered_pending == FALSE)
+	if (device->powered_pending == PENDING_DISABLE)
 		return -EALREADY;
 
+	if (device->powered_pending == PENDING_NONE && device->powered == FALSE)
+		return -EALREADY;
+
+	device->powered_pending = PENDING_DISABLE;
 	device->reconnect = FALSE;
 
-	clear_scan_trigger(device);
+	if (device->network) {
+		struct connman_service *service =
+			__connman_service_lookup_from_network(device->network);
 
-	g_hash_table_remove_all(device->networks);
+		if (service != NULL)
+			__connman_service_disconnect(service);
+		else
+			connman_network_set_connected(device->network, FALSE);
+	}
 
 	err = device->driver->disable(device);
-	if (err < 0 && err != -EALREADY) {
-		if (err == -EINPROGRESS)
-			device->powered_pending = FALSE;
-		return err;
+	if (err == 0 || err == -EALREADY) {
+		connman_device_set_powered(device, FALSE);
+		goto done;
 	}
 
-	device->connections = 0;
-
-	device->powered_pending = FALSE;
-	device->powered = FALSE;
-
-	type = __connman_device_get_service_type(device);
-	__connman_technology_disable(type);
-
-	return 0;
-}
-
-static int set_powered(struct connman_device *device, connman_bool_t powered)
-{
-	DBG("device %p powered %d", device, powered);
-
-	if (powered == TRUE)
-		return __connman_device_enable(device);
-	else
-		return __connman_device_disable(device);
-}
-
-static int setup_device(struct connman_device *device)
-{
-	DBG("device %p", device);
-
-	__connman_technology_add_device(device);
-
-	if (device->offlinemode == FALSE &&
-				device->powered_persistent == TRUE)
-		__connman_device_enable(device);
-
-	return 0;
+	if (err == -EINPROGRESS)
+		device->pending_timeout = g_timeout_add_seconds(4,
+					device_pending_reset, device);
+done:
+	return err;
 }
 
-static void probe_driver(struct connman_element *element, gpointer user_data)
+static void probe_driver(struct connman_device_driver *driver)
 {
-	struct connman_device_driver *driver = user_data;
-
-	DBG("element %p name %s", element, element->name);
+	GSList *list;
 
-	if (element->device == NULL)
-		return;
+	DBG("driver %p name %s", driver, driver->name);
 
-	if (element->device->driver != NULL)
-		return;
+	for (list = device_list; list != NULL; list = list->next) {
+		struct connman_device *device = list->data;
 
-	if (driver->type != element->device->type)
-		return;
+		if (device->driver != NULL)
+			continue;
 
-	if (driver->probe(element->device) < 0)
-		return;
+		if (driver->type != device->type)
+			continue;
 
-	element->device->driver = driver;
+		if (driver->probe(device) < 0)
+			continue;
 
-	__connman_element_set_driver(element);
+		device->driver = driver;
 
-	setup_device(element->device);
+		__connman_technology_add_device(device);
+	}
 }
 
 static void remove_device(struct connman_device *device)
@@ -346,17 +297,18 @@ static void remove_device(struct connman_device *device)
 	device->driver = NULL;
 }
 
-static void remove_driver(struct connman_element *element, gpointer user_data)
+static void remove_driver(struct connman_device_driver *driver)
 {
-	struct connman_device_driver *driver = user_data;
+	GSList *list;
 
-	DBG("element %p name %s", element, element->name);
+	DBG("driver %p name %s", driver, driver->name);
 
-	if (element->device == NULL)
-		return;
+	for (list = device_list; list != NULL; list = list->next) {
+		struct connman_device *device = list->data;
 
-	if (element->device->driver == driver)
-		remove_device(element->device);
+		if (device->driver == driver)
+			remove_device(device);
+	}
 }
 
 connman_bool_t __connman_device_has_driver(struct connman_device *device)
@@ -391,9 +343,7 @@ int connman_device_driver_register(struct connman_device_driver *driver)
 
 	driver_list = g_slist_insert_sorted(driver_list, driver,
 							compare_priority);
-
-	__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
-						probe_driver, driver);
+	probe_driver(driver);
 
 	return 0;
 }
@@ -410,41 +360,40 @@ void connman_device_driver_unregister(struct connman_device_driver *driver)
 
 	driver_list = g_slist_remove(driver_list, driver);
 
-	__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
-						remove_driver, driver);
+	remove_driver(driver);
 }
 
-static void unregister_network(gpointer data)
+static void free_network(gpointer data)
 {
 	struct connman_network *network = data;
 
 	DBG("network %p", network);
 
-	connman_element_unregister((struct connman_element *) network);
-
 	__connman_network_set_device(network, NULL);
 
 	connman_network_unref(network);
 }
 
-static void device_destruct(struct connman_element *element)
+static void device_destruct(struct connman_device *device)
 {
-	struct connman_device *device = element->device;
+	DBG("device %p name %s", device, device->name);
 
-	DBG("element %p name %s", element, element->name);
-
-	clear_scan_trigger(device);
+	clear_pending_trigger(device);
 
 	g_free(device->ident);
 	g_free(device->node);
 	g_free(device->name);
 	g_free(device->address);
 	g_free(device->interface);
+	g_free(device->path);
+	g_free(device->devname);
 
 	g_free(device->last_network);
 
 	g_hash_table_destroy(device->networks);
 	device->networks = NULL;
+
+	g_free(device);
 }
 
 /**
@@ -460,9 +409,6 @@ struct connman_device *connman_device_create(const char *node,
 						enum connman_device_type type)
 {
 	struct connman_device *device;
-	const char *str;
-	enum connman_service_type service_type;
-	connman_bool_t bg_scan;
 
 	DBG("node %s type %d", node, type);
 
@@ -472,55 +418,17 @@ struct connman_device *connman_device_create(const char *node,
 
 	DBG("device %p", device);
 
-	bg_scan = connman_configuration_get_bool("BackgroundScanning");
-
-	__connman_element_initialize(&device->element);
-
-	device->element.name = g_strdup(node);
-	device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE;
-
-	device->element.device = device;
-	device->element.destruct = device_destruct;
-
-	str = type2string(type);
-	if (str != NULL)
-		connman_element_set_string(&device->element,
-					CONNMAN_PROPERTY_ID_TYPE, str);
-
-	device->element.ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP;
+	device->refcount = 1;
 
 	device->type = type;
 	device->name = g_strdup(type2description(device->type));
 
-	device->powered_persistent = TRUE;
-
 	device->phyindex = -1;
 
-	service_type = __connman_device_get_service_type(device);
-	device->blocked = __connman_technology_get_blocked(service_type);
-	device->backoff_interval = SCAN_INITIAL_DELAY;
-
-	switch (type) {
-	case CONNMAN_DEVICE_TYPE_UNKNOWN:
-	case CONNMAN_DEVICE_TYPE_ETHERNET:
-	case CONNMAN_DEVICE_TYPE_WIMAX:
-	case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-	case CONNMAN_DEVICE_TYPE_CELLULAR:
-	case CONNMAN_DEVICE_TYPE_GPS:
-	case CONNMAN_DEVICE_TYPE_GADGET:
-	case CONNMAN_DEVICE_TYPE_VENDOR:
-		device->scan_interval = 0;
-		break;
-	case CONNMAN_DEVICE_TYPE_WIFI:
-		if (bg_scan == TRUE)
-			device->scan_interval = 300;
-		else
-			device->scan_interval = 0;
-		break;
-	}
-
 	device->networks = g_hash_table_new_full(g_str_hash, g_str_equal,
-						g_free, unregister_network);
+						g_free, free_network);
+
+	device_list = g_slist_append(device_list, device);
 
 	return device;
 }
@@ -531,10 +439,13 @@ struct connman_device *connman_device_create(const char *node,
  *
  * Increase reference counter of device
  */
-struct connman_device *connman_device_ref(struct connman_device *device)
+struct connman_device *connman_device_ref_debug(struct connman_device *device,
+				const char *file, int line, const char *caller)
 {
-	if (connman_element_ref(&device->element) == NULL)
-		return NULL;
+	DBG("%p ref %d by %s:%d:%s()", device, device->refcount + 1,
+		file, line, caller);
+
+	__sync_fetch_and_add(&device->refcount, 1);
 
 	return device;
 }
@@ -545,9 +456,23 @@ struct connman_device *connman_device_ref(struct connman_device *device)
  *
  * Decrease reference counter of device
  */
-void connman_device_unref(struct connman_device *device)
+void connman_device_unref_debug(struct connman_device *device,
+				const char *file, int line, const char *caller)
 {
-	connman_element_unref(&device->element);
+	DBG("%p ref %d by %s:%d:%s()", device, device->refcount - 1,
+		file, line, caller);
+
+	if (__sync_fetch_and_sub(&device->refcount, 1) != 1)
+		return;
+
+	if (device->driver) {
+		device->driver->remove(device);
+		device->driver = NULL;
+	}
+
+	device_list = g_slist_remove(device_list, device);
+
+	device_destruct(device);
 }
 
 const char *__connman_device_get_type(struct connman_device *device)
@@ -575,7 +500,7 @@ enum connman_device_type connman_device_get_type(struct connman_device *device)
  */
 void connman_device_set_index(struct connman_device *device, int index)
 {
-	device->element.index = index;
+	device->index = index;
 }
 
 /**
@@ -586,7 +511,7 @@ void connman_device_set_index(struct connman_device *device, int index)
  */
 int connman_device_get_index(struct connman_device *device)
 {
-	return device->element.index;
+	return device->index;
 }
 
 int __connman_device_get_phyindex(struct connman_device *device)
@@ -610,8 +535,8 @@ void __connman_device_set_phyindex(struct connman_device *device,
 void connman_device_set_interface(struct connman_device *device,
 						const char *interface)
 {
-	g_free(device->element.devname);
-	device->element.devname = g_strdup(interface);
+	g_free(device->devname);
+	device->devname = g_strdup(interface);
 
 	g_free(device->interface);
 	device->interface = g_strdup(interface);
@@ -653,76 +578,40 @@ const char *connman_device_get_ident(struct connman_device *device)
 int connman_device_set_powered(struct connman_device *device,
 						connman_bool_t powered)
 {
-	int err;
 	enum connman_service_type type;
 
 	DBG("driver %p powered %d", device, powered);
 
-	if (device->powered == powered) {
-		device->powered_pending = powered;
+	if (device->powered == powered)
 		return -EALREADY;
-	}
 
-	if (powered == TRUE)
-		err = __connman_device_enable(device);
-	else
-		err = __connman_device_disable(device);
+	clear_pending_trigger(device);
 
-	if (err < 0 && err != -EINPROGRESS && err != -EALREADY)
-		return err;
+	device->powered_pending = PENDING_NONE;
 
 	device->powered = powered;
-	device->powered_pending = powered;
 
 	type = __connman_device_get_service_type(device);
 
-	if (device->powered == TRUE)
-		__connman_technology_enable(type);
-	else
-		__connman_technology_disable(type);
-
-	if (device->offlinemode == TRUE && powered == TRUE)
-		return connman_device_set_powered(device, FALSE);
-
-	if (powered == FALSE)
+	if (device->powered == FALSE) {
+		__connman_technology_disabled(type);
 		return 0;
+	}
+
+	__connman_technology_enabled(type);
 
-	reset_scan_trigger(device);
+	connman_device_set_disconnected(device, FALSE);
+	device->scanning = FALSE;
 
-	if (device->driver && device->driver->scan)
+	if (device->driver && device->driver->scan_fast)
+		device->driver->scan_fast(device);
+	else if (device->driver && device->driver->scan)
 		device->driver->scan(device);
 
 	return 0;
 }
 
-int __connman_device_set_blocked(struct connman_device *device,
-						connman_bool_t blocked)
-{
-	connman_bool_t powered;
-
-	DBG("device %p blocked %d", device, blocked);
-
-	device->blocked = blocked;
-
-	if (device->offlinemode == TRUE)
-		return 0;
-
-	connman_info("%s {rfkill} blocked %d", device->interface, blocked);
-
-	if (blocked == FALSE)
-		powered = device->powered_persistent;
-	else
-		powered = FALSE;
-
-	return set_powered(device, powered);
-}
-
-connman_bool_t __connman_device_get_blocked(struct connman_device *device)
-{
-	return device->blocked;
-}
-
-int __connman_device_scan(struct connman_device *device)
+static int device_scan(struct connman_device *device)
 {
 	if (!device->driver || !device->driver->scan)
 		return -EOPNOTSUPP;
@@ -730,45 +619,9 @@ int __connman_device_scan(struct connman_device *device)
 	if (device->powered == FALSE)
 		return -ENOLINK;
 
-	reset_scan_trigger(device);
-
 	return device->driver->scan(device);
 }
 
-int __connman_device_enable_persistent(struct connman_device *device)
-{
-	int err;
-
-	DBG("device %p", device);
-
-	device->powered_persistent = TRUE;
-
-	__connman_storage_save_device(device);
-
-	err = __connman_device_enable(device);
-	if (err == 0 || err == -EINPROGRESS) {
-		device->offlinemode = FALSE;
-		if (__connman_profile_get_offlinemode() == TRUE) {
-			__connman_profile_set_offlinemode(FALSE, FALSE);
-
-			__connman_profile_save_default();
-		}
-	}
-
-	return err;
-}
-
-int __connman_device_disable_persistent(struct connman_device *device)
-{
-	DBG("device %p", device);
-
-	device->powered_persistent = FALSE;
-
-	__connman_storage_save_device(device);
-
-	return __connman_device_disable(device);
-}
-
 int __connman_device_disconnect(struct connman_device *device)
 {
 	GHashTableIter iter;
@@ -794,7 +647,7 @@ int __connman_device_disconnect(struct connman_device *device)
 			 * will fail.  There is nothing to be gained by
 			 * removing the network here anyway.
 			 */
-			connman_warn("Skipping disconnect of %s",
+			connman_warn("Skipping disconnect of %s, network is connecting.",
 				connman_network_get_identifier(network));
 			continue;
 		}
@@ -806,7 +659,7 @@ int __connman_device_disconnect(struct connman_device *device)
 }
 
 static void mark_network_available(gpointer key, gpointer value,
-                                                        gpointer user_data)
+							gpointer user_data)
 {
 	struct connman_network *network = value;
 
@@ -844,18 +697,15 @@ void __connman_device_cleanup_networks(struct connman_device *device)
 					remove_unavailable_network, NULL);
 }
 
-connman_bool_t __connman_device_scanning(struct connman_device *device)
+connman_bool_t connman_device_get_scanning(struct connman_device *device)
 {
 	return device->scanning;
 }
 
 void connman_device_reset_scanning(struct connman_device *device)
 {
-	device->scanning = FALSE;
-
 	g_hash_table_foreach(device->networks,
 				mark_network_available, NULL);
-
 }
 
 /**
@@ -879,7 +729,7 @@ int connman_device_set_scanning(struct connman_device *device,
 	device->scanning = scanning;
 
 	if (scanning == TRUE) {
-		reset_scan_trigger(device);
+		__connman_technology_scan_started(device);
 
 		g_hash_table_foreach(device->networks,
 					mark_network_unavailable, NULL);
@@ -889,8 +739,7 @@ int connman_device_set_scanning(struct connman_device *device,
 
 	__connman_device_cleanup_networks(device);
 
-	if (device->connections > 0)
-		return 0;
+	__connman_technology_scan_stopped(device);
 
 	__connman_service_auto_connect();
 
@@ -914,9 +763,6 @@ int connman_device_set_disconnected(struct connman_device *device,
 
 	device->disconnected = disconnected;
 
-	if (disconnected == TRUE)
-		force_scan_trigger(device);
-
 	return 0;
 }
 
@@ -953,9 +799,14 @@ int connman_device_set_string(struct connman_device *device,
 	} else if (g_str_equal(key, "Node") == TRUE) {
 		g_free(device->node);
 		device->node = g_strdup(value);
+	} else if (g_str_equal(key, "Path") == TRUE) {
+		g_free(device->path);
+		device->path = g_strdup(value);
+	} else {
+		return -EINVAL;
 	}
 
-	return connman_element_set_string(&device->element, key, value);
+	return 0;
 }
 
 /**
@@ -978,66 +829,10 @@ const char *connman_device_get_string(struct connman_device *device,
 		return device->node;
 	else if (g_str_equal(key, "Interface") == TRUE)
 		return device->interface;
+	else if (g_str_equal(key, "Path") == TRUE)
+		return device->path;
 
-	return connman_element_get_string(&device->element, key);
-}
-
-static void set_offlinemode(struct connman_element *element, gpointer user_data)
-{
-	struct connman_device *device = element->device;
-	connman_bool_t offlinemode = GPOINTER_TO_UINT(user_data);
-	connman_bool_t powered;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (device == NULL)
-		return;
-
-	device->offlinemode = offlinemode;
-
-	if (device->blocked == TRUE)
-		return;
-
-	powered = (offlinemode == TRUE) ? FALSE : TRUE;
-
-	if (device->powered == powered)
-		return;
-
-	if (device->powered_persistent == FALSE)
-		powered = FALSE;
-
-	set_powered(device, powered);
-}
-
-int __connman_device_set_offlinemode(connman_bool_t offlinemode)
-{
-	DBG("offlinmode %d", offlinemode);
-
-	__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
-			set_offlinemode, GUINT_TO_POINTER(offlinemode));
-
-	__connman_notifier_offlinemode(offlinemode);
-
-	return 0;
-}
-
-void __connman_device_increase_connections(struct connman_device *device)
-{
-	if (device == NULL)
-		return;
-
-	device->connections++;
-}
-
-void __connman_device_decrease_connections(struct connman_device *device)
-{
-	if (device == NULL)
-		return;
-
-	device->connections--;
-
-	if (device->connections == 0)
-		device->backoff_interval = SCAN_INITIAL_DELAY;
+	return NULL;
 }
 
 /**
@@ -1051,23 +846,17 @@ int connman_device_add_network(struct connman_device *device,
 					struct connman_network *network)
 {
 	const char *identifier = connman_network_get_identifier(network);
-	int err;
 
 	DBG("device %p network %p", device, network);
 
 	if (identifier == NULL)
 		return -EINVAL;
 
-	__connman_network_set_device(network, device);
+	connman_network_ref(network);
 
-	err = connman_element_register((struct connman_element *) network,
-							&device->element);
-	if (err < 0) {
-		__connman_network_set_device(network, NULL);
-		return err;
-	}
+	__connman_network_set_device(network, device);
 
-	g_hash_table_insert(device->networks, g_strdup(identifier),
+	g_hash_table_replace(device->networks, g_strdup(identifier),
 								network);
 
 	return 0;
@@ -1096,10 +885,16 @@ struct connman_network *connman_device_get_network(struct connman_device *device
  * Remove network for given identifier
  */
 int connman_device_remove_network(struct connman_device *device,
-							const char *identifier)
+						struct connman_network *network)
 {
-	DBG("device %p identifier %s", device, identifier);
+	const char *identifier;
+
+	DBG("device %p network %p", device, network);
+
+	if (network == NULL)
+		return 0;
 
+	identifier = connman_network_get_identifier(network);
 	g_hash_table_remove(device->networks, identifier);
 
 	return 0;
@@ -1121,16 +916,12 @@ void __connman_device_set_network(struct connman_device *device,
 	if (device->network == network)
 		return;
 
-	if (device->network != NULL)
-		connman_network_unref(device->network);
-
 	if (network != NULL) {
-		name = connman_network_get_string(network,
-						CONNMAN_PROPERTY_ID_NAME);
+		name = connman_network_get_string(network, "Name");
 		g_free(device->last_network);
 		device->last_network = g_strdup(name);
 
-		device->network = connman_network_ref(network);
+		device->network = network;
 	} else {
 		g_free(device->last_network);
 		device->last_network = NULL;
@@ -1151,6 +942,16 @@ connman_bool_t  __connman_device_get_reconnect(
 	return device->reconnect;
 }
 
+static gboolean match_driver(struct connman_device *device,
+					struct connman_device_driver *driver)
+{
+	if (device->type == driver->type ||
+			driver->type == CONNMAN_DEVICE_TYPE_UNKNOWN)
+		return TRUE;
+
+	return FALSE;
+}
+
 /**
  * connman_device_register:
  * @device: device structure
@@ -1159,11 +960,31 @@ connman_bool_t  __connman_device_get_reconnect(
  */
 int connman_device_register(struct connman_device *device)
 {
-	__connman_storage_load_device(device);
+	GSList *list;
+
+	DBG("device %p name %s", device, device->name);
+
+	if (device->driver != NULL)
+		return -EALREADY;
+
+	for (list = driver_list; list; list = list->next) {
+		struct connman_device_driver *driver = list->data;
+
+		if (match_driver(device, driver) == FALSE)
+			continue;
+
+		DBG("driver %p name %s", driver, driver->name);
+
+		if (driver->probe(device) == 0) {
+			device->driver = driver;
+			break;
+		}
+	}
 
-	device->offlinemode = __connman_profile_get_offlinemode();
+	if (device->driver == NULL)
+		return 0;
 
-	return connman_element_register(&device->element, NULL);
+	return __connman_technology_add_device(device);
 }
 
 /**
@@ -1174,9 +995,12 @@ int connman_device_register(struct connman_device *device)
  */
 void connman_device_unregister(struct connman_device *device)
 {
-	__connman_storage_save_device(device);
+	DBG("device %p name %s", device, device->name);
+
+	if (device->driver == NULL)
+		return;
 
-	connman_element_unregister(&device->element);
+	remove_device(device);
 }
 
 /**
@@ -1202,153 +1026,140 @@ void connman_device_set_data(struct connman_device *device, void *data)
 	device->driver_data = data;
 }
 
-static gboolean match_driver(struct connman_device *device,
-					struct connman_device_driver *driver)
+struct connman_device *__connman_device_find_device(
+				enum connman_service_type type)
 {
-	if (device->type == driver->type ||
-			driver->type == CONNMAN_DEVICE_TYPE_UNKNOWN)
-		return TRUE;
-
-	return FALSE;
-}
-
-static int device_probe(struct connman_element *element)
-{
-	struct connman_device *device = element->device;
 	GSList *list;
 
-	DBG("element %p name %s", element, element->name);
-
-	if (device == NULL)
-		return -ENODEV;
+	for (list = device_list; list != NULL; list = list->next) {
+		struct connman_device *device = list->data;
+		enum connman_service_type service_type =
+			__connman_device_get_service_type(device);
 
-	if (device->driver != NULL)
-		return -EALREADY;
-
-	for (list = driver_list; list; list = list->next) {
-		struct connman_device_driver *driver = list->data;
-
-		if (match_driver(device, driver) == FALSE)
+		if (service_type != type)
 			continue;
 
-		DBG("driver %p name %s", driver, driver->name);
-
-		if (driver->probe(device) == 0) {
-			device->driver = driver;
-			break;
-		}
+		return device;
 	}
 
-	if (device->driver == NULL)
-		return -ENODEV;
-
-	return setup_device(device);
+	return NULL;
 }
 
-static void device_remove(struct connman_element *element)
+int __connman_device_request_scan(enum connman_service_type type)
 {
-	struct connman_device *device = element->device;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (device == NULL)
-		return;
-
-	if (device->driver == NULL)
-		return;
+	connman_bool_t success = FALSE;
+	int last_err = -ENOSYS;
+	GSList *list;
+	int err;
 
-	remove_device(device);
-}
+	switch (type) {
+	case CONNMAN_SERVICE_TYPE_UNKNOWN:
+	case CONNMAN_SERVICE_TYPE_SYSTEM:
+	case CONNMAN_SERVICE_TYPE_ETHERNET:
+	case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+	case CONNMAN_SERVICE_TYPE_CELLULAR:
+	case CONNMAN_SERVICE_TYPE_GPS:
+	case CONNMAN_SERVICE_TYPE_VPN:
+	case CONNMAN_SERVICE_TYPE_GADGET:
+		return -EOPNOTSUPP;
+	case CONNMAN_SERVICE_TYPE_WIFI:
+	case CONNMAN_SERVICE_TYPE_WIMAX:
+		break;
+	}
 
-static struct connman_driver device_driver = {
-	.name		= "device",
-	.type		= CONNMAN_ELEMENT_TYPE_DEVICE,
-	.priority	= CONNMAN_DRIVER_PRIORITY_LOW,
-	.probe		= device_probe,
-	.remove		= device_remove,
-};
+	for (list = device_list; list != NULL; list = list->next) {
+		struct connman_device *device = list->data;
+		enum connman_service_type service_type =
+			__connman_device_get_service_type(device);
 
-static int device_load(struct connman_device *device)
-{
-	const char *ident = __connman_profile_active_ident();
-	GKeyFile *keyfile;
-	GError *error = NULL;
-	gchar *identifier;
-	connman_bool_t powered;
+		if (service_type != CONNMAN_SERVICE_TYPE_UNKNOWN &&
+				service_type != type) {
+			continue;
+		}
 
-	DBG("device %p", device);
+		err = device_scan(device);
+		if (err == 0 || err == -EALREADY || err == -EINPROGRESS) {
+			success = TRUE;
+		} else {
+			last_err = err;
+			DBG("device %p err %d", device, err);
+		}
+	}
 
-	keyfile = __connman_storage_open_profile(ident);
-	if (keyfile == NULL)
+	if (success == TRUE)
 		return 0;
 
-	identifier = g_strdup_printf("device_%s", device->element.name);
-	if (identifier == NULL)
-		goto done;
+	return last_err;
+}
 
-	powered = g_key_file_get_boolean(keyfile, identifier,
-						"Powered", &error);
-	if (error == NULL)
-		device->powered_persistent = powered;
-	g_clear_error(&error);
+int __connman_device_request_hidden_scan(struct connman_device *device,
+				const char *ssid, unsigned int ssid_len,
+				const char *identity, const char *passphrase,
+				void *user_data)
+{
+	DBG("device %p", device);
 
-done:
-	g_free(identifier);
+	if (device == NULL || device->driver == NULL ||
+			device->driver->scan_hidden == NULL)
+		return -EINVAL;
 
-	__connman_storage_close_profile(ident, keyfile, FALSE);
+	if (device->scanning == TRUE)
+		return -EALREADY;
 
-	return 0;
+	return device->driver->scan_hidden(device, ssid, ssid_len,
+					identity, passphrase, user_data);
 }
 
-static int device_save(struct connman_device *device)
+connman_bool_t __connman_device_isfiltered(const char *devname)
 {
-	const char *ident = __connman_profile_active_ident();
-	GKeyFile *keyfile;
-	gchar *identifier;
-
-	DBG("device %p", device);
+	char **pattern;
 
-	keyfile = __connman_storage_open_profile(ident);
-	if (keyfile == NULL)
-		return 0;
+	if (device_filter == NULL)
+		goto nodevice;
 
-	identifier = g_strdup_printf("device_%s", device->element.name);
-	if (identifier == NULL)
-		goto done;
+	for (pattern = device_filter; *pattern; pattern++) {
+		if (g_pattern_match_simple(*pattern, devname) == FALSE) {
+			DBG("ignoring device %s (match)", devname);
+			return TRUE;
+		}
+	}
 
-	g_key_file_set_boolean(keyfile, identifier,
-					"Powered", device->powered_persistent);
+nodevice:
+	if (g_pattern_match_simple("dummy*", devname) == TRUE) {
+		DBG("ignoring dummy networking devices");
+		return TRUE;
+	}
 
-done:
-	g_free(identifier);
+	if (nodevice_filter == NULL)
+		return FALSE;
 
-	__connman_storage_close_profile(ident, keyfile, TRUE);
+	for (pattern = nodevice_filter; *pattern; pattern++) {
+		if (g_pattern_match_simple(*pattern, devname) == TRUE) {
+			DBG("ignoring device %s (no match)", devname);
+			return TRUE;
+		}
+	}
 
-	return 0;
+	return FALSE;
 }
 
-static struct connman_storage device_storage = {
-	.name		= "device",
-	.priority	= CONNMAN_STORAGE_PRIORITY_LOW,
-	.device_load	= device_load,
-	.device_save	= device_save,
-};
-
-int __connman_device_init(void)
+int __connman_device_init(const char *device, const char *nodevice)
 {
 	DBG("");
 
-	if (connman_storage_register(&device_storage) < 0)
-		connman_error("Failed to register device storage");
+	if (device != NULL)
+		device_filter = g_strsplit(device, ",", -1);
+
+	if (nodevice != NULL)
+		nodevice_filter = g_strsplit(nodevice, ",", -1);
 
-	return connman_driver_register(&device_driver);
+	return 0;
 }
 
 void __connman_device_cleanup(void)
 {
 	DBG("");
 
-	connman_driver_unregister(&device_driver);
-
-	connman_storage_unregister(&device_storage);
+	g_strfreev(nodevice_filter);
+	g_strfreev(device_filter);
 }