Fix incorrect handling in multi-interface environment
[platform/upstream/connman.git] / src / device.c
old mode 100644 (file)
new mode 100755 (executable)
index f9dbe86..5350282
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2014  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
 
 #include <errno.h>
 #include <string.h>
-
-#include <gdbus.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <net/ethernet.h>
+#include <net/if.h>
 
 #include "connman.h"
 
-static DBusConnection *connection = NULL;
+static GSList *device_list = NULL;
+static gchar **device_filter = NULL;
+static gchar **nodevice_filter = NULL;
+
+#if defined TIZEN_EXT
+static DBusConnection *connection;
+#endif
+
+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;
-       enum connman_device_mode mode;
-       connman_bool_t offlinemode;
-       connman_bool_t blocked;
-       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;
+       enum connman_pending_type powered_pending;      /* Indicates a pending
+                                                        * enable/disable
+                                                        * request
+                                                        */
+       bool powered;
+       bool scanning[MAX_CONNMAN_SERVICE_TYPES];
        char *name;
        char *node;
        char *address;
        char *interface;
-       char *control;
        char *ident;
-       int phyindex;
-       unsigned int connections;
-       guint scan_timeout;
+       char *path;
+       int index;
+       guint pending_timeout;
 
        struct connman_device_driver *driver;
        void *driver_data;
 
-       connman_bool_t registered;
-
        char *last_network;
        struct connman_network *network;
        GHashTable *networks;
-
-       DBusMessage *pending;
-       guint timeout;
+#if defined TIZEN_EXT
+       time_t last_user_selection_time;
+       char *last_user_selection_ident;
+       char *last_connected_ident;
+       GList *pending_reply_list; /* List of DBusMessage* for async reply to multiple
+                                   * device power dbus calls, which are made before
+                                   * connman_device_set_powered().
+                                   */
+       int max_scan_ssids;
+       bool is_5_0_ghz_supported;
+       unsigned int mac_policy;
+       unsigned int preassoc_mac_policy;
+       unsigned int random_mac_lifetime;
+#endif
 };
 
-static gboolean device_scan_trigger(gpointer user_data)
+#if defined TIZEN_EXT
+static void __clear_pending_trigger(gpointer data, gpointer user_data)
 {
-       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;
+       DBusMessage *msg = (DBusMessage *)data;
+       dbus_message_unref(msg);
 }
+#endif
 
-static void clear_scan_trigger(struct connman_device *device)
+static void clear_pending_trigger(struct connman_device *device)
 {
-       if (device->scan_timeout > 0) {
-               g_source_remove(device->scan_timeout);
-               device->scan_timeout = 0;
+#if defined TIZEN_EXT
+       if (device->pending_reply_list) {
+               g_list_foreach(device->pending_reply_list, __clear_pending_trigger, NULL);
+               g_list_free(device->pending_reply_list);
+               device->pending_reply_list = NULL;
        }
-}
-
-static void reset_scan_trigger(struct connman_device *device)
-{
-       clear_scan_trigger(device);
-
-       if (device->scan_interval > 0) {
-               guint interval = device->scan_interval;
-               device->scan_timeout = g_timeout_add_seconds(interval,
-                                       device_scan_trigger, device);
+#endif
+       if (device->pending_timeout > 0) {
+               g_source_remove(device->pending_timeout);
+               device->pending_timeout = 0;
        }
 }
 
-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) {
@@ -127,14 +121,15 @@ static const char *type2description(enum connman_device_type type)
                return "Ethernet";
        case CONNMAN_DEVICE_TYPE_WIFI:
                return "Wireless";
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-               return "WiMAX";
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
                return "Bluetooth";
        case CONNMAN_DEVICE_TYPE_GPS:
                return "GPS";
        case CONNMAN_DEVICE_TYPE_CELLULAR:
                return "Cellular";
+       case CONNMAN_DEVICE_TYPE_GADGET:
+               return "Gadget";
+
        }
 
        return NULL;
@@ -150,20 +145,22 @@ static const char *type2string(enum connman_device_type type)
                return "ethernet";
        case CONNMAN_DEVICE_TYPE_WIFI:
                return "wifi";
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-               return "wimax";
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
                return "bluetooth";
        case CONNMAN_DEVICE_TYPE_GPS:
                return "gps";
        case CONNMAN_DEVICE_TYPE_CELLULAR:
                return "cellular";
+       case CONNMAN_DEVICE_TYPE_GADGET:
+               return "gadget";
+
        }
 
        return NULL;
 }
 
-enum connman_service_type __connman_device_get_service_type(struct connman_device *device)
+enum connman_service_type __connman_device_get_service_type(
+                               struct connman_device *device)
 {
        enum connman_device_type type = connman_device_get_type(device);
 
@@ -176,384 +173,209 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
                return CONNMAN_SERVICE_TYPE_ETHERNET;
        case CONNMAN_DEVICE_TYPE_WIFI:
                return CONNMAN_SERVICE_TYPE_WIFI;
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-               return CONNMAN_SERVICE_TYPE_WIMAX;
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
                return CONNMAN_SERVICE_TYPE_BLUETOOTH;
        case CONNMAN_DEVICE_TYPE_CELLULAR:
                return CONNMAN_SERVICE_TYPE_CELLULAR;
+       case CONNMAN_DEVICE_TYPE_GADGET:
+               return CONNMAN_SERVICE_TYPE_GADGET;
+
        }
 
        return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
-static void powered_changed(struct connman_device *device)
-{
-       connman_dbus_property_changed_basic(device->element.path,
-                               CONNMAN_DEVICE_INTERFACE, "Powered",
-                                       DBUS_TYPE_BOOLEAN, &device->powered);
-}
-
-static int set_powered(struct connman_device *device, connman_bool_t powered)
+static bool device_has_service_type(struct connman_device *device,
+                               enum connman_service_type service_type)
 {
-       struct connman_device_driver *driver = device->driver;
-       int err;
-
-       DBG("device %p powered %d", device, powered);
-
-       if (device->powered_pending == powered)
-               return -EALREADY;
-
-       if (!driver)
-               return -EINVAL;
-
-       if (powered == TRUE) {
-               if (driver->enable) {
-                       device->powered_pending = powered;
-
-                       err = driver->enable(device);
-                       if (err == 0)
-                               __connman_technology_enable_device(device);
-               } else
-                       err = -EINVAL;
-       } else {
-               device->powered_pending = powered;
-
-               device->reconnect = FALSE;
+       enum connman_service_type device_service_type =
+               __connman_device_get_service_type(device);
 
-               clear_scan_trigger(device);
+       /*
+        * For devices whose device_service_type is unknown we should
+        * allow to decide whether they support specific service_type
+        * by themself.
+        */
+       if (device_service_type == CONNMAN_SERVICE_TYPE_UNKNOWN)
+               return true;
 
-               g_hash_table_remove_all(device->networks);
-
-               if (driver->disable) {
-                       err = driver->disable(device);
-                       if (err == 0)
-                               __connman_technology_disable_device(device);
-               } else
-                       err = -EINVAL;
-       }
-
-       if (err == 0) {
-               device->powered = powered;
+#if defined TIZEN_EXT_WIFI_MESH
+       if (device_service_type == CONNMAN_SERVICE_TYPE_MESH)
+               return service_type != CONNMAN_SERVICE_TYPE_MESH;
+#endif
 
-               if (device->registered == TRUE)
-                       powered_changed(device);
+       if (device_service_type == CONNMAN_SERVICE_TYPE_WIFI) {
+               return service_type == CONNMAN_SERVICE_TYPE_WIFI ||
+                       service_type == CONNMAN_SERVICE_TYPE_P2P;
        }
 
-       return err;
-}
-
-void __connman_device_list(DBusMessageIter *iter, void *user_data)
-{
-       __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, iter);
-}
-
-static void append_path(gpointer key, gpointer value, gpointer user_data)
-{
-       struct connman_element *element = value;
-       DBusMessageIter *iter = user_data;
-
-       dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH,
-                                                       &element->path);
-}
-
-static void append_networks(DBusMessageIter *iter, void *user_data)
-{
-       struct connman_device *device = user_data;
-
-       g_hash_table_foreach(device->networks, append_path, iter);
+       return service_type == device_service_type;
 }
 
-static DBusMessage *get_properties(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+#if defined TIZEN_EXT
+static void __device_pending_reset(gpointer data, gpointer user_data)
 {
-       struct connman_device *device = data;
+       DBusMessage *msg = (DBusMessage *)data;
        DBusMessage *reply;
-       DBusMessageIter array, dict;
-       const char *str;
-
-       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;
-
-       dbus_message_iter_init_append(reply, &array);
-
-       connman_dbus_dict_open(&array, &dict);
-
-       if (device->name != NULL)
-               connman_dbus_dict_append_basic(&dict, "Name",
-                                       DBUS_TYPE_STRING, &device->name);
-
-       str = type2string(device->type);
-       if (str != NULL)
-               connman_dbus_dict_append_basic(&dict, "Type",
-                                               DBUS_TYPE_STRING, &str);
-
-       if (device->address != NULL)
-               connman_dbus_dict_append_basic(&dict, "Address",
-                                       DBUS_TYPE_STRING, &device->address);
-
-       if (device->interface != NULL)
-               connman_dbus_dict_append_basic(&dict, "Interface",
-                                       DBUS_TYPE_STRING, &device->interface);
-
-       connman_dbus_dict_append_basic(&dict, "Powered",
-                                       DBUS_TYPE_BOOLEAN, &device->powered);
-
-       if (device->driver && device->driver->scan)
-               connman_dbus_dict_append_basic(&dict, "Scanning",
-                                       DBUS_TYPE_BOOLEAN, &device->scanning);
-
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-               break;
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               if (device->scan_interval > 0)
-                       connman_dbus_dict_append_basic(&dict, "ScanInterval",
-                               DBUS_TYPE_UINT16, &device->scan_interval);
-
-               connman_dbus_dict_append_array(&dict, "Networks",
-                               DBUS_TYPE_OBJECT_PATH, append_networks, device);
-               break;
-       }
 
-       connman_dbus_dict_close(&array, &dict);
+       reply = __connman_error_failed(msg, ETIMEDOUT);
+       if (reply)
+               g_dbus_send_message(connection, reply);
 
-       return reply;
+       dbus_message_unref(msg);
 }
+#endif
 
-static gboolean powered_timeout(gpointer user_data)
+static gboolean device_pending_reset(gpointer user_data)
 {
        struct connman_device *device = user_data;
 
        DBG("device %p", device);
 
-       device->timeout = 0;
-
-       if (device->pending != NULL) {
-               DBusMessage *reply;
-
-               reply = __connman_error_operation_timeout(device->pending);
-               if (reply != NULL)
-                       g_dbus_send_message(connection, reply);
+#if defined TIZEN_EXT
+       DBusMessage *reply;
 
-               dbus_message_unref(device->pending);
-               device->pending = NULL;
+       /* Power request timed out, send ETIMEDOUT. */
+       if (device->pending_reply_list) {
+               g_list_foreach(device->pending_reply_list, __device_pending_reset, NULL);
+               g_list_free(device->pending_reply_list);
+               device->pending_reply_list = NULL;
        }
+#endif
+       /* Power request timedout, reset power pending state. */
+       device->pending_timeout = 0;
+       device->powered_pending = PENDING_NONE;
 
        return FALSE;
 }
 
-static DBusMessage *set_property(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+int __connman_device_enable(struct connman_device *device)
 {
-       struct connman_device *device = data;
-       DBusMessageIter iter, value;
-       const char *name;
-       int type;
-
-       DBG("conn %p", conn);
-
-       if (dbus_message_iter_init(msg, &iter) == FALSE)
-               return __connman_error_invalid_arguments(msg);
-
-       dbus_message_iter_get_basic(&iter, &name);
-       dbus_message_iter_next(&iter);
-       dbus_message_iter_recurse(&iter, &value);
-
-       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) {
-               connman_bool_t powered;
-               int err;
-
-               if (type != DBUS_TYPE_BOOLEAN)
-                       return __connman_error_invalid_arguments(msg);
-
-               dbus_message_iter_get_basic(&value, &powered);
-
-               device->powered_persistent = powered;
-
-               __connman_storage_save_device(device);
-
-               if (device->powered == powered)
-                       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
-               if (device->pending != NULL)
-                       return __connman_error_in_progress(msg);
-
-               err = set_powered(device, powered);
-               if (err < 0) {
-                       if (err != -EINPROGRESS)
-                               return __connman_error_failed(msg, -err);
+       int err;
 
-                       device->pending = dbus_message_ref(msg);
+       DBG("device %p", device);
 
-                       device->timeout = g_timeout_add_seconds(15,
-                                               powered_timeout, device);
+       if (!device->driver || !device->driver->enable)
+               return -EOPNOTSUPP;
 
-                       return NULL;
-               }
-       } else if (g_str_equal(name, "ScanInterval") == TRUE) {
-               connman_uint16_t interval;
+       /* There is an ongoing power disable request. */
+       if (device->powered_pending == PENDING_DISABLE)
+               return -EBUSY;
 
-               switch (device->mode) {
-               case CONNMAN_DEVICE_MODE_UNKNOWN:
-               case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-               case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-                       break;
-               }
+       if (device->powered_pending == PENDING_ENABLE)
+               return -EINPROGRESS;
 
-               if (type != DBUS_TYPE_UINT16)
-                       return __connman_error_invalid_arguments(msg);
+       if (device->powered_pending == PENDING_NONE && device->powered)
+               return -EALREADY;
 
-               dbus_message_iter_get_basic(&value, &interval);
+       if (device->index > 0) {
+               err = connman_inet_ifup(device->index);
+               if (err < 0 && err != -EALREADY)
+                       return err;
+       }
 
-               if (device->scan_interval != interval) {
-                       device->scan_interval = interval;
+       device->powered_pending = PENDING_ENABLE;
 
-                       __connman_storage_save_device(device);
+       err = device->driver->enable(device);
+       /*
+        * device gets enabled right away.
+        * Invoke the callback
+        */
+       if (err == 0) {
+               connman_device_set_powered(device, true);
+               goto done;
+       }
 
-                       reset_scan_trigger(device);
+       if (err == -EALREADY) {
+               /* If device is already powered, but connman is not updated */
+               connman_device_set_powered(device, true);
+#ifdef TIZEN_EXT
+               if (device->type == CONNMAN_DEVICE_TYPE_WIFI) {
+                       device->driver->set_mac_policy(device, device->mac_policy);
+                       device->driver->set_preassoc_mac_policy(device, device->preassoc_mac_policy);
+                       device->driver->set_random_mac_lifetime(device, device->random_mac_lifetime);
                }
-       } else
-               return __connman_error_invalid_property(msg);
-
-       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *propose_scan(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
-{
-       struct connman_device *device = data;
-       int err;
-
-       DBG("conn %p", conn);
-
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-               return __connman_error_not_supported(msg);
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               break;
+#endif /* TIZEN_EXT */
+               goto done;
        }
-
-       err = __connman_device_scan(device);
-       if (err < 0)
-               return __connman_error_failed(msg, -err);
-
-       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+       /*
+        * if err == -EINPROGRESS, then the DBus call to the respective daemon
+        * was successful. We set a 10 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(10,
+                                       device_pending_reset, device);
+done:
+       return err;
 }
 
-static GDBusMethodTable device_methods[] = {
-       { "GetProperties", "",      "a{sv}", get_properties },
-       { "SetProperty",   "sv",    "",      set_property,
-                                               G_DBUS_METHOD_FLAG_ASYNC },
-       { "ProposeScan",   "",      "",      propose_scan   },
-       { },
-};
-
-static GDBusSignalTable device_signals[] = {
-       { "PropertyChanged", "sv" },
-       { },
-};
-
-static int register_interface(struct connman_element *element)
+int __connman_device_disable(struct connman_device *device)
 {
-       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,
-                                       NULL, device, NULL) == FALSE) {
-               connman_error("Failed to register %s device", element->path);
-               return -EIO;
-       }
-
-       device->registered = TRUE;
-
-       return 0;
-}
+       int err;
 
-static void unregister_interface(struct connman_element *element)
-{
-       struct connman_device *device = element->device;
+       DBG("device %p", device);
 
-       DBG("element %p name %s", element, element->name);
+       /* Ongoing power enable request */
+       if (device->powered_pending == PENDING_ENABLE)
+               return -EBUSY;
 
-       device->registered = FALSE;
+       if (device->powered_pending == PENDING_DISABLE)
+               return -EINPROGRESS;
 
-       g_dbus_unregister_interface(connection, element->path,
-                                               CONNMAN_DEVICE_INTERFACE);
-}
+       if (device->powered_pending == PENDING_NONE && !device->powered)
+               return -EALREADY;
 
-static int setup_device(struct connman_device *device)
-{
-       int err;
+       device->powered_pending = PENDING_DISABLE;
 
-       DBG("device %p", device);
+       if (device->network) {
+               struct connman_service *service =
+                       connman_service_lookup_from_network(device->network);
 
-       err = register_interface(&device->element);
-       if (err < 0) {
-               if (device->driver->remove)
-                       device->driver->remove(device);
-               device->driver = NULL;
-               return err;
+               if (service)
+                       __connman_service_disconnect(service);
+               else
+                       connman_network_set_connected(device->network, false);
        }
 
-       __connman_technology_add_device(device);
+       if (!device->driver || !device->driver->disable)
+               return -EOPNOTSUPP;
 
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               break;
+       err = device->driver->disable(device);
+       if (err == 0 || err == -EALREADY) {
+               connman_device_set_powered(device, false);
+               goto done;
        }
 
-       if (__connman_udev_get_blocked(device->phyindex) == TRUE)
-               return 0;
-
-       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;
+       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; list = list->next) {
+               struct connman_device *device = list->data;
 
-       if (element->device->driver != NULL)
-               return;
+               if (device->driver)
+                       continue;
 
-       if (driver->type != element->device->type)
-               return;
+               if (driver->type != device->type)
+                       continue;
 
-       if (driver->probe(element->device) < 0)
-               return;
+               if (driver->probe(device) < 0)
+                       continue;
 
-       element->device->driver = driver;
+               device->driver = driver;
 
-       setup_device(element->device);
+               __connman_technology_add_device(device);
+       }
 }
 
 static void remove_device(struct connman_device *device)
@@ -562,42 +384,34 @@ static void remove_device(struct connman_device *device)
 
        __connman_device_disable(device);
 
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               break;
-       }
-
        __connman_technology_remove_device(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)
+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; 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)
+bool __connman_device_has_driver(struct connman_device *device)
 {
-       if (device == NULL || device->driver == NULL)
-               return FALSE;
+       if (!device || !device->driver)
+               return false;
 
-       return device->registered;
+       return true;
 }
 
 static GSList *driver_list = NULL;
@@ -624,9 +438,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;
 }
@@ -643,51 +455,96 @@ 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("element %p name %s", element, element->name);
-
-       if (device->timeout > 0) {
-               g_source_remove(device->timeout);
-               device->timeout = 0;
-       }
+       DBG("device %p name %s", device, device->name);
 
-       clear_scan_trigger(device);
+       clear_pending_trigger(device);
 
-       if (device->pending != NULL) {
-               dbus_message_unref(device->pending);
-               device->pending = NULL;
-       }
+       g_hash_table_destroy(device->networks);
+       device->networks = NULL;
 
        g_free(device->ident);
        g_free(device->node);
        g_free(device->name);
        g_free(device->address);
-       g_free(device->control);
        g_free(device->interface);
+       g_free(device->path);
 
        g_free(device->last_network);
 
-       g_hash_table_destroy(device->networks);
-       device->networks = NULL;
+#if defined TIZEN_EXT
+       g_free(device->last_user_selection_ident);
+       g_free(device->last_connected_ident);
+#endif
+
+       g_free(device);
+}
+
+#if defined TIZEN_EXT
+static void device_send_changed(const char *ifname, enum connman_service_type type,
+                                                               const char *key, bool state)
+{
+       DBusMessage *signal;
+       DBusMessageIter iter, dict;
+       dbus_bool_t value = state;
+       const char *tech_path = connman_techonology_get_path(type);
+
+       if (!tech_path || !ifname)
+               return;
+
+       DBG("%s %s %s", ifname, key, state ? "TRUE" : "FALSE");
+
+       signal = dbus_message_new_signal(tech_path,
+                       CONNMAN_TECHNOLOGY_INTERFACE, "DeviceChanged");
+       if (!signal)
+               return;
+
+       dbus_message_iter_init_append(signal, &iter);
+
+       connman_dbus_dict_open(&iter, &dict);
+       connman_dbus_dict_append_basic(&dict, "Ifname",
+                                       DBUS_TYPE_STRING,
+                                       &ifname);
+       connman_dbus_dict_append_basic(&dict, key,
+                                       DBUS_TYPE_BOOLEAN,
+                                       &value);
+       connman_dbus_dict_close(&iter, &dict);
+
+       dbus_connection_send(connection, signal, NULL);
+       dbus_message_unref(signal);
+}
+
+static void __device_send_reply(gpointer data, gpointer user_data)
+{
+       DBusMessage *msg = (DBusMessage *)data;
+       g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+       dbus_message_unref(msg);
+}
+
+static void device_send_reply(struct connman_device *device)
+{
+       if (device->pending_reply_list) {
+               g_list_foreach(device->pending_reply_list, __device_send_reply, NULL);
+               g_list_free(device->pending_reply_list);
+               device->pending_reply_list = NULL;
+       }
 }
+#endif
 
 /**
  * connman_device_create:
@@ -702,64 +559,24 @@ 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);
 
        device = g_try_new0(struct connman_device, 1);
-       if (device == NULL)
+       if (!device)
                return NULL;
 
        DBG("device %p", device);
 
-       __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->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
-
-       device->powered_persistent = TRUE;
-
-       device->phyindex = -1;
-
-       switch (type) {
-       case CONNMAN_DEVICE_TYPE_UNKNOWN:
-       case CONNMAN_DEVICE_TYPE_VENDOR:
-               device->scan_interval = 0;
-               break;
-       case CONNMAN_DEVICE_TYPE_ETHERNET:
-       case CONNMAN_DEVICE_TYPE_WIFI:
-               device->scan_interval = 300;
-               break;
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-               device->scan_interval = 0;
-               break;
-       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-               device->scan_interval = 0;
-               break;
-       case CONNMAN_DEVICE_TYPE_GPS:
-               device->scan_interval = 0;
-               break;
-       case CONNMAN_DEVICE_TYPE_CELLULAR:
-               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_prepend(device_list, device);
 
        return device;
 }
@@ -770,10 +587,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;
 }
@@ -784,9 +604,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)
@@ -806,94 +640,49 @@ enum connman_device_type connman_device_get_type(struct connman_device *device)
 }
 
 /**
- * connman_device_get_name:
+ * connman_device_set_index:
  * @device: device structure
+ * @index: index number
  *
- * Get unique name of device
+ * Set index number of device
  */
-const char *connman_device_get_name(struct connman_device *device)
+void connman_device_set_index(struct connman_device *device, int index)
 {
-       return device->element.name;
+       device->index = index;
 }
 
 /**
- * connman_device_get_path:
+ * connman_device_get_index:
  * @device: device structure
  *
- * Get path name of device
+ * Get index number of device
  */
-const char *connman_device_get_path(struct connman_device *device)
+int connman_device_get_index(struct connman_device *device)
 {
-       return device->element.path;
+       return device->index;
 }
 
 /**
- * connman_device_set_index:
+ * connman_device_set_interface:
  * @device: device structure
- * @index: index number
+ * @interface: interface name
  *
- * Set index number of device
- */
-void connman_device_set_index(struct connman_device *device, int index)
-{
-       device->element.index = index;
-}
-
-/**
- * connman_device_get_index:
- * @device: device structure
- *
- * Get index number of device
- */
-int connman_device_get_index(struct connman_device *device)
-{
-       return device->element.index;
-}
-
-int __connman_device_get_phyindex(struct connman_device *device)
-{
-       return device->phyindex;
-}
-
-void __connman_device_set_phyindex(struct connman_device *device,
-                                                       int phyindex)
-{
-       device->phyindex = phyindex;
-}
-
-/**
- * connman_device_set_interface:
- * @device: device structure
- * @interface: interface name
- * @control: control interface
- *
- * Set interface name of device
+ * Set interface name of device
  */
 void connman_device_set_interface(struct connman_device *device,
-                               const char *interface, const char *control)
+                                               const char *interface)
 {
-       g_free(device->element.devname);
-       device->element.devname = g_strdup(interface);
-
        g_free(device->interface);
        device->interface = g_strdup(interface);
 
-       g_free(device->control);
-       device->control = g_strdup(control);
-
-       if (device->name == NULL) {
+       if (!device->name) {
                const char *str = type2description(device->type);
-               if (str != NULL && device->interface != NULL)
+               if (str && device->interface)
                        device->name = g_strdup_printf("%s (%s)", str,
                                                        device->interface);
        }
 }
 
-const char *connman_device_get_control(struct connman_device *device)
-{
-       return device->control;
-}
-
 /**
  * connman_device_set_ident:
  * @device: device structure
@@ -904,40 +693,21 @@ const char *connman_device_get_control(struct connman_device *device)
 void connman_device_set_ident(struct connman_device *device,
                                                        const char *ident)
 {
+#ifdef TIZEN_EXT
+       if (device->ident && device->powered)
+               return;
+       else
+#endif
        g_free(device->ident);
        device->ident = g_strdup(ident);
 }
 
-const char *__connman_device_get_ident(struct connman_device *device)
+const char *connman_device_get_ident(struct connman_device *device)
 {
        return device->ident;
 }
 
 /**
- * connman_device_set_mode:
- * @device: device structure
- * @mode: network mode
- *
- * Change network mode of device
- */
-void connman_device_set_mode(struct connman_device *device,
-                                               enum connman_device_mode mode)
-{
-       device->mode = mode;
-}
-
-/**
- * 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
@@ -945,200 +715,314 @@ enum connman_device_mode connman_device_get_mode(struct connman_device *device)
  * Change power state of device
  */
 int connman_device_set_powered(struct connman_device *device,
-                                               connman_bool_t powered)
+                                               bool powered)
 {
-       DBG("driver %p powered %d", device, powered);
-
-       if (device->timeout > 0) {
-               g_source_remove(device->timeout);
-               device->timeout = 0;
-       }
-
-       if (device->pending != NULL) {
-               g_dbus_send_reply(connection, device->pending,
-                                                       DBUS_TYPE_INVALID);
+       struct connman_device_scan_params params;
+       enum connman_service_type type;
+       int i;
 
-               dbus_message_unref(device->pending);
-               device->pending = NULL;
-       }
+       DBG("device %p powered %d", device, powered);
 
        if (device->powered == powered)
                return -EALREADY;
 
+#if defined TIZEN_EXT
+       device_send_reply(device);
+#endif
+
+       clear_pending_trigger(device);
+
+       device->powered_pending = PENDING_NONE;
+
        device->powered = powered;
-       device->powered_pending = powered;
 
-       if (device->powered == TRUE)
-               __connman_technology_enable_device(device);
-       else
-               __connman_technology_disable_device(device);
+       type = __connman_device_get_service_type(device);
+
+#if defined TIZEN_EXT
+       device_send_changed(device->interface, type, "Powered", powered);
+#endif
 
-       if (device->registered == FALSE)
+       if (!device->powered) {
+               __connman_technology_disabled(type);
                return 0;
+       }
 
-       powered_changed(device);
+       __connman_technology_enabled(type);
 
-       if (powered == FALSE)
-               return 0;
+       for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++)
+               device->scanning[i] = false;
 
-       reset_scan_trigger(device);
+       if (device->driver && device->driver->scan) {
+               memset(&params, 0, sizeof(params));
+               params.type = CONNMAN_SERVICE_TYPE_UNKNOWN;
 
-       if (device->driver->scan)
-               device->driver->scan(device);
+               device->driver->scan(device, &params);
+       }
 
        return 0;
 }
 
-int __connman_device_set_blocked(struct connman_device *device,
-                                               connman_bool_t blocked)
+bool connman_device_get_powered(struct connman_device *device)
 {
-       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);
+       return device->powered;
 }
 
-int __connman_device_scan(struct connman_device *device)
+static int device_scan(enum connman_service_type type,
+                               struct connman_device *device,
+                               bool force_full_scan)
 {
+       struct connman_device_scan_params params;
+
        if (!device->driver || !device->driver->scan)
                return -EOPNOTSUPP;
 
-       if (device->powered == FALSE)
+       if (!device->powered)
                return -ENOLINK;
 
-       reset_scan_trigger(device);
+       memset(&params, 0, sizeof(params));
+       params.type = type;
+       params.force_full_scan = force_full_scan;
 
-       return device->driver->scan(device);
+       return device->driver->scan(device, &params);
 }
 
-int __connman_device_enable(struct connman_device *device)
+int __connman_device_disconnect(struct connman_device *device)
 {
-       int err;
+       GHashTableIter iter;
+       gpointer key, value;
 
        DBG("device %p", device);
 
-       if (!device->driver || !device->driver->enable)
-               return -EOPNOTSUPP;
+       g_hash_table_iter_init(&iter, device->networks);
 
-       if (device->powered_pending == TRUE)
-               return -EALREADY;
+       while (g_hash_table_iter_next(&iter, &key, &value)) {
+               struct connman_network *network = value;
+
+               if (connman_network_get_connecting(network)) {
+                       /*
+                        * Skip network in the process of connecting.
+                        * This is a workaround for WiFi networks serviced
+                        * by the supplicant plugin that hold a reference
+                        * to the network.  If we disconnect the network
+                        * here then the referenced object will not be
+                        * registered and usage (like launching DHCP client)
+                        * will fail.  There is nothing to be gained by
+                        * removing the network here anyway.
+                        */
+                       connman_warn("Skipping disconnect of %s, network is connecting.",
+                               connman_network_get_identifier(network));
+                       continue;
+               }
 
-       device->powered_pending = TRUE;
+               __connman_network_disconnect(network);
+       }
 
-       err = device->driver->enable(device);
-       if (err < 0)
-               return err;
+       return 0;
+}
 
-       device->powered = TRUE;
+int connman_device_reconnect_service(struct connman_device *device)
+{
+       DBG("device %p", device);
 
-       __connman_technology_enable_device(device);
+       __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);
 
        return 0;
 }
 
-int __connman_device_enable_persistent(struct connman_device *device)
+#if defined TIZEN_EXT
+bool connman_device_set_last_user_selection_time(struct connman_device *device,
+                                               time_t time)
 {
-       DBG("device %p", device);
+       if (device->last_user_selection_time != time) {
+               device->last_user_selection_time = time;
+               return true;
+       }
+
+       return false;
+}
+
+time_t connman_device_get_last_user_selection_time(struct connman_device *device)
+{
+       return device->last_user_selection_time;
+}
 
-       device->powered_persistent = TRUE;
+bool connman_device_set_last_user_selection_ident(struct connman_device *device,
+                                               const char *ident)
+{
+       if (g_strcmp0(device->last_user_selection_ident, ident) != 0) {
+               g_free(device->last_user_selection_ident);
+               device->last_user_selection_ident = g_strdup(ident);
 
-       __connman_storage_save_device(device);
+               return true;
+       }
 
-       return __connman_device_enable(device);
+       return false;
 }
 
-int __connman_device_disable(struct connman_device *device)
+const char *connman_device_get_last_user_selection_ident(struct connman_device *device)
 {
-       int err;
+       return device->last_user_selection_ident;
+}
 
-       DBG("device %p", device);
+bool connman_device_set_last_connected_ident(struct connman_device *device,
+                                               const char *ident)
+{
+       if (g_strcmp0(device->last_connected_ident, ident) != 0) {
+               g_free(device->last_connected_ident);
+               device->last_connected_ident = g_strdup(ident);
 
-       if (!device->driver || !device->driver->disable)
-               return -EOPNOTSUPP;
+               return true;
+       }
 
-       if (device->powered == FALSE)
-               return -ENOLINK;
+       return false;
+}
 
-       if (device->powered_pending == FALSE)
-               return -EALREADY;
+const char *connman_device_get_last_connected_ident(struct connman_device *device)
+{
+       return device->last_connected_ident;
+}
 
-       device->powered_pending = FALSE;
+void connman_device_save_last_user_selection(struct connman_device *device)
+{
+       GKeyFile *keyfile;
+       gchar *get_str;
+       gchar *selection_str;
 
-       device->reconnect = FALSE;
+       keyfile = __connman_storage_load_ins();
 
-       clear_scan_trigger(device);
+       selection_str = g_strdup_printf("%s:%ld",
+                       device->last_user_selection_ident, device->last_user_selection_time);
 
-       g_hash_table_remove_all(device->networks);
+       if (!keyfile) {
+               keyfile = g_key_file_new();
 
-       err = device->driver->disable(device);
-       if (err < 0)
-               return err;
+               g_key_file_set_string(keyfile, device->interface, "LastUserSelection", selection_str);
+               DBG("%s", selection_str);
+               __connman_storage_save_ins(keyfile);
 
-       device->powered = FALSE;
+       } else {
+               get_str = g_key_file_get_string(keyfile, device->interface, "LastUserSelection", NULL);
+               if (!get_str || g_strcmp0(get_str, selection_str) != 0) {
+                       g_key_file_set_string(keyfile, device->interface, "LastUserSelection", selection_str);
+                       DBG("%s -> %s", get_str, selection_str);
+                       __connman_storage_save_ins(keyfile);
+               }
 
-       __connman_technology_disable_device(device);
+               g_free(get_str);
+       }
 
-       return 0;
+       g_free(selection_str);
+       g_key_file_free(keyfile);
 }
 
-int __connman_device_disable_persistent(struct connman_device *device)
+void connman_device_load_last_user_selection(struct connman_device *device)
 {
-       DBG("device %p", device);
+       GKeyFile *keyfile;
+       gchar *get_str;
+       char **selection_str;
+
+       keyfile = __connman_storage_load_ins();
+       if (!keyfile)
+               return;
+
+       get_str = g_key_file_get_string(keyfile, device->interface, "LastUserSelection", NULL);
+       if (get_str) {
+               selection_str = g_strsplit(get_str, ":", 0);
+               if (selection_str) {
+                       time_t ref_time;
+                       struct tm* timeinfo;
+                       time_t last_user_selection_time;
+
+                       /* Only events that occur within 8 hours are counted. */
+                       ref_time = time(NULL);
+                       timeinfo = localtime(&ref_time);
+                       timeinfo->tm_hour -= 8;
+                       ref_time = mktime(timeinfo);
+
+                       last_user_selection_time = strtol(selection_str[1], NULL, 10);
+
+                       if (last_user_selection_time > ref_time) {
+                               if (g_strcmp0(selection_str[0], device->last_user_selection_ident) != 0) {
+                                       g_free(device->last_user_selection_ident);
+                                       device->last_user_selection_ident = g_strdup(selection_str[0]);
+                               }
+
+                               device->last_user_selection_time = last_user_selection_time;
 
-       device->powered_persistent = FALSE;
+                               DBG("%s %ld", device->last_user_selection_ident, device->last_user_selection_time);
+                       }
 
-       __connman_storage_save_device(device);
+                       g_strfreev(selection_str);
+               }
+
+               g_free(get_str);
+       }
 
-       return __connman_device_disable(device);
+       g_key_file_free(keyfile);
 }
 
-int __connman_device_disconnect(struct connman_device *device)
+void connman_device_save_last_connected(struct connman_device *device)
 {
-       GHashTableIter iter;
-       gpointer key, value;
+       GKeyFile *keyfile;
+       gchar *get_str;
 
-       DBG("device %p", device);
+       if (!device->last_connected_ident)
+               return;
 
-       connman_device_set_disconnected(device, TRUE);
+       keyfile = __connman_storage_load_ins();
 
-       g_hash_table_iter_init(&iter, device->networks);
+       if (!keyfile) {
+               keyfile = g_key_file_new();
 
-       while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
-               struct connman_network *network = value;
+               g_key_file_set_string(keyfile, device->interface, "LastConnected", device->last_connected_ident);
+               DBG("%s", device->last_connected_ident);
+               __connman_storage_save_ins(keyfile);
 
-               if (__connman_network_get_connecting(network) == TRUE) {
-                       /*
-                        * Skip network in the process of connecting.
-                        * This is a workaround for WiFi networks serviced
-                        * by the supplicant plugin that hold a reference
-                        * to the network.  If we disconnect the network
-                        * here then the referenced object will not be
-                        * registered and usage (like launching DHCP client)
-                        * will fail.  There is nothing to be gained by
-                        * removing the network here anyway.
-                        */
-                       connman_warn("Skipping disconnect of %s",
-                               connman_network_get_identifier(network));
-                       continue;
+       } else {
+               get_str = g_key_file_get_string(keyfile, device->interface, "LastConnected", NULL);
+               if (!get_str || g_strcmp0(get_str, device->last_connected_ident) != 0) {
+                       g_key_file_set_string(keyfile, device->interface, "LastConnected", device->last_connected_ident);
+                       DBG("%s -> %s", get_str, device->last_connected_ident);
+                       __connman_storage_save_ins(keyfile);
                }
 
-               __connman_network_disconnect(network);
+               g_free(get_str);
        }
 
-       return 0;
+       g_key_file_free(keyfile);
+}
+
+void connman_device_load_last_connected(struct connman_device *device)
+{
+       GKeyFile *keyfile;
+       gchar *get_str;
+
+       keyfile = __connman_storage_load_ins();
+       if (!keyfile)
+               return;
+
+       get_str = g_key_file_get_string(keyfile, device->interface, "LastConnected", NULL);
+       if (get_str) {
+               if (g_strcmp0(get_str, device->last_connected_ident) != 0) {
+                       g_free(device->last_connected_ident);
+                       device->last_connected_ident = g_strdup(get_str);
+               }
+
+               DBG("%s", device->last_connected_ident);
+
+               g_free(get_str);
+       }
+
+       g_key_file_free(keyfile);
+}
+#endif
+
+static void mark_network_available(gpointer key, gpointer value,
+                                                       gpointer user_data)
+{
+       struct connman_network *network = value;
+
+       connman_network_set_available(network, true);
 }
 
 static void mark_network_unavailable(gpointer key, gpointer value,
@@ -1146,10 +1030,11 @@ static void mark_network_unavailable(gpointer key, gpointer value,
 {
        struct connman_network *network = value;
 
-       if (connman_network_get_connected(network) == TRUE)
+       if (connman_network_get_connected(network) ||
+                       connman_network_get_connecting(network))
                return;
 
-       connman_network_set_available(network, FALSE);
+       connman_network_set_available(network, false);
 }
 
 static gboolean remove_unavailable_network(gpointer key, gpointer value,
@@ -1157,10 +1042,11 @@ static gboolean remove_unavailable_network(gpointer key, gpointer value,
 {
        struct connman_network *network = value;
 
-       if (connman_network_get_connected(network) == TRUE)
+       if (connman_network_get_connected(network) ||
+                       connman_network_get_connecting(network))
                return FALSE;
 
-       if (connman_network_get_available(network) == TRUE)
+       if (connman_network_get_available(network))
                return FALSE;
 
        return TRUE;
@@ -1172,27 +1058,23 @@ void __connman_device_cleanup_networks(struct connman_device *device)
                                        remove_unavailable_network, NULL);
 }
 
-static void scanning_changed(struct connman_device *device)
+bool connman_device_get_scanning(struct connman_device *device,
+                               enum connman_service_type type)
 {
-       connman_dbus_property_changed_basic(device->element.path,
-                               CONNMAN_DEVICE_INTERFACE, "Scanning",
-                                       DBUS_TYPE_BOOLEAN, &device->scanning);
-}
+       int i;
 
-static void mark_network_available(gpointer key, gpointer value,
-                                               gpointer user_data)
-{
-       struct connman_network *network = value;
+       if (type != CONNMAN_SERVICE_TYPE_UNKNOWN)
+               return device->scanning[type];
 
-       connman_network_set_available(network, TRUE);
+       for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++)
+               if (device->scanning[i])
+                       return true;
+
+       return false;
 }
 
-void connman_device_cleanup_scanning(struct connman_device *device)
+void connman_device_reset_scanning(struct connman_device *device)
 {
-       device->scanning = FALSE;
-
-       scanning_changed(device);
-
        g_hash_table_foreach(device->networks,
                                mark_network_available, NULL);
 }
@@ -1205,22 +1087,23 @@ void connman_device_cleanup_scanning(struct connman_device *device)
  * Change scanning state of device
  */
 int connman_device_set_scanning(struct connman_device *device,
-                                               connman_bool_t scanning)
+                               enum connman_service_type type, bool scanning)
 {
        DBG("device %p scanning %d", device, scanning);
 
        if (!device->driver || !device->driver->scan)
                return -EINVAL;
 
-       if (device->scanning == scanning)
-               return -EALREADY;
+       if (type == CONNMAN_SERVICE_TYPE_UNKNOWN)
+               return -EINVAL;
 
-       device->scanning = scanning;
+       if (device->scanning[type] == scanning)
+               return -EALREADY;
 
-       scanning_changed(device);
+       device->scanning[type] = scanning;
 
-       if (scanning == TRUE) {
-               reset_scan_trigger(device);
+       if (scanning) {
+               __connman_technology_scan_started(device);
 
                g_hash_table_foreach(device->networks,
                                        mark_network_unavailable, NULL);
@@ -1230,60 +1113,19 @@ int connman_device_set_scanning(struct connman_device *device,
 
        __connman_device_cleanup_networks(device);
 
-       if (device->connections > 0)
-               return 0;
-
-       if (device->disconnected == TRUE)
-               return 0;
-
-       __connman_service_auto_connect();
-
-       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("device %p disconnected %d", device, disconnected);
-
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-               return -EINVAL;
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               break;
-       }
-
-       if (device->disconnected == disconnected)
-               return -EALREADY;
+       __connman_technology_scan_stopped(device, type);
 
-       device->disconnected = disconnected;
+       __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);
 
-       if (disconnected == TRUE)
-               force_scan_trigger(device);
+#if defined TIZEN_EXT_WIFI_MESH
+       if (type == CONNMAN_SERVICE_TYPE_MESH)
+               __connman_mesh_auto_connect();
+#endif
 
        return 0;
 }
 
 /**
- * connman_device_get_disconnected:
- * @device: device structure
- *
- * Get device disconnected state
- */
-connman_bool_t connman_device_get_disconnected(struct connman_device *device)
-{
-       return device->disconnected;
-}
-
-/**
  * connman_device_set_string:
  * @device: device structure
  * @key: unique identifier
@@ -1296,18 +1138,28 @@ int connman_device_set_string(struct connman_device *device,
 {
        DBG("device %p key %s value %s", device, key, value);
 
-       if (g_str_equal(key, "Address") == TRUE) {
+       if (g_str_equal(key, "Address")) {
+#ifdef TIZEN_EXT
+               if (device->address && device->powered)
+                       return 0;
+               else
+#endif
                g_free(device->address);
                device->address = g_strdup(value);
-       } else if (g_str_equal(key, "Name") == TRUE) {
+       } else if (g_str_equal(key, "Name")) {
                g_free(device->name);
                device->name = g_strdup(value);
-       } else if (g_str_equal(key, "Node") == TRUE) {
+       } else if (g_str_equal(key, "Node")) {
                g_free(device->node);
                device->node = g_strdup(value);
+       } else if (g_str_equal(key, "Path")) {
+               g_free(device->path);
+               device->path = g_strdup(value);
+       } else {
+               return -EINVAL;
        }
 
-       return connman_element_set_string(&device->element, key, value);
+       return 0;
 }
 
 /**
@@ -1320,119 +1172,119 @@ int connman_device_set_string(struct connman_device *device,
 const char *connman_device_get_string(struct connman_device *device,
                                                        const char *key)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("device %p key %s", device, key);
 
-       if (g_str_equal(key, "Address") == TRUE)
+       if (g_str_equal(key, "Address"))
                return device->address;
-       else if (g_str_equal(key, "Name") == TRUE)
+       else if (g_str_equal(key, "Name"))
                return device->name;
-       else if (g_str_equal(key, "Node") == TRUE)
+       else if (g_str_equal(key, "Node"))
                return device->node;
+       else if (g_str_equal(key, "Interface"))
+               return device->interface;
+       else if (g_str_equal(key, "Path"))
+               return device->path;
 
-       return connman_element_get_string(&device->element, key);
+       return NULL;
 }
 
-static void set_offlinemode(struct connman_element *element, gpointer user_data)
+/**
+ * connman_device_add_network:
+ * @device: device structure
+ * @network: network structure
+ *
+ * Add new network to the device
+ */
+int connman_device_add_network(struct connman_device *device,
+                                       struct connman_network *network)
 {
-       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;
+       const char *identifier = connman_network_get_identifier(network);
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
+       DBG("device %p network %p", device, network);
 
-       device->offlinemode = offlinemode;
+       if (!identifier)
+               return -EINVAL;
 
-       powered = (offlinemode == TRUE) ? FALSE : TRUE;
+       connman_network_ref(network);
 
-       if (device->powered == powered)
-               return;
+       __connman_network_set_device(network, device);
 
-       if (device->powered_persistent == FALSE)
-               powered = FALSE;
+       g_hash_table_replace(device->networks, g_strdup(identifier),
+                                                               network);
 
-       set_powered(device, powered);
+       return 0;
 }
 
-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);
+/**
+ * connman_device_get_network:
+ * @device: device structure
+ * @identifier: network identifier
+ *
+ * Get network for given identifier
+ */
+struct connman_network *connman_device_get_network(struct connman_device *device,
+                                                       const char *identifier)
+{
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
+       DBG("device %p identifier %s", device, identifier);
 
-       return 0;
+       return g_hash_table_lookup(device->networks, identifier);
 }
 
-void __connman_device_increase_connections(struct connman_device *device)
+#if defined TIZEN_EXT
+struct connman_network *connman_device_get_default_network(
+                                                       struct connman_device *device)
 {
-       device->connections++;
+       return device->network;
 }
 
-void __connman_device_decrease_connections(struct connman_device *device)
+void connman_device_set_pending_reply(struct connman_device *device,
+                                                       DBusMessage *msg)
 {
-       device->connections--;
+       device->pending_reply_list = g_list_prepend(device->pending_reply_list, dbus_message_ref(msg));
 }
 
-/**
- * connman_device_add_network:
- * @device: device structure
- * @network: network structure
- *
- * Add new network to the device
- */
-int connman_device_add_network(struct connman_device *device,
-                                       struct connman_network *network)
+void connman_device_send_connected_signal(struct connman_device *device,
+                                                       bool connected)
 {
-       const char *identifier = connman_network_get_identifier(network);
-       int err;
+       enum connman_service_type type;
 
-       DBG("device %p network %p", device, network);
-
-       if (identifier == NULL)
-               return -EINVAL;
-
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-               return -EINVAL;
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               break;
-       }
-
-       __connman_network_set_device(network, device);
+       if (!device)
+               return;
 
-       err = connman_element_register((struct connman_element *) network,
-                                                       &device->element);
-       if (err < 0) {
-               __connman_network_set_device(network, NULL);
-               return err;
-       }
+       type = __connman_device_get_service_type(device);
+       device_send_changed(device->interface, type, "Connected", connected);
+}
 
-       g_hash_table_insert(device->networks, g_strdup(identifier),
-                                                               network);
+void connman_device_set_max_scan_ssids(struct connman_device *device,
+                                                       int max_scan_ssids)
+{
+       device->max_scan_ssids = max_scan_ssids;
+}
 
-       return 0;
+int connman_device_get_max_scan_ssids(struct connman_device *device)
+{
+       return device->max_scan_ssids;
 }
 
-/**
- * connman_device_get_network:
- * @device: device structure
- * @identifier: network identifier
- *
- * Get network for given identifier
- */
-struct connman_network *connman_device_get_network(struct connman_device *device,
-                                                       const char *identifier)
+void connman_device_set_wifi_5ghz_supported(struct connman_device *device,
+                                                       bool is_5_0_ghz_supported)
 {
-       DBG("device %p identifier %s", device, identifier);
+       device->is_5_0_ghz_supported = is_5_0_ghz_supported;
+}
 
-       return g_hash_table_lookup(device->networks, identifier);
+bool connman_device_get_wifi_5ghz_supported(struct connman_device *device)
+{
+       return device->is_5_0_ghz_supported;
 }
+#endif
 
 /**
  * connman_device_remove_network:
@@ -1442,38 +1294,38 @@ 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)
+               return 0;
+
+       identifier = connman_network_get_identifier(network);
        g_hash_table_remove(device->networks, identifier);
 
        return 0;
 }
 
-void connman_device_remove_all_networks(struct connman_device *device)
-{
-       g_hash_table_remove_all(device->networks);
-}
-
 void __connman_device_set_network(struct connman_device *device,
                                        struct connman_network *network)
 {
        const char *name;
 
-       if (device->network == network)
+       if (!device)
                return;
 
-       if (device->network != NULL)
-               connman_network_unref(device->network);
+       if (device->network == network)
+               return;
 
-       if (network != NULL) {
-               name = connman_network_get_string(network,
-                                               CONNMAN_PROPERTY_ID_NAME);
+       if (network) {
+               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;
@@ -1482,16 +1334,14 @@ void __connman_device_set_network(struct connman_device *device,
        }
 }
 
-void __connman_device_set_reconnect(struct connman_device *device,
-                                               connman_bool_t reconnect)
+static bool match_driver(struct connman_device *device,
+                                       struct connman_device_driver *driver)
 {
-       device->reconnect = reconnect;
-}
+       if (device->type == driver->type ||
+                       driver->type == CONNMAN_DEVICE_TYPE_UNKNOWN)
+               return true;
 
-connman_bool_t  __connman_device_get_reconnect(
-                               struct connman_device *device)
-{
-       return device->reconnect;
+       return false;
 }
 
 /**
@@ -1502,11 +1352,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)
+               return -EALREADY;
+
+       for (list = driver_list; list; list = list->next) {
+               struct connman_device_driver *driver = list->data;
+
+               if (!match_driver(device, driver))
+                       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)
+               return 0;
 
-       return connman_element_register(&device->element, NULL);
+       return __connman_technology_add_device(device);
 }
 
 /**
@@ -1517,9 +1387,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)
+               return;
 
-       connman_element_unregister(&device->element);
+       remove_device(device);
 }
 
 /**
@@ -1545,182 +1418,891 @@ 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;
+       GSList *list;
 
-       return FALSE;
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               enum connman_service_type service_type =
+                       __connman_device_get_service_type(device);
+
+               if (service_type != type)
+                       continue;
+
+               return device;
+       }
+
+       return NULL;
 }
 
-static int device_probe(struct connman_element *element)
+struct connman_device *connman_device_find_by_index(int index)
 {
-       struct connman_device *device = element->device;
        GSList *list;
 
-       DBG("element %p name %s", element, element->name);
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               if (device->index == index)
+                       return device;
+       }
 
-       if (device == NULL)
-               return -ENODEV;
+       return NULL;
+}
 
-       if (device->driver != NULL)
-               return -EALREADY;
+/**
+ * connman_device_set_regdom
+ * @device: device structure
+ * @alpha2: string representing regulatory domain
+ *
+ * Set regulatory domain on device basis
+ */
+int connman_device_set_regdom(struct connman_device *device,
+                                               const char *alpha2)
+{
+       if (!device->driver || !device->driver->set_regdom)
+               return -ENOTSUP;
 
-       for (list = driver_list; list; list = list->next) {
-               struct connman_device_driver *driver = list->data;
+       if (!device->powered)
+               return -EINVAL;
+
+       return device->driver->set_regdom(device, alpha2);
+}
+
+/**
+ * connman_device_regdom_notify
+ * @device: device structure
+ * @alpha2: string representing regulatory domain
+ *
+ * Notify on setting regulatory domain on device basis
+ */
+void connman_device_regdom_notify(struct connman_device *device,
+                                       int result, const char *alpha2)
+{
+       __connman_technology_notify_regdom_by_device(device, result, alpha2);
+}
 
-               if (match_driver(device, driver) == FALSE)
+#if defined TIZEN_EXT
+static int device_specific_scan(enum connman_service_type type,
+                               struct connman_device *device,
+                               int scan_type, GSList *specific_scan_list)
+{
+       if (!device->driver || !device->driver->specific_scan)
+               return -EOPNOTSUPP;
+
+       if (!device->powered)
+               return -ENOLINK;
+
+       return device->driver->specific_scan(type, device, scan_type,
+                       specific_scan_list, NULL);
+}
+
+int __connman_device_request_specific_scan(enum connman_service_type type,
+                               const char *ifname, int scan_type, GSList *specific_scan_list)
+{
+       bool success = false;
+       int last_err = -ENOSYS;
+       GSList *list;
+       int err;
+
+       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_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
+               break;
+       }
+
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               enum connman_service_type service_type =
+                       __connman_device_get_service_type(device);
+
+               if (service_type != CONNMAN_SERVICE_TYPE_UNKNOWN) {
+                       if (type == CONNMAN_SERVICE_TYPE_P2P) {
+                               if (service_type != CONNMAN_SERVICE_TYPE_WIFI)
+                                       continue;
+                       } else if (service_type != type)
+                               continue;
+               }
+
+               if (ifname && g_strcmp0(device->interface, ifname) != 0)
                        continue;
 
-               DBG("driver %p name %s", driver, driver->name);
+               err = device_specific_scan(type, device, scan_type, specific_scan_list);
+               if (err == 0 || err == -EINPROGRESS) {
+                       success = true;
+               } else {
+                       last_err = err;
+                       DBG("device %p err %d", device, err);
+               }
+       }
 
-               if (driver->probe(device) == 0) {
-                       device->driver = driver;
-                       break;
+       if (success)
+               return 0;
+
+       return last_err;
+}
+
+int connman_device_request_device_scan(enum connman_service_type type,
+                               const char * ifname, bool force_full_scan)
+{
+       bool success = false;
+       int last_err = -ENOSYS;
+       GSList *list;
+       int err;
+
+       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_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
+               break;
+       }
+
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               if (!device_has_service_type(device, type))
+                       continue;
+
+               if (g_strcmp0(device->interface, ifname) != 0)
+                       continue;
+
+               err = device_scan(type, device, force_full_scan);
+
+               if (err == 0 || err == -EINPROGRESS) {
+                       success = true;
+               } else {
+                       last_err = err;
+                       DBG("device %p err %d", device, err);
                }
+               break;
        }
 
-       if (device->driver == NULL)
-               return -ENODEV;
+       if (success)
+               return 0;
 
-       return setup_device(device);
+       return last_err;
 }
 
-static void device_remove(struct connman_element *element)
+#if defined TIZEN_EXT_WIFI_MESH
+static int device_abort_scan(enum connman_service_type type,
+                               struct connman_device *device)
 {
-       struct connman_device *device = element->device;
+       if (!device->driver || !device->driver->scan)
+               return -EOPNOTSUPP;
 
-       DBG("element %p name %s", element, element->name);
+       if (!device->powered)
+               return -ENOLINK;
 
-       if (device == NULL)
-               return;
+       return device->driver->abort_scan(type, device);
+}
 
-       if (device->driver == NULL)
-               return;
+int __connman_device_abort_scan(enum connman_service_type type)
+{
+       GSList *list;
+       int err = -EINVAL;
 
-       remove_device(device);
+       if (type != CONNMAN_SERVICE_TYPE_MESH)
+               return -EINVAL;
+
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               enum connman_service_type service_type =
+                       __connman_device_get_service_type(device);
+
+               if (service_type != CONNMAN_SERVICE_TYPE_UNKNOWN) {
+                       if (type == CONNMAN_SERVICE_TYPE_MESH)
+                               if (service_type != CONNMAN_SERVICE_TYPE_WIFI)
+                                       continue;
+
+                       if (!device->scanning) {
+                               err = -EEXIST;
+                               continue;
+                       }
+
+                       err = device_abort_scan(type, device);
+               }
+       }
+       return err;
 }
 
-static struct connman_driver device_driver = {
-       .name           = "device",
-       .type           = CONNMAN_ELEMENT_TYPE_DEVICE,
-       .priority       = CONNMAN_DRIVER_PRIORITY_LOW,
-       .probe          = device_probe,
-       .remove         = device_remove,
-};
+static int device_mesh_specific_scan(enum connman_service_type type,
+                               struct connman_device *device, const char *name,
+                               unsigned int freq)
+{
+       if (!device->driver || !device->driver->mesh_specific_scan)
+               return -EOPNOTSUPP;
+
+       if (!device->powered)
+               return -ENOLINK;
 
-static int device_load(struct connman_device *device)
+       return device->driver->mesh_specific_scan(type, device, name, freq, NULL);
+}
+
+int __connman_device_request_mesh_specific_scan(enum connman_service_type type,
+                                               const char *name,
+                                               unsigned int freq)
 {
-       const char *ident = __connman_profile_active_ident();
-       GKeyFile *keyfile;
-       GError *error = NULL;
-       gchar *identifier;
-       connman_bool_t powered;
-       int val;
+       bool success = false;
+       int last_err = -ENOSYS;
+       GSList *list;
+       int err;
 
-       DBG("device %p", device);
+       if (type != CONNMAN_SERVICE_TYPE_MESH)
+               return -EINVAL;
 
-       keyfile = __connman_storage_open_profile(ident);
-       if (keyfile == NULL)
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               enum connman_service_type service_type =
+                       __connman_device_get_service_type(device);
+
+               if (service_type != CONNMAN_SERVICE_TYPE_UNKNOWN) {
+                       if (type == CONNMAN_SERVICE_TYPE_MESH)
+                               if (service_type != CONNMAN_SERVICE_TYPE_WIFI)
+                                       continue;
+               }
+
+               err = device_mesh_specific_scan(type, device, name, freq);
+               if (err == 0 || err == -EALREADY || err == -EINPROGRESS) {
+                       success = true;
+               } else {
+                       last_err = err;
+                       DBG("device %p err %d", device, err);
+               }
+       }
+
+       if (success)
                return 0;
 
-       identifier = g_strdup_printf("device_%s", device->element.name);
-       if (identifier == NULL)
-               goto done;
+       return last_err;
+}
+#endif /* TIZEN_EXT_WIFI_MESH */
+#endif
 
-       powered = g_key_file_get_boolean(keyfile, identifier,
-                                               "Powered", &error);
-       if (error == NULL)
-               device->powered_persistent = powered;
-       g_clear_error(&error);
+static int connman_device_request_scan(enum connman_service_type type,
+                                       bool force_full_scan)
+{
+       bool success = false;
+       int last_err = -ENOSYS;
+       GSList *list;
+       int err;
 
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
-               break;
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               val = g_key_file_get_integer(keyfile, identifier,
-                                               "ScanInterval", &error);
-               if (error == NULL && val > 0)
-                       device->scan_interval = val;
-               g_clear_error(&error);
+       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_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                break;
        }
 
-done:
-       g_free(identifier);
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
 
-       __connman_storage_close_profile(ident, keyfile, FALSE);
+               if (!device_has_service_type(device, type))
+                       continue;
 
-       return 0;
+               err = device_scan(type, device, force_full_scan);
+#if defined TIZEN_EXT
+               /* When Scan is already in progress then return Error so that
+                * wifi-manager can block the scan-done signal to be sent to
+                * application and start requested scan after scan already in progress
+                * is completed then notify to application about the scan event */
+               if (err == 0 || err == -EINPROGRESS) {
+#else
+               if (err == 0 || err == -EALREADY || err == -EINPROGRESS) {
+#endif
+                       success = true;
+               } else {
+                       last_err = err;
+                       DBG("device %p err %d", device, err);
+               }
+       }
+
+       if (success)
+               return 0;
+
+       return last_err;
 }
 
-static int device_save(struct connman_device *device)
+int __connman_device_request_scan(enum connman_service_type type)
 {
-       const char *ident = __connman_profile_active_ident();
-       GKeyFile *keyfile;
-       gchar *identifier;
+       return connman_device_request_scan(type, false);
+}
+
+int __connman_device_request_scan_full(enum connman_service_type type)
+{
+       return connman_device_request_scan(type, true);
+}
+
+int __connman_device_request_hidden_scan(struct connman_device *device,
+                               const char *ssid, unsigned int ssid_len,
+                               const char *identity, const char *passphrase,
+                               const char *security, void *user_data)
+{
+       struct connman_device_scan_params params;
 
        DBG("device %p", device);
 
-       keyfile = __connman_storage_open_profile(ident);
-       if (keyfile == NULL)
-               return 0;
+       if (!device || !device->driver ||
+                       !device->driver->scan)
+               return -EINVAL;
 
-       identifier = g_strdup_printf("device_%s", device->element.name);
-       if (identifier == NULL)
-               goto done;
+       params.type = CONNMAN_SERVICE_TYPE_UNKNOWN;
+       params.ssid = ssid;
+       params.ssid_len = ssid_len;
+       params.identity = identity;
+       params.passphrase = passphrase;
+       params.security = security;
+       params.user_data = user_data;
 
-       g_key_file_set_boolean(keyfile, identifier,
-                                       "Powered", device->powered_persistent);
+       return device->driver->scan(device, &params);
+}
+
+void __connman_device_stop_scan(enum connman_service_type type)
+{
+       GSList *list;
+
+       for (list = device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               if (!device_has_service_type(device, type))
+                       continue;
+
+               if (device->driver && device->driver->stop_scan)
+                       device->driver->stop_scan(type, device);
+       }
+}
+
+#if defined TIZEN_EXT
+#define WIFI_MAC "/opt/etc/.mac.info"
+#define MAC_ADDR_LEN 18
+
+char *_get_wifi_addr(void)
+{
+       FILE *fp = NULL;
+       char* rv = 0;
+       char wifi_mac[MAC_ADDR_LEN + 1];
+       char *str;
+
+       fp = fopen(WIFI_MAC, "r");
+       if (!fp){
+               connman_error("[%s] not present", WIFI_MAC);
+               return NULL;
+       }
+
+       rv = fgets(wifi_mac, MAC_ADDR_LEN, fp);
+       if (!rv) {
+               connman_error("Failed to get wifi mac address");
+               fclose(fp);
+               return NULL;
+       }
+
+       str = g_try_malloc0(MAC_ADDR_LEN);
+       if (!str) {
+               connman_error("memory allocation failed");
+               fclose(fp);
+               return NULL;
+       }
+
+       snprintf(str, MAC_ADDR_LEN, "%c%c:%c%c:%c%c:%c%c:%c%c:%c%c",
+                       g_ascii_tolower(wifi_mac[0]), g_ascii_tolower(wifi_mac[1]),
+                       g_ascii_tolower(wifi_mac[3]), g_ascii_tolower(wifi_mac[4]),
+                       g_ascii_tolower(wifi_mac[6]), g_ascii_tolower(wifi_mac[7]),
+                       g_ascii_tolower(wifi_mac[9]), g_ascii_tolower(wifi_mac[10]),
+                       g_ascii_tolower(wifi_mac[12]), g_ascii_tolower(wifi_mac[13]),
+                       g_ascii_tolower(wifi_mac[15]), g_ascii_tolower(wifi_mac[16]));
+       fclose(fp);
+       return str;
+}
+
+char *_get_wifi_ident(void)
+{
+       FILE *fp = NULL;
+       char* rv = 0;
+       char wifi_mac[MAC_ADDR_LEN + 1];
+       char *str;
+
+       fp = fopen(WIFI_MAC, "r");
+       if (!fp){
+               connman_error("[%s] not present", WIFI_MAC);
+               return NULL;
+       }
+
+       rv = fgets(wifi_mac, MAC_ADDR_LEN, fp);
+       if (!rv) {
+               connman_error("Failed to get wifi mac address");
+               fclose(fp);
+               return NULL;
+       }
+
+       str = g_try_malloc0(MAC_ADDR_LEN);
+       if (!str) {
+               connman_error("memory allocation failed");
+               fclose(fp);
+               return NULL;
+       }
+
+       snprintf(str, MAC_ADDR_LEN, "%c%c%c%c%c%c%c%c%c%c%c%c",
+                       g_ascii_tolower(wifi_mac[0]), g_ascii_tolower(wifi_mac[1]),
+                       g_ascii_tolower(wifi_mac[3]), g_ascii_tolower(wifi_mac[4]),
+                       g_ascii_tolower(wifi_mac[6]), g_ascii_tolower(wifi_mac[7]),
+                       g_ascii_tolower(wifi_mac[9]), g_ascii_tolower(wifi_mac[10]),
+                       g_ascii_tolower(wifi_mac[12]), g_ascii_tolower(wifi_mac[13]),
+                       g_ascii_tolower(wifi_mac[15]), g_ascii_tolower(wifi_mac[16]));
+       fclose(fp);
+       return str;
+}
+#endif
+
+#if defined TIZEN_EXT
+char *index2ident(int index, const char *prefix)
+#else
+static char *index2ident(int index, const char *prefix)
+#endif
+{
+       struct ifreq ifr;
+       struct ether_addr eth;
+       char *str;
+       int sk, err, len;
+
+       if (index < 0)
+               return NULL;
 
-       switch (device->mode) {
-       case CONNMAN_DEVICE_MODE_UNKNOWN:
+       sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return NULL;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = index;
+
+       err = ioctl(sk, SIOCGIFNAME, &ifr);
+
+       if (err == 0)
+               err = ioctl(sk, SIOCGIFHWADDR, &ifr);
+
+       close(sk);
+
+       if (err < 0)
+               return NULL;
+
+       len = prefix ? strlen(prefix) + 18 : 18;
+
+       str = g_malloc(len);
+       if (!str)
+               return NULL;
+
+       memcpy(&eth, &ifr.ifr_hwaddr.sa_data, sizeof(eth));
+       snprintf(str, len, "%s%02x%02x%02x%02x%02x%02x",
+                                               prefix ? prefix : "",
+                                               eth.ether_addr_octet[0],
+                                               eth.ether_addr_octet[1],
+                                               eth.ether_addr_octet[2],
+                                               eth.ether_addr_octet[3],
+                                               eth.ether_addr_octet[4],
+                                               eth.ether_addr_octet[5]);
+
+       return str;
+}
+
+#if defined TIZEN_EXT
+char *index2addr(int index)
+#else
+static char *index2addr(int index)
+#endif
+{
+       struct ifreq ifr;
+       struct ether_addr eth;
+       char *str;
+       int sk, err;
+
+       if (index < 0)
+               return NULL;
+
+       sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return NULL;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = index;
+
+       err = ioctl(sk, SIOCGIFNAME, &ifr);
+
+       if (err == 0)
+               err = ioctl(sk, SIOCGIFHWADDR, &ifr);
+
+       close(sk);
+
+       if (err < 0)
+               return NULL;
+
+       str = g_malloc(18);
+       if (!str)
+               return NULL;
+
+       memcpy(&eth, &ifr.ifr_hwaddr.sa_data, sizeof(eth));
+       snprintf(str, 18, "%02X:%02X:%02X:%02X:%02X:%02X",
+                                               eth.ether_addr_octet[0],
+                                               eth.ether_addr_octet[1],
+                                               eth.ether_addr_octet[2],
+                                               eth.ether_addr_octet[3],
+                                               eth.ether_addr_octet[4],
+                                               eth.ether_addr_octet[5]);
+
+       return str;
+}
+
+struct connman_device *connman_device_create_from_index(int index)
+{
+       enum connman_device_type type;
+       struct connman_device *device;
+       char *devname, *ident = NULL;
+       char *addr = NULL, *name = NULL;
+
+       if (index < 0)
+               return NULL;
+
+       devname = connman_inet_ifname(index);
+       if (!devname)
+               return NULL;
+
+       if (__connman_device_isfiltered(devname)) {
+               connman_info("Ignoring interface %s (filtered)", devname);
+               g_free(devname);
+               return NULL;
+       }
+
+       type = __connman_rtnl_get_device_type(index);
+
+       switch (type) {
+       case CONNMAN_DEVICE_TYPE_UNKNOWN:
+               connman_info("Ignoring interface %s (type unknown)", devname);
+               g_free(devname);
+               return NULL;
+       case CONNMAN_DEVICE_TYPE_ETHERNET:
+       case CONNMAN_DEVICE_TYPE_GADGET:
+       case CONNMAN_DEVICE_TYPE_WIFI:
+               name = index2ident(index, "");
+               addr = index2addr(index);
                break;
-       case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-       case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-               if (device->scan_interval > 0)
-                       g_key_file_set_integer(keyfile, identifier,
-                                       "ScanInterval", device->scan_interval);
+       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+       case CONNMAN_DEVICE_TYPE_CELLULAR:
+       case CONNMAN_DEVICE_TYPE_GPS:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
+               name = g_strdup(devname);
                break;
        }
 
+       device = connman_device_create(name, type);
+       if (!device)
+               goto done;
+
+       switch (type) {
+       case CONNMAN_DEVICE_TYPE_UNKNOWN:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
+       case CONNMAN_DEVICE_TYPE_GPS:
+               break;
+       case CONNMAN_DEVICE_TYPE_ETHERNET:
+       case CONNMAN_DEVICE_TYPE_GADGET:
+               ident = index2ident(index, NULL);
+               break;
+       case CONNMAN_DEVICE_TYPE_WIFI:
+               ident = index2ident(index, NULL);
+               break;
+       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+               break;
+       case CONNMAN_DEVICE_TYPE_CELLULAR:
+               ident = index2ident(index, NULL);
+               break;
+       }
+
+       connman_device_set_index(device, index);
+       connman_device_set_interface(device, devname);
+#if defined TIZEN_EXT
+       connman_device_load_last_connected(device);
+       connman_device_load_last_user_selection(device);
+#endif
+
+       if (ident) {
+               connman_device_set_ident(device, ident);
+               g_free(ident);
+       }
+
+       connman_device_set_string(device, "Address", addr);
+
 done:
-       g_free(identifier);
+       g_free(devname);
+       g_free(name);
+       g_free(addr);
 
-       __connman_storage_close_profile(ident, keyfile, TRUE);
+       return device;
+}
 
-       return 0;
+bool __connman_device_isfiltered(const char *devname)
+{
+       char **pattern;
+       char **blacklisted_interfaces;
+       bool match;
+
+       if (!device_filter)
+               goto nodevice;
+
+       for (pattern = device_filter, match = false; *pattern; pattern++) {
+               if (g_pattern_match_simple(*pattern, devname)) {
+                       match = true;
+                       break;
+               }
+       }
+
+       if (!match) {
+               DBG("ignoring device %s (match)", devname);
+               return true;
+       }
+
+nodevice:
+       if (g_pattern_match_simple("dummy*", devname)) {
+               DBG("ignoring dummy networking devices");
+               return true;
+       }
+
+       if (!nodevice_filter)
+               goto list;
+
+       for (pattern = nodevice_filter; *pattern; pattern++) {
+               if (g_pattern_match_simple(*pattern, devname)) {
+                       DBG("ignoring device %s (no match)", devname);
+                       return true;
+               }
+       }
+
+list:
+       if (__connman_inet_isrootnfs_device(devname)) {
+               DBG("ignoring device %s (rootnfs)", devname);
+               return true;
+       }
+
+       blacklisted_interfaces =
+               connman_setting_get_string_list("NetworkInterfaceBlacklist");
+       if (!blacklisted_interfaces)
+               return false;
+
+       for (pattern = blacklisted_interfaces; *pattern; pattern++) {
+               if (g_str_has_prefix(devname, *pattern)) {
+                       DBG("ignoring device %s (blacklist)", devname);
+                       return true;
+               }
+       }
+
+       return false;
 }
 
-static struct connman_storage device_storage = {
-       .name           = "device",
-       .priority       = CONNMAN_STORAGE_PRIORITY_LOW,
-       .device_load    = device_load,
-       .device_save    = device_save,
-};
+static void cleanup_devices(void)
+{
+       /*
+        * Check what interfaces are currently up and if connman is
+        * suppose to handle the interface, then cleanup the mess
+        * related to that interface. There might be weird routes etc
+        * that are related to that interface and that might confuse
+        * connmand. So in this case we just turn the interface down
+        * so that kernel removes routes/addresses automatically and
+        * then proceed the startup.
+        *
+        * Note that this cleanup must be done before rtnl/detect code
+        * has activated interface watches.
+        */
+
+       char **interfaces;
+       int i;
+
+       interfaces = __connman_inet_get_running_interfaces();
+
+       if (!interfaces)
+               return;
+
+       for (i = 0; interfaces[i]; i++) {
+               bool filtered;
+               int index;
+               struct sockaddr_in sin_addr, sin_mask;
+
+               filtered = __connman_device_isfiltered(interfaces[i]);
+               if (filtered)
+                       continue;
+
+               index = connman_inet_ifindex(interfaces[i]);
+               if (index < 0)
+                       continue;
 
-int __connman_device_init(void)
+               if (!__connman_inet_get_address_netmask(index, &sin_addr,
+                                                       &sin_mask)) {
+                       char *address = g_strdup(inet_ntoa(sin_addr.sin_addr));
+                       char *netmask = g_strdup(inet_ntoa(sin_mask.sin_addr));
+
+                       if (__connman_config_address_provisioned(address,
+                                                               netmask)) {
+                               DBG("Skip %s which is already provisioned "
+                                       "with %s/%s", interfaces[i], address,
+                                       netmask);
+                               g_free(address);
+                               g_free(netmask);
+                               continue;
+                       }
+
+                       g_free(address);
+                       g_free(netmask);
+               }
+
+               DBG("cleaning up %s index %d", interfaces[i], index);
+
+#if defined TIZEN_EXT
+               if (strcmp(interfaces[i], "wlan0") != 0)
+#endif
+               connman_inet_ifdown(index);
+
+               /*
+                * ConnMan will turn the interface UP automatically so
+                * no need to do it here.
+                */
+       }
+
+       g_strfreev(interfaces);
+}
+
+int __connman_device_init(const char *device, const char *nodevice)
 {
        DBG("");
 
+#if defined TIZEN_EXT
        connection = connman_dbus_get_connection();
+#endif
+
+       if (device)
+               device_filter = g_strsplit(device, ",", -1);
 
-       if (connman_storage_register(&device_storage) < 0)
-               connman_error("Failed to register device storage");
+       if (nodevice)
+               nodevice_filter = g_strsplit(nodevice, ",", -1);
 
-       return connman_driver_register(&device_driver);
+       cleanup_devices();
+
+       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);
 
+#if defined TIZEN_EXT
        dbus_connection_unref(connection);
+#endif
+}
+
+#ifdef TIZEN_EXT
+void connman_device_mac_policy_notify(struct connman_device *device,
+                                       int result, unsigned int policy)
+{
+       device->mac_policy = policy;
+       __connman_technology_notify_mac_policy_by_device(device, result, policy);
+}
+
+int connman_device_set_mac_policy(struct connman_device *device,
+                                       unsigned int policy)
+{
+       int err = 0;
+
+       if (!device || !device->driver || !device->driver->set_mac_policy)
+               return -EOPNOTSUPP;
+
+       device->mac_policy = policy;
+       err = device->driver->set_mac_policy(device, policy);
+       return err;
+}
+
+unsigned int connman_device_get_mac_policy(struct connman_device *device)
+{
+       return device->mac_policy;
 }
+
+void connman_device_preassoc_mac_policy_notify(struct connman_device *device,
+                                       int result, unsigned int policy)
+{
+       device->preassoc_mac_policy = policy;
+       __connman_technology_notify_preassoc_mac_policy_by_device(device, result, policy);
+}
+
+int connman_device_set_preassoc_mac_policy(struct connman_device *device,
+                                       unsigned int policy)
+{
+       int err = 0;
+
+       if (!device || !device->driver || !device->driver->set_preassoc_mac_policy)
+               return -EOPNOTSUPP;
+
+       device->preassoc_mac_policy = policy;
+       err = device->driver->set_preassoc_mac_policy(device, policy);
+       return err;
+}
+
+unsigned int connman_device_get_preassoc_mac_policy(struct connman_device *device)
+{
+       return device->preassoc_mac_policy;
+}
+
+void connman_device_random_mac_lifetime_notify(struct connman_device *device,
+                                       int result, unsigned int lifetime)
+{
+       device->random_mac_lifetime = lifetime;
+       __connman_technology_notify_random_mac_lifetime_by_device(device, result, lifetime);
+}
+
+int connman_device_set_random_mac_lifetime(struct connman_device *device,
+                                       unsigned int lifetime)
+{
+       int err = 0;
+
+       if (!device || !device->driver || !device->driver->set_random_mac_lifetime)
+               return -EOPNOTSUPP;
+
+       device->random_mac_lifetime = lifetime;
+       err = device->driver->set_random_mac_lifetime(device, lifetime);
+       return err;
+}
+
+unsigned int connman_device_get_random_mac_lifetime(struct connman_device *device)
+{
+       return device->random_mac_lifetime;
+}
+
+#endif