Fix network out of range detection
[connman] / src / device.c
index d74b634..a2b8f6f 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  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
@@ -33,21 +33,32 @@ struct connman_device {
        enum connman_device_type type;
        enum connman_device_mode mode;
        enum connman_device_policy policy;
-       gboolean powered;
-       gboolean carrier;
-       gboolean scanning;
-       char *path;
+       connman_bool_t powered;
+       connman_bool_t carrier;
+       connman_bool_t scanning;
+       connman_bool_t disconnected;
+       connman_uint8_t priority;
+       char *name;
+       char *node;
        char *interface;
+       unsigned int connections;
 
        struct connman_device_driver *driver;
        void *driver_data;
 
+       connman_bool_t registered;
+
+       char *last_network;
+       struct connman_network *network;
        GHashTable *networks;
 };
 
 static const char *type2description(enum connman_device_type type)
 {
        switch (type) {
+       case CONNMAN_DEVICE_TYPE_UNKNOWN:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
+               break;
        case CONNMAN_DEVICE_TYPE_ETHERNET:
                return "Ethernet";
        case CONNMAN_DEVICE_TYPE_WIFI:
@@ -57,35 +68,44 @@ static const char *type2description(enum connman_device_type type)
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
                return "Bluetooth";
        case CONNMAN_DEVICE_TYPE_HSO:
+       case CONNMAN_DEVICE_TYPE_NOZOMI:
+       case CONNMAN_DEVICE_TYPE_HUAWEI:
+       case CONNMAN_DEVICE_TYPE_NOVATEL:
                return "Cellular";
-       default:
-               return NULL;
        }
+
+       return NULL;
 }
 
 static const char *type2string(enum connman_device_type type)
 {
        switch (type) {
+       case CONNMAN_DEVICE_TYPE_UNKNOWN:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
+               break;
        case CONNMAN_DEVICE_TYPE_ETHERNET:
                return "ethernet";
        case CONNMAN_DEVICE_TYPE_WIFI:
                return "wifi";
        case CONNMAN_DEVICE_TYPE_WIMAX:
                return "wimax";
-       case CONNMAN_DEVICE_TYPE_MODEM:
-               return "modem";
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
                return "bluetooth";
        case CONNMAN_DEVICE_TYPE_HSO:
+       case CONNMAN_DEVICE_TYPE_HUAWEI:
+       case CONNMAN_DEVICE_TYPE_NOZOMI:
+       case CONNMAN_DEVICE_TYPE_NOVATEL:
                return "cellular";
-       default:
-               return NULL;
        }
+
+       return NULL;
 }
 
 static const char *policy2string(enum connman_device_policy policy)
 {
        switch (policy) {
+       case CONNMAN_DEVICE_POLICY_UNKNOWN:
+               break;
        case CONNMAN_DEVICE_POLICY_IGNORE:
                return "ignore";
        case CONNMAN_DEVICE_POLICY_OFF:
@@ -94,12 +114,26 @@ static const char *policy2string(enum connman_device_policy policy)
                return "auto";
        case CONNMAN_DEVICE_POLICY_MANUAL:
                return "manual";
-       default:
-               return NULL;
        }
+
+       return NULL;
 }
 
-static int set_powered(struct connman_device *device, gboolean powered)
+static enum connman_device_policy string2policy(const char *policy)
+{
+       if (g_str_equal(policy, "ignore") == TRUE)
+               return CONNMAN_DEVICE_POLICY_IGNORE;
+       else if (g_str_equal(policy, "off") == TRUE)
+               return CONNMAN_DEVICE_POLICY_OFF;
+       else if (g_str_equal(policy, "auto") == TRUE)
+               return CONNMAN_DEVICE_POLICY_AUTO;
+       else if (g_str_equal(policy, "manual") == TRUE)
+               return CONNMAN_DEVICE_POLICY_MANUAL;
+       else
+               return CONNMAN_DEVICE_POLICY_UNKNOWN;
+}
+
+static int set_powered(struct connman_device *device, connman_bool_t powered)
 {
        struct connman_device_driver *driver = device->driver;
        int err;
@@ -115,6 +149,8 @@ static int set_powered(struct connman_device *device, gboolean powered)
                else
                        err = -EINVAL;
        } else {
+               g_hash_table_remove_all(device->networks);
+
                if (driver->disable)
                        err = driver->disable(device);
                else
@@ -124,6 +160,62 @@ static int set_powered(struct connman_device *device, gboolean powered)
        return err;
 }
 
+static int set_policy(DBusConnection *connection,
+                               struct connman_device *device,
+                                       enum connman_device_policy policy)
+{
+       DBusMessage *signal;
+       DBusMessageIter entry, value;
+       const char *str, *key = "Policy";
+       int err = 0;
+
+       DBG("device %p policy %d", device, policy);
+
+       if (device->policy == policy)
+               return 0;
+
+       switch (policy) {
+       case CONNMAN_DEVICE_POLICY_UNKNOWN:
+               return -EINVAL;
+       case CONNMAN_DEVICE_POLICY_IGNORE:
+               break;
+       case CONNMAN_DEVICE_POLICY_OFF:
+               if (device->powered == TRUE)
+                       err = set_powered(device, FALSE);
+               break;
+       case CONNMAN_DEVICE_POLICY_AUTO:
+       case CONNMAN_DEVICE_POLICY_MANUAL:
+               if (device->powered == FALSE)
+                       err = set_powered(device, TRUE);
+               break;
+       }
+
+       if (err < 0)
+               return err;
+
+       device->policy = policy;
+
+       signal = dbus_message_new_signal(device->element.path,
+                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
+       if (signal == NULL)
+               return 0;
+
+       dbus_message_iter_init_append(signal, &entry);
+
+       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+       str = policy2string(policy);
+
+       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+                                       DBUS_TYPE_STRING_AS_STRING, &value);
+       dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &str);
+       dbus_message_iter_close_container(&entry, &value);
+
+       g_dbus_send_message(connection, signal);
+
+       return 0;
+}
+
 static void append_networks(struct connman_device *device,
                                                DBusMessageIter *entry)
 {
@@ -155,6 +247,10 @@ static DBusMessage *get_properties(DBusConnection *conn,
 
        DBG("conn %p", conn);
 
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_PUBLIC) < 0)
+               return __connman_error_permission_denied(msg);
+
        reply = dbus_message_new_method_return(msg);
        if (reply == NULL)
                return NULL;
@@ -189,6 +285,10 @@ static DBusMessage *get_properties(DBusConnection *conn,
                connman_dbus_dict_append_variant(&dict, "Policy",
                                                DBUS_TYPE_STRING, &str);
 
+       if (device->priority > 0)
+               connman_dbus_dict_append_variant(&dict, "Priority",
+                                       DBUS_TYPE_BYTE, &device->priority);
+
        connman_dbus_dict_append_variant(&dict, "Powered",
                                        DBUS_TYPE_BOOLEAN, &device->powered);
 
@@ -196,11 +296,19 @@ static DBusMessage *get_properties(DBusConnection *conn,
                connman_dbus_dict_append_variant(&dict, "Scanning",
                                        DBUS_TYPE_BOOLEAN, &device->scanning);
 
-       if (device->mode != CONNMAN_DEVICE_MODE_NO_NETWORK) {
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+               break;
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+               __connman_element_append_ipv4(&device->element, &dict);
+               break;
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
                dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
                                                                NULL, &entry);
                append_networks(device, &entry);
                dbus_message_iter_close_container(&dict, &entry);
+               break;
        }
 
        dbus_message_iter_close_container(&array, &dict);
@@ -214,6 +322,7 @@ static DBusMessage *set_property(DBusConnection *conn,
        struct connman_device *device = data;
        DBusMessageIter iter, value;
        const char *name;
+       int type;
 
        DBG("conn %p", conn);
 
@@ -224,13 +333,19 @@ static DBusMessage *set_property(DBusConnection *conn,
        dbus_message_iter_next(&iter);
        dbus_message_iter_recurse(&iter, &value);
 
-       if (__connman_security_check_privileges(msg) < 0)
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
                return __connman_error_permission_denied(msg);
 
+       type = dbus_message_iter_get_arg_type(&value);
+
        if (g_str_equal(name, "Powered") == TRUE) {
-               gboolean powered;
+               connman_bool_t powered;
                int err;
 
+               if (type != DBUS_TYPE_BOOLEAN)
+                       return __connman_error_invalid_arguments(msg);
+
                dbus_message_iter_get_basic(&value, &powered);
 
                if (device->powered == powered)
@@ -239,9 +354,45 @@ static DBusMessage *set_property(DBusConnection *conn,
                err = set_powered(device, powered);
                if (err < 0 && err != -EINPROGRESS)
                        return __connman_error_failed(msg);
+       } else if (g_str_equal(name, "Policy") == TRUE) {
+               enum connman_device_policy policy;
+               const char *str;
+               int err;
+
+               if (type != DBUS_TYPE_STRING)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &str);
+               policy = string2policy(str);
+               if (policy == CONNMAN_DEVICE_POLICY_UNKNOWN)
+                       return __connman_error_invalid_arguments(msg);
+
+               err = set_policy(conn, device, policy);
+               if (err < 0)
+                       return __connman_error_failed(msg);
+       } else if (g_str_equal(name, "Priority") == TRUE) {
+               connman_uint8_t priority;
+
+               if (type != DBUS_TYPE_BYTE)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &priority);
+
+               device->priority = priority;
+       } else if (g_str_has_prefix(name, "IPv4") == TRUE) {
+               switch (device->mode) {
+               case CONNMAN_DEVICE_MODE_UNKNOWN:
+               case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+               case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+                       return __connman_error_invalid_arguments(msg);
+               case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+                       __connman_element_set_ipv4(&device->element,
+                                                               name, &value);
+                       break;
+               }
        }
 
-       __connman_element_store(&device->element);
+       __connman_storage_save_device(device);
 
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
@@ -251,7 +402,8 @@ static DBusMessage *create_network(DBusConnection *conn,
 {
        DBG("conn %p", conn);
 
-       if (__connman_security_check_privileges(msg) < 0)
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
                return __connman_error_permission_denied(msg);
 
        return __connman_error_invalid_arguments(msg);
@@ -262,7 +414,8 @@ static DBusMessage *remove_network(DBusConnection *conn,
 {
        DBG("conn %p", conn);
 
-       if (__connman_security_check_privileges(msg) < 0)
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
                return __connman_error_permission_denied(msg);
 
        return __connman_error_invalid_arguments(msg);
@@ -276,12 +429,21 @@ static DBusMessage *propose_scan(DBusConnection *conn,
 
        DBG("conn %p", conn);
 
-       if (device->mode == CONNMAN_DEVICE_MODE_NO_NETWORK)
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
                return __connman_error_not_supported(msg);
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+               break;
+       }
 
        if (!device->driver || !device->driver->scan)
                return __connman_error_not_supported(msg);
 
+       if (device->powered == FALSE)
+               return __connman_error_failed(msg);
+
        err = device->driver->scan(device);
        if (err < 0)
                return __connman_error_failed(msg);
@@ -345,6 +507,8 @@ static int register_interface(struct connman_element *element)
 {
        struct connman_device *device = element->device;
 
+       DBG("element %p name %s", element, element->name);
+
        if (g_dbus_register_interface(connection, element->path,
                                        CONNMAN_DEVICE_INTERFACE,
                                        device_methods, device_signals,
@@ -353,6 +517,8 @@ static int register_interface(struct connman_element *element)
                return -EIO;
        }
 
+       device->registered = TRUE;
+
        emit_devices_signal();
 
        return 0;
@@ -360,12 +526,123 @@ static int register_interface(struct connman_element *element)
 
 static void unregister_interface(struct connman_element *element)
 {
+       struct connman_device *device = element->device;
+
+       DBG("element %p name %s", element, element->name);
+
+       device->registered = FALSE;
+
        emit_devices_signal();
 
        g_dbus_unregister_interface(connection, element->path,
                                                CONNMAN_DEVICE_INTERFACE);
 }
 
+static void device_enable(struct connman_device *device)
+{
+       DBG("device %p", device);
+
+       if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE ||
+                               device->policy == CONNMAN_DEVICE_POLICY_OFF)
+               return;
+
+       if (device->powered == TRUE)
+               return;
+
+       if (device->driver->enable)
+               device->driver->enable(device);
+}
+
+static void device_disable(struct connman_device *device)
+{
+       DBG("device %p", device);
+
+       if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE)
+               return;
+
+       if (device->powered == FALSE)
+               return;
+
+       g_hash_table_remove_all(device->networks);
+
+       if (device->driver->disable)
+               device->driver->disable(device);
+}
+
+static int setup_device(struct connman_device *device)
+{
+       int err;
+
+       DBG("device %p", device);
+
+       err = register_interface(&device->element);
+       if (err < 0) {
+               if (device->driver->remove)
+                       device->driver->remove(device);
+               device->driver = NULL;
+               return err;
+       }
+
+       device_enable(device);
+
+       return 0;
+}
+
+static void probe_driver(struct connman_element *element, gpointer user_data)
+{
+       struct connman_device_driver *driver = user_data;
+
+       DBG("element %p name %s", element, element->name);
+
+       if (element->device == NULL)
+               return;
+
+       if (element->device->driver != NULL)
+               return;
+
+       if (driver->probe(element->device) < 0)
+               return;
+
+       element->device->driver = driver;
+
+       setup_device(element->device);
+}
+
+static void remove_device(struct connman_device *device)
+{
+       DBG("device %p", device);
+
+       device_disable(device);
+
+       unregister_interface(&device->element);
+
+       if (device->driver->remove)
+               device->driver->remove(device);
+
+       device->driver = NULL;
+}
+
+static void remove_driver(struct connman_element *element, gpointer user_data)
+{
+       struct connman_device_driver *driver = user_data;
+
+       DBG("element %p name %s", element, element->name);
+
+       if (element->device == NULL)
+               return;
+
+       if (element->device->driver == driver)
+               remove_device(element->device);
+}
+
+connman_bool_t __connman_device_has_driver(struct connman_device *device)
+{
+       if (device == NULL || device->driver == NULL)
+               return FALSE;
+
+       return device->registered;
+}
+
 static GSList *driver_list = NULL;
 
 static gint compare_priority(gconstpointer a, gconstpointer b)
@@ -391,7 +668,8 @@ int connman_device_driver_register(struct connman_device_driver *driver)
        driver_list = g_slist_insert_sorted(driver_list, driver,
                                                        compare_priority);
 
-       //__connman_driver_rescan(&device_driver);
+       __connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
+                                               probe_driver, driver);
 
        return 0;
 }
@@ -407,6 +685,9 @@ void connman_device_driver_unregister(struct connman_device_driver *driver)
        DBG("driver %p name %s", driver, driver->name);
 
        driver_list = g_slist_remove(driver_list, driver);
+
+       __connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
+                                               remove_driver, driver);
 }
 
 static void unregister_network(gpointer data)
@@ -426,9 +707,14 @@ static void device_destruct(struct connman_element *element)
 
        DBG("element %p name %s", element, element->name);
 
+       g_free(device->node);
+       g_free(device->name);
        g_free(device->interface);
 
+       g_free(device->last_network);
+
        g_hash_table_destroy(device->networks);
+       device->networks = NULL;
 }
 
 /**
@@ -444,6 +730,7 @@ struct connman_device *connman_device_create(const char *node,
                                                enum connman_device_type type)
 {
        struct connman_device *device;
+       const char *str;
 
        DBG("node %s type %d", node, type);
 
@@ -453,19 +740,48 @@ struct connman_device *connman_device_create(const char *node,
 
        DBG("device %p", device);
 
-       device->element.refcount = 1;
+       __connman_element_initialize(&device->element);
 
        device->element.name = g_strdup(node);
        device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE;
-       device->element.index = -1;
 
        device->element.device = device;
        device->element.destruct = device_destruct;
 
-       device->type = type;
-       device->mode = CONNMAN_DEVICE_MODE_NO_NETWORK;
+       str = type2string(type);
+       if (str != NULL)
+               connman_element_set_static_property(&device->element,
+                                       "Type", DBUS_TYPE_STRING, &str);
+
+       device->element.ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+
+       device->type   = type;
+       device->mode   = CONNMAN_DEVICE_MODE_UNKNOWN;
        device->policy = CONNMAN_DEVICE_POLICY_AUTO;
 
+       switch (type) {
+       case CONNMAN_DEVICE_TYPE_UNKNOWN:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
+               device->priority = 0;
+               break;
+       case CONNMAN_DEVICE_TYPE_ETHERNET:
+       case CONNMAN_DEVICE_TYPE_WIFI:
+               device->priority = 100;
+               break;
+       case CONNMAN_DEVICE_TYPE_WIMAX:
+               device->priority = 20;
+               break;
+       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+               device->priority = 50;
+               break;
+       case CONNMAN_DEVICE_TYPE_HSO:
+       case CONNMAN_DEVICE_TYPE_NOZOMI:
+       case CONNMAN_DEVICE_TYPE_HUAWEI:
+       case CONNMAN_DEVICE_TYPE_NOVATEL:
+               device->priority = 60;
+               break;
+       }
+
        device->networks = g_hash_table_new_full(g_str_hash, g_str_equal,
                                                g_free, unregister_network);
 
@@ -498,19 +814,14 @@ void connman_device_unref(struct connman_device *device)
 }
 
 /**
- * connman_device_set_path:
+ * connman_device_get_name:
  * @device: device structure
- * @path: path name
  *
- * Set path name of device
+ * Get unique name of device
  */
-void connman_device_set_path(struct connman_device *device, const char *path)
+const char *connman_device_get_name(struct connman_device *device)
 {
-       g_free(device->element.devpath);
-       device->element.devpath = g_strdup(path);
-
-       g_free(device->path);
-       device->path = g_strdup(path);
+       return device->element.name;
 }
 
 /**
@@ -521,7 +832,7 @@ void connman_device_set_path(struct connman_device *device, const char *path)
  */
 const char *connman_device_get_path(struct connman_device *device)
 {
-       return device->path;
+       return device->element.path;
 }
 
 /**
@@ -602,6 +913,17 @@ void connman_device_set_mode(struct connman_device *device,
 }
 
 /**
+ * connman_device_get_mode:
+ * @device: device structure
+ *
+ * Get network mode of device
+ */
+enum connman_device_mode connman_device_get_mode(struct connman_device *device)
+{
+       return device->mode;
+}
+
+/**
  * connman_device_set_powered:
  * @device: device structure
  * @powered: powered state
@@ -609,7 +931,7 @@ void connman_device_set_mode(struct connman_device *device,
  * Change power state of device
  */
 int connman_device_set_powered(struct connman_device *device,
-                                                       gboolean powered)
+                                               connman_bool_t powered)
 {
        DBusMessage *signal;
        DBusMessageIter entry, value;
@@ -638,6 +960,15 @@ int connman_device_set_powered(struct connman_device *device,
 
        g_dbus_send_message(connection, signal);
 
+       if (powered == FALSE)
+               return 0;
+
+       if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+               return 0;
+
+       if (device->driver->scan)
+               device->driver->scan(device);
+
        return 0;
 }
 
@@ -649,12 +980,18 @@ int connman_device_set_powered(struct connman_device *device,
  * Change carrier state of device (only for device without scanning)
  */
 int connman_device_set_carrier(struct connman_device *device,
-                                                       gboolean carrier)
+                                               connman_bool_t carrier)
 {
        DBG("driver %p carrier %d", device, carrier);
 
-       if (device->mode != CONNMAN_DEVICE_MODE_NO_NETWORK)
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
                return -EINVAL;
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+               break;
+       }
 
        if (device->carrier == carrier)
                return -EALREADY;
@@ -662,13 +999,25 @@ int connman_device_set_carrier(struct connman_device *device,
        device->carrier = carrier;
 
        if (carrier == TRUE) {
+               enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
                struct connman_element *element;
 
+               switch (device->element.ipv4.method) {
+               case CONNMAN_IPV4_METHOD_UNKNOWN:
+               case CONNMAN_IPV4_METHOD_OFF:
+                       return 0;
+               case CONNMAN_IPV4_METHOD_STATIC:
+                       type = CONNMAN_ELEMENT_TYPE_IPV4;
+                       break;
+               case CONNMAN_IPV4_METHOD_DHCP:
+                       type = CONNMAN_ELEMENT_TYPE_DHCP;
+                       break;
+               }
+
                element = connman_element_create(NULL);
                if (element != NULL) {
-                       element->type    = CONNMAN_ELEMENT_TYPE_DEVICE;
-                       element->subtype = CONNMAN_ELEMENT_SUBTYPE_NETWORK;
-                       element->index   = device->element.index;
+                       element->type  = type;
+                       element->index = device->element.index;
 
                        if (connman_element_register(element,
                                                        &device->element) < 0)
@@ -680,6 +1029,118 @@ int connman_device_set_carrier(struct connman_device *device,
        return 0;
 }
 
+void __connman_device_disconnect(struct connman_device *device)
+{
+       GHashTableIter iter;
+       gpointer key, value;
+
+       DBG("device %p", device);
+
+       connman_device_set_disconnected(device, TRUE);
+
+       g_hash_table_iter_init(&iter, device->networks);
+
+       while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+               struct connman_network *network = value;
+
+               if (connman_network_get_connected(network) == TRUE)
+                       __connman_network_disconnect(network);
+       }
+}
+
+static void connect_known_network(struct connman_device *device)
+{
+       struct connman_network *network = NULL;
+       GHashTableIter iter;
+       gpointer key, value;
+       unsigned int count = 0;
+
+       DBG("device %p", device);
+
+       g_hash_table_iter_init(&iter, device->networks);
+
+       while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+               connman_uint8_t old_priority, new_priority;
+               connman_uint8_t old_strength, new_strength;
+               const char *name;
+
+               count++;
+
+               name = connman_network_get_string(value, "Name");
+               if (name != NULL && device->last_network != NULL) {
+                       if (g_str_equal(name, device->last_network) == TRUE) {
+                               network = value;
+                               break;
+                       }
+               }
+
+               if (connman_network_get_remember(value) == FALSE)
+                       continue;
+
+               if (network == NULL) {
+                       network = value;
+                       continue;
+               }
+
+               old_priority = connman_network_get_uint8(network, "Priority");
+               new_priority = connman_network_get_uint8(value, "Priority");
+
+               if (new_priority != old_priority) {
+                       if (new_priority > old_priority)
+                               network = value;
+                       continue;
+               }
+
+               old_strength = connman_network_get_uint8(network, "Strength");
+               new_strength = connman_network_get_uint8(value, "Strength");
+
+               if (new_strength > old_strength)
+                       network = value;
+       }
+
+       if (network != NULL) {
+               int err;
+
+               err = connman_network_connect(network);
+               if (err == 0 || err == -EINPROGRESS)
+                       return;
+       }
+
+       if (count > 0)
+               return;
+
+       if (device->driver && device->driver->scan)
+               device->driver->scan(device);
+}
+
+static void mark_network_unavailable(gpointer key, gpointer value,
+                                                       gpointer user_data)
+{
+       struct connman_network *network = value;
+
+       if (connman_network_get_connected(network) == TRUE)
+               return;
+
+       connman_network_set_available(network, FALSE);
+}
+
+static gboolean remove_unavailable_network(gpointer key, gpointer value,
+                                                       gpointer user_data)
+{
+       struct connman_network *network = value;
+
+       if (connman_network_get_connected(network) == TRUE)
+               return FALSE;
+
+       if (connman_network_get_remember(network) == TRUE)
+               return FALSE;
+
+       if (connman_network_get_available(network) == TRUE)
+               return FALSE;
+
+       return TRUE;
+}
+
 /**
  * connman_device_set_scanning:
  * @device: device structure
@@ -688,7 +1149,7 @@ int connman_device_set_carrier(struct connman_device *device,
  * Change scanning state of device
  */
 int connman_device_set_scanning(struct connman_device *device,
-                                                       gboolean scanning)
+                                               connman_bool_t scanning)
 {
        DBusMessage *signal;
        DBusMessageIter entry, value;
@@ -720,9 +1181,141 @@ int connman_device_set_scanning(struct connman_device *device,
 
        g_dbus_send_message(connection, signal);
 
+       if (scanning == TRUE) {
+               g_hash_table_foreach(device->networks,
+                                       mark_network_unavailable, NULL);
+               return 0;
+       }
+
+       g_hash_table_foreach_remove(device->networks,
+                                       remove_unavailable_network, NULL);
+
+       if (device->connections > 0)
+               return 0;
+
+       if (device->disconnected == TRUE)
+               return 0;
+
+       if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+               return 0;
+
+       connect_known_network(device);
+
+       return 0;
+}
+
+/**
+ * connman_device_set_disconnected:
+ * @device: device structure
+ * @disconnected: disconnected state
+ *
+ * Change disconnected state of device (only for device with networks)
+ */
+int connman_device_set_disconnected(struct connman_device *device,
+                                               connman_bool_t disconnected)
+{
+       DBG("driver %p disconnected %d", device, disconnected);
+
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+               return -EINVAL;
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+               break;
+       }
+
+       if (device->disconnected == disconnected)
+               return -EALREADY;
+
+       device->disconnected = disconnected;
+
+       return 0;
+}
+
+/**
+ * connman_device_set_string:
+ * @device: device structure
+ * @key: unique identifier
+ * @value: string value
+ *
+ * Set string value for specific key
+ */
+int connman_device_set_string(struct connman_device *device,
+                                       const char *key, const char *value)
+{
+       DBG("device %p key %s value %s", device, key, value);
+
+       if (g_str_equal(key, "Name") == TRUE) {
+               g_free(device->name);
+               device->name = g_strdup(value);
+       } else if (g_str_equal(key, "Node") == TRUE) {
+               g_free(device->node);
+               device->node = g_strdup(value);
+       }
+
+       return 0;
+}
+
+/**
+ * connman_device_get_string:
+ * @device: device structure
+ * @key: unique identifier
+ *
+ * Get string value for specific key
+ */
+const char *connman_device_get_string(struct connman_device *device,
+                                                       const char *key)
+{
+       DBG("device %p key %s", device, key);
+
+       if (g_str_equal(key, "Name") == TRUE)
+               return device->name;
+       else if (g_str_equal(key, "Node") == TRUE)
+               return device->node;
+
+       return NULL;
+}
+
+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;
+
+       powered = (offlinemode == TRUE) ? FALSE : TRUE;
+
+       if (device->powered == powered)
+               return;
+
+       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));
+
        return 0;
 }
 
+void __connman_device_increase_connections(struct connman_device *device)
+{
+       device->connections++;
+}
+
+void __connman_device_decrease_connections(struct connman_device *device)
+{
+       device->connections--;
+}
+
 /**
  * connman_device_add_network:
  * @device: device structure
@@ -738,13 +1331,25 @@ int connman_device_add_network(struct connman_device *device,
 
        DBG("device %p network %p", device, network);
 
-       if (device->mode == CONNMAN_DEVICE_MODE_NO_NETWORK)
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
                return -EINVAL;
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+               break;
+       }
+
+       __connman_network_set_device(network, device);
+
+       __connman_storage_load_network(network);
 
        err = connman_element_register((struct connman_element *) network,
                                                        &device->element);
-       if (err < 0)
+       if (err < 0) {
+               __connman_network_set_device(network, NULL);
                return err;
+       }
 
        g_hash_table_insert(device->networks, g_strdup(identifier),
                                                                network);
@@ -784,6 +1389,19 @@ int connman_device_remove_network(struct connman_device *device,
        return 0;
 }
 
+void __connman_device_set_network(struct connman_device *device,
+                                       struct connman_network *network)
+{
+       const char *name;
+
+       if (network != NULL) {
+               name = connman_network_get_string(network, "Name");
+               device->last_network = g_strdup(name);
+       }
+
+       device->network = network;
+}
+
 /**
  * connman_device_register:
  * @device: device structure
@@ -792,6 +1410,18 @@ int connman_device_remove_network(struct connman_device *device,
  */
 int connman_device_register(struct connman_device *device)
 {
+       __connman_storage_load_device(device);
+
+       switch (device->mode) {
+       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+               break;
+       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+               __connman_storage_init_network(device);
+               break;
+       }
+
        return connman_element_register(&device->element, NULL);
 }
 
@@ -803,6 +1433,8 @@ int connman_device_register(struct connman_device *device)
  */
 void connman_device_unregister(struct connman_device *device)
 {
+       __connman_storage_save_device(device);
+
        connman_element_unregister(&device->element);
 }
 
@@ -829,34 +1461,6 @@ void connman_device_set_data(struct connman_device *device, void *data)
        device->driver_data = data;
 }
 
-static void device_enable(struct connman_device *device)
-{
-       DBG("device %p", device);
-
-       if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
-               return;
-
-       if (device->powered == TRUE)
-               return;
-
-       if (device->driver->enable)
-               device->driver->enable(device);
-}
-
-static void device_disable(struct connman_device *device)
-{
-       DBG("device %p", device);
-
-       if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
-               return;
-
-       if (device->powered == FALSE)
-               return;
-
-       if (device->driver->disable)
-               device->driver->disable(device);
-}
-
 static gboolean match_driver(struct connman_device *device,
                                        struct connman_device_driver *driver)
 {
@@ -871,13 +1475,15 @@ static int device_probe(struct connman_element *element)
 {
        struct connman_device *device = element->device;
        GSList *list;
-       int err;
 
        DBG("element %p name %s", element, element->name);
 
        if (device == NULL)
                return -ENODEV;
 
+       if (device->driver != NULL)
+               return -EALREADY;
+
        for (list = driver_list; list; list = list->next) {
                struct connman_device_driver *driver = list->data;
 
@@ -892,19 +1498,10 @@ static int device_probe(struct connman_element *element)
                }
        }
 
-       if (!device->driver)
+       if (device->driver == NULL)
                return -ENODEV;
 
-       err = register_interface(element);
-       if (err < 0) {
-               if (device->driver->remove)
-                       device->driver->remove(device);
-               return err;
-       }
-
-       device_enable(device);
-
-       return 0;
+       return setup_device(device);
 }
 
 static void device_remove(struct connman_element *element)
@@ -916,15 +1513,10 @@ static void device_remove(struct connman_element *element)
        if (device == NULL)
                return;
 
-       if (!device->driver)
+       if (device->driver == NULL)
                return;
 
-       device_disable(device);
-
-       unregister_interface(element);
-
-       if (device->driver->remove)
-               device->driver->remove(device);
+       remove_device(device);
 }
 
 static struct connman_driver device_driver = {
@@ -935,12 +1527,132 @@ static struct connman_driver device_driver = {
        .remove         = device_remove,
 };
 
+static int device_load(struct connman_device *device)
+{
+       GKeyFile *keyfile;
+       gchar *pathname, *data = NULL;
+       gsize length;
+       char *str;
+       int val;
+
+       DBG("device %p", device);
+
+       pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR,
+                                                       device->element.name);
+       if (pathname == NULL)
+               return -ENOMEM;
+
+       keyfile = g_key_file_new();
+
+       if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) {
+               g_free(pathname);
+               return -ENOENT;
+       }
+
+       g_free(pathname);
+
+       if (g_key_file_load_from_data(keyfile, data, length,
+                                                       0, NULL) == FALSE) {
+               g_free(data);
+               return -EILSEQ;
+       }
+
+       g_free(data);
+
+       str = g_key_file_get_string(keyfile, "Configuration", "Policy", NULL);
+       if (str != NULL) {
+               device->policy = string2policy(str);
+               g_free(str);
+       }
+
+       val = g_key_file_get_integer(keyfile, "Configuration",
+                                                       "Priority", NULL);
+       if (val > 0)
+               device->priority = val;
+
+       str = g_key_file_get_string(keyfile, "Configuration",
+                                                       "LastNetwork", NULL);
+       if (str != NULL)
+               device->last_network = str;
+
+       g_key_file_free(keyfile);
+
+       return 0;
+}
+
+static int device_save(struct connman_device *device)
+{
+       GKeyFile *keyfile;
+       gchar *pathname, *data = NULL;
+       gsize length;
+       const char *str;
+
+       DBG("device %p", device);
+
+       pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR,
+                                                       device->element.name);
+       if (pathname == NULL)
+               return -ENOMEM;
+
+       keyfile = g_key_file_new();
+
+       if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE)
+               goto update;
+
+       if (length > 0) {
+               if (g_key_file_load_from_data(keyfile, data, length,
+                                                       0, NULL) == FALSE)
+                       goto done;
+       }
+
+       g_free(data);
+
+update:
+       str = policy2string(device->policy);
+       if (str != NULL)
+               g_key_file_set_string(keyfile, "Configuration", "Policy", str);
+
+       if (device->priority > 0)
+               g_key_file_set_integer(keyfile, "Configuration",
+                                               "Priority", device->priority);
+
+       if (device->last_network != NULL)
+               g_key_file_set_string(keyfile, "Configuration",
+                                       "LastNetwork", device->last_network);
+
+       data = g_key_file_to_data(keyfile, &length, NULL);
+
+       g_file_set_contents(pathname, data, length, NULL);
+
+done:
+       g_free(data);
+
+       g_key_file_free(keyfile);
+
+       g_free(pathname);
+
+       if (device->network != NULL)
+               __connman_storage_save_network(device->network);
+
+       return 0;
+}
+
+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)
 {
        DBG("");
 
        connection = connman_dbus_get_connection();
 
+       if (connman_storage_register(&device_storage) < 0)
+               connman_error("Failed to register device storage");
+
        return connman_driver_register(&device_driver);
 }
 
@@ -950,5 +1662,7 @@ void __connman_device_cleanup(void)
 
        connman_driver_unregister(&device_driver);
 
+       connman_storage_unregister(&device_storage);
+
        dbus_connection_unref(connection);
 }