technology: Return proper error code when already enabled
[framework/connectivity/connman.git] / src / technology.c
index 4d8eb03..013ac78 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -34,6 +34,15 @@ static DBusConnection *connection;
 
 static GSList *technology_list = NULL;
 
+/*
+ * List of devices with no technology associated with them either because of
+ * no compiled in support or the driver is not yet loaded.
+*/
+static GSList *techless_device_list = NULL;
+static GHashTable *rfkill_list;
+
+static connman_bool_t global_offlinemode;
+
 struct connman_rfkill {
        unsigned int index;
        enum connman_service_type type;
@@ -41,23 +50,14 @@ struct connman_rfkill {
        connman_bool_t hardblock;
 };
 
-enum connman_technology_state {
-       CONNMAN_TECHNOLOGY_STATE_UNKNOWN   = 0,
-       CONNMAN_TECHNOLOGY_STATE_OFFLINE   = 1,
-       CONNMAN_TECHNOLOGY_STATE_ENABLED   = 2,
-       CONNMAN_TECHNOLOGY_STATE_CONNECTED = 3,
-};
-
 struct connman_technology {
-       gint refcount;
+       int refcount;
        enum connman_service_type type;
-       enum connman_technology_state state;
        char *path;
-       GHashTable *rfkill_list;
        GSList *device_list;
-       gint enabled;
-       gint blocked;
+       int enabled;
        char *regdom;
+       connman_bool_t connected;
 
        connman_bool_t tethering;
        char *tethering_ident;
@@ -70,6 +70,8 @@ struct connman_technology {
 
        DBusMessage *pending_reply;
        guint pending_timeout;
+
+       GSList *scan_pending;
 };
 
 static GSList *driver_list = NULL;
@@ -82,6 +84,17 @@ static gint compare_priority(gconstpointer a, gconstpointer b)
        return driver2->priority - driver1->priority;
 }
 
+static void rfkill_check(gpointer key, gpointer value, gpointer user_data)
+{
+       struct connman_rfkill *rfkill = value;
+       enum connman_service_type type = GPOINTER_TO_INT(user_data);
+
+       /* Calling _technology_rfkill_add will update the tech. */
+       if (rfkill->type == type)
+               __connman_technology_add_rfkill(rfkill->index, type,
+                               rfkill->softblock, rfkill->hardblock);
+}
+
 /**
  * connman_technology_driver_register:
  * @driver: Technology driver definition
@@ -93,23 +106,39 @@ static gint compare_priority(gconstpointer a, gconstpointer b)
 int connman_technology_driver_register(struct connman_technology_driver *driver)
 {
        GSList *list;
-       struct connman_technology *technology;
+       struct connman_device *device;
+       enum connman_service_type type;
 
-       DBG("driver %p name %s", driver, driver->name);
+       DBG("Registering %s driver", driver->name);
 
        driver_list = g_slist_insert_sorted(driver_list, driver,
                                                        compare_priority);
 
-       for (list = technology_list; list; list = list->next) {
-               technology = list->data;
+       if (techless_device_list == NULL)
+               goto check_rfkill;
 
-               if (technology->driver != NULL)
+       /*
+        * Check for technology less devices if this driver
+        * can service any of them.
+       */
+       for (list = techless_device_list; list; list = list->next) {
+               device = list->data;
+
+               type = __connman_device_get_service_type(device);
+               if (type != driver->type)
                        continue;
 
-               if (technology->type == driver->type)
-                       technology->driver = driver;
+               techless_device_list = g_slist_remove(techless_device_list,
+                                                               device);
+
+               __connman_technology_add_device(device);
        }
 
+check_rfkill:
+       /* Check for orphaned rfkill switches. */
+       g_hash_table_foreach(rfkill_list, rfkill_check,
+                                       GINT_TO_POINTER(driver->type));
+
        return 0;
 }
 
@@ -124,7 +153,7 @@ void connman_technology_driver_unregister(struct connman_technology_driver *driv
        GSList *list;
        struct connman_technology *technology;
 
-       DBG("driver %p name %s", driver, driver->name);
+       DBG("Unregistering driver %p name %s", driver, driver->name);
 
        for (list = technology_list; list; list = list->next) {
                technology = list->data;
@@ -153,6 +182,8 @@ static void tethering_changed(struct connman_technology *technology)
 void connman_technology_tethering_notify(struct connman_technology *technology,
                                                        connman_bool_t enabled)
 {
+       GSList *list;
+
        DBG("technology %p enabled %u", technology, enabled);
 
        if (technology->tethering == enabled)
@@ -164,14 +195,21 @@ void connman_technology_tethering_notify(struct connman_technology *technology,
 
        if (enabled == TRUE)
                __connman_tethering_set_enabled();
-       else
-               __connman_tethering_set_disabled();
+       else {
+               for (list = technology_list; list; list = list->next) {
+                       struct connman_technology *other_tech = list->data;
+                       if (other_tech->tethering == TRUE)
+                               break;
+               }
+               if (list == NULL)
+                       __connman_tethering_set_disabled();
+       }
 }
 
 static int set_tethering(struct connman_technology *technology,
-                               const char *bridge, connman_bool_t enabled)
+                               connman_bool_t enabled)
 {
-       const char *ident, *passphrase;
+       const char *ident, *passphrase, *bridge;
 
        ident = technology->tethering_ident;
        passphrase = technology->tethering_passphrase;
@@ -180,6 +218,10 @@ static int set_tethering(struct connman_technology *technology,
                        technology->driver->set_tethering == NULL)
                return -EOPNOTSUPP;
 
+       bridge = __connman_tethering_get_bridge();
+       if (bridge == NULL)
+               return -EOPNOTSUPP;
+
        if (technology->type == CONNMAN_SERVICE_TYPE_WIFI &&
            (ident == NULL || passphrase == NULL))
                return -EINVAL;
@@ -226,57 +268,6 @@ static void free_rfkill(gpointer data)
        g_free(rfkill);
 }
 
-void __connman_technology_list(DBusMessageIter *iter, void *user_data)
-{
-       GSList *list;
-
-       for (list = technology_list; list; list = list->next) {
-               struct connman_technology *technology = list->data;
-
-               if (technology->path == NULL)
-                       continue;
-
-               dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH,
-                                                       &technology->path);
-       }
-}
-
-static void technologies_changed(void)
-{
-       connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH,
-                       CONNMAN_MANAGER_INTERFACE, "Technologies",
-                       DBUS_TYPE_OBJECT_PATH, __connman_technology_list, NULL);
-}
-
-static const char *state2string(enum connman_technology_state state)
-{
-       switch (state) {
-       case CONNMAN_TECHNOLOGY_STATE_UNKNOWN:
-               break;
-       case CONNMAN_TECHNOLOGY_STATE_OFFLINE:
-               return "offline";
-       case CONNMAN_TECHNOLOGY_STATE_ENABLED:
-               return "enabled";
-       case CONNMAN_TECHNOLOGY_STATE_CONNECTED:
-               return "connected";
-       }
-
-       return NULL;
-}
-
-static void state_changed(struct connman_technology *technology)
-{
-       const char *str;
-
-       str = state2string(technology->state);
-       if (str == NULL)
-               return;
-
-       connman_dbus_property_changed_basic(technology->path,
-                               CONNMAN_TECHNOLOGY_INTERFACE, "State",
-                                               DBUS_TYPE_STRING, &str);
-}
-
 static const char *get_name(enum connman_service_type type)
 {
        switch (type) {
@@ -295,32 +286,138 @@ static const char *get_name(enum connman_service_type type)
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
                return "Bluetooth";
        case CONNMAN_SERVICE_TYPE_CELLULAR:
-               return "3G";
+               return "Cellular";
        }
 
        return NULL;
 }
 
-static DBusMessage *get_properties(DBusConnection *conn,
-                                       DBusMessage *message, void *user_data)
+static void save_state(struct connman_technology *technology)
 {
-       struct connman_technology *technology = user_data;
-       DBusMessage *reply;
-       DBusMessageIter array, dict;
-       const char *str;
+       GKeyFile *keyfile;
+       gchar *identifier;
 
-       reply = dbus_message_new_method_return(message);
-       if (reply == NULL)
-               return NULL;
+       DBG("technology %p", technology);
+
+       keyfile = __connman_storage_load_global();
+       if (keyfile == NULL)
+               keyfile = g_key_file_new();
 
-       dbus_message_iter_init_append(reply, &array);
+       identifier = g_strdup_printf("%s", get_name(technology->type));
+       if (identifier == NULL)
+               goto done;
 
-       connman_dbus_dict_open(&array, &dict);
+       g_key_file_set_boolean(keyfile, identifier, "Enable",
+                               technology->enable_persistent);
 
-       str = state2string(technology->state);
-       if (str != NULL)
-               connman_dbus_dict_append_basic(&dict, "State",
-                                               DBUS_TYPE_STRING, &str);
+done:
+       g_free(identifier);
+
+       __connman_storage_save_global(keyfile);
+
+       g_key_file_free(keyfile);
+
+       return;
+}
+
+static void load_state(struct connman_technology *technology)
+{
+       GKeyFile *keyfile;
+       gchar *identifier;
+       GError *error = NULL;
+       connman_bool_t enable;
+
+       DBG("technology %p", technology);
+
+       keyfile = __connman_storage_load_global();
+       /* Fallback on disabling technology if file not found. */
+       if (keyfile == NULL) {
+               if (technology->type == CONNMAN_SERVICE_TYPE_ETHERNET)
+                       /* We enable ethernet by default */
+                       technology->enable_persistent = TRUE;
+               else
+                       technology->enable_persistent = FALSE;
+               return;
+       }
+
+       identifier = g_strdup_printf("%s", get_name(technology->type));
+       if (identifier == NULL)
+               goto done;
+
+       enable = g_key_file_get_boolean(keyfile, identifier, "Enable", &error);
+       if (error == NULL)
+               technology->enable_persistent = enable;
+       else {
+               if (technology->type == CONNMAN_SERVICE_TYPE_ETHERNET)
+                       technology->enable_persistent = TRUE;
+               else
+                       technology->enable_persistent = FALSE;
+
+               save_state(technology);
+               g_clear_error(&error);
+       }
+done:
+       g_free(identifier);
+
+       g_key_file_free(keyfile);
+
+       return;
+}
+
+connman_bool_t __connman_technology_get_offlinemode(void)
+{
+       return global_offlinemode;
+}
+
+static void connman_technology_save_offlinemode()
+{
+       GKeyFile *keyfile;
+
+       keyfile = __connman_storage_load_global();
+       if (keyfile == NULL)
+               keyfile = g_key_file_new();
+
+       g_key_file_set_boolean(keyfile, "global",
+                                       "OfflineMode", global_offlinemode);
+
+       __connman_storage_save_global(keyfile);
+
+       g_key_file_free(keyfile);
+
+       return;
+}
+
+static connman_bool_t connman_technology_load_offlinemode()
+{
+       GKeyFile *keyfile;
+       GError *error = NULL;
+       connman_bool_t offlinemode;
+
+       /* If there is a error, we enable offlinemode */
+       keyfile = __connman_storage_load_global();
+       if (keyfile == NULL)
+               return FALSE;
+
+       offlinemode = g_key_file_get_boolean(keyfile, "global",
+                                               "OfflineMode", &error);
+       if (error != NULL) {
+               offlinemode = FALSE;
+               g_clear_error(&error);
+       }
+
+       g_key_file_free(keyfile);
+
+       return offlinemode;
+}
+
+static void append_properties(DBusMessageIter *iter,
+               struct connman_technology *technology)
+{
+       DBusMessageIter dict;
+       const char *str;
+       connman_bool_t powered;
+
+       connman_dbus_dict_open(iter, &dict);
 
        str = get_name(technology->type);
        if (str != NULL)
@@ -332,6 +429,18 @@ static DBusMessage *get_properties(DBusConnection *conn,
                connman_dbus_dict_append_basic(&dict, "Type",
                                                DBUS_TYPE_STRING, &str);
 
+       __sync_synchronize();
+       if (technology->enabled > 0)
+               powered = TRUE;
+       else
+               powered = FALSE;
+       connman_dbus_dict_append_basic(&dict, "Powered",
+                                       DBUS_TYPE_BOOLEAN, &powered);
+
+       connman_dbus_dict_append_basic(&dict, "Connected",
+                                       DBUS_TYPE_BOOLEAN,
+                                       &technology->connected);
+
        connman_dbus_dict_append_basic(&dict, "Tethering",
                                        DBUS_TYPE_BOOLEAN,
                                        &technology->tethering);
@@ -346,125 +455,465 @@ static DBusMessage *get_properties(DBusConnection *conn,
                                                DBUS_TYPE_STRING,
                                                &technology->tethering_passphrase);
 
-       connman_dbus_dict_close(&array, &dict);
-
-       return reply;
+       connman_dbus_dict_close(iter, &dict);
 }
 
-static DBusMessage *set_property(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+static void technology_added_signal(struct connman_technology *technology)
 {
-       struct connman_technology *technology = 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);
-
-       type = dbus_message_iter_get_arg_type(&value);
-
-       DBG("property %s", name);
-
-       if (g_str_equal(name, "Tethering") == TRUE) {
-               int err;
-               connman_bool_t tethering;
-               const char *bridge;
-
-               if (type != DBUS_TYPE_BOOLEAN)
-                       return __connman_error_invalid_arguments(msg);
-
-               dbus_message_iter_get_basic(&value, &tethering);
+       DBusMessage *signal;
+       DBusMessageIter iter;
 
-               if (technology->tethering == tethering)
-                       return __connman_error_in_progress(msg);
+       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+                       CONNMAN_MANAGER_INTERFACE, "TechnologyAdded");
+       if (signal == NULL)
+               return;
 
-               bridge = __connman_tethering_get_bridge();
-               if (bridge == NULL)
-                       return __connman_error_not_supported(msg);
+       dbus_message_iter_init_append(signal, &iter);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
+                                                       &technology->path);
+       append_properties(&iter, technology);
 
-               err = set_tethering(technology, bridge, tethering);
-               if (err < 0)
-                       return __connman_error_failed(msg, -err);
+       dbus_connection_send(connection, signal, NULL);
+       dbus_message_unref(signal);
+}
 
-       } else if (g_str_equal(name, "TetheringIdentifier") == TRUE) {
-               const char *str;
+static void technology_removed_signal(struct connman_technology *technology)
+{
+       g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
+                       CONNMAN_MANAGER_INTERFACE, "TechnologyRemoved",
+                       DBUS_TYPE_OBJECT_PATH, &technology->path,
+                       DBUS_TYPE_INVALID);
+}
 
-               dbus_message_iter_get_basic(&value, &str);
+static DBusMessage *get_properties(DBusConnection *conn,
+                                       DBusMessage *message, void *user_data)
+{
+       struct connman_technology *technology = user_data;
+       DBusMessage *reply;
+       DBusMessageIter iter;
 
-               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
-                       return __connman_error_not_supported(msg);
+       reply = dbus_message_new_method_return(message);
+       if (reply == NULL)
+               return NULL;
 
-               technology->tethering_ident = g_strdup(str);
-       } else if (g_str_equal(name, "TetheringPassphrase") == TRUE) {
-               const char *str;
+       dbus_message_iter_init_append(reply, &iter);
+       append_properties(&iter, technology);
 
-               dbus_message_iter_get_basic(&value, &str);
+       return reply;
+}
 
-               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
-                       return __connman_error_not_supported(msg);
+void __connman_technology_list_struct(DBusMessageIter *array)
+{
+       GSList *list;
+       DBusMessageIter entry;
 
-               if (strlen(str) < 8)
-                       return __connman_error_invalid_arguments(msg);
+       for (list = technology_list; list; list = list->next) {
+               struct connman_technology *technology = list->data;
 
-               technology->tethering_passphrase = g_strdup(str);
-       } else
-               return __connman_error_invalid_property(msg);
+               if (technology->path == NULL)
+                       continue;
 
-       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+               dbus_message_iter_open_container(array, DBUS_TYPE_STRUCT,
+                               NULL, &entry);
+               dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH,
+                               &technology->path);
+               append_properties(&entry, technology);
+               dbus_message_iter_close_container(array, &entry);
+       }
 }
 
-static GDBusMethodTable technology_methods[] = {
-       { "GetProperties", "",   "a{sv}", get_properties },
-       { "SetProperty",   "sv", "",      set_property   },
-       { },
-};
-
-static GDBusSignalTable technology_signals[] = {
-       { "PropertyChanged", "sv" },
-       { },
-};
-
-static struct connman_technology *technology_find(enum connman_service_type type)
+static gboolean technology_pending_reply(gpointer user_data)
 {
-       GSList *list;
-
-       DBG("type %d", type);
+       struct connman_technology *technology = user_data;
+       DBusMessage *reply;
 
-       for (list = technology_list; list; list = list->next) {
-               struct connman_technology *technology = list->data;
+       /* Power request timedout, send ETIMEDOUT. */
+       if (technology->pending_reply != NULL) {
+               reply = __connman_error_failed(technology->pending_reply, ETIMEDOUT);
+               if (reply != NULL)
+                       g_dbus_send_message(connection, reply);
 
-               if (technology->type == type)
-                       return technology;
+               dbus_message_unref(technology->pending_reply);
+               technology->pending_reply = NULL;
+               technology->pending_timeout = 0;
        }
 
-       return NULL;
+       return FALSE;
 }
 
-static struct connman_technology *technology_get(enum connman_service_type type)
+static int technology_enable(struct connman_technology *technology,
+               DBusMessage *msg)
 {
-       struct connman_technology *technology;
-       const char *str;
        GSList *list;
+       int err = 0;
+       int ret = -ENODEV;
+       DBusMessage *reply;
 
-       DBG("type %d", type);
+       DBG("technology %p enable", technology);
 
-       technology = technology_find(type);
-       if (technology != NULL) {
-               g_atomic_int_inc(&technology->refcount);
+       __sync_synchronize();
+       if (technology->enabled > 0) {
+               err = -EALREADY;
                goto done;
        }
 
-       str = __connman_service_type2string(type);
-       if (str == NULL)
-               return NULL;
-
+       if (technology->pending_reply != NULL) {
+               err = -EBUSY;
+               goto done;
+       }
+
+       if (msg != NULL) {
+               /*
+                * This is a bit of a trick. When msg is not NULL it means
+                * thats technology_enable was invoked from the manager API.
+                * Hence we save the state here.
+                */
+               technology->enable_persistent = TRUE;
+               save_state(technology);
+       }
+
+       __connman_rfkill_block(technology->type, FALSE);
+
+       /*
+        * An empty device list means that devices in the technology
+        * were rfkill blocked. The unblock above will enable the devs.
+        */
+       if (technology->device_list == NULL) {
+               ret = 0;
+               goto done;
+       }
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               err = __connman_device_enable(device);
+               /*
+                * err = 0 : Device was enabled right away.
+                * If atleast one device gets enabled, we consider
+                * the technology to be enabled.
+                */
+               if (err == 0)
+                       ret = 0;
+       }
+
+done:
+       if (ret == 0) {
+               if (msg != NULL)
+                       g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+               return ret;
+       }
+
+       if (msg != NULL) {
+               if (err == -EINPROGRESS) {
+                       technology->pending_reply = dbus_message_ref(msg);
+                       technology->pending_timeout = g_timeout_add_seconds(10,
+                                       technology_pending_reply, technology);
+               } else {
+                       if (err == -EALREADY)
+                               reply = __connman_error_already_enabled(msg);
+                       else
+                               reply = __connman_error_failed(msg, -err);
+                       if (reply != NULL)
+                               g_dbus_send_message(connection, reply);
+               }
+       }
+
+       return err;
+}
+
+static int technology_disable(struct connman_technology *technology,
+               DBusMessage *msg)
+{
+       GSList *list;
+       int err = 0;
+       int ret = -ENODEV;
+       DBusMessage *reply;
+
+       DBG("technology %p disable", technology);
+
+       __sync_synchronize();
+       if (technology->enabled == 0) {
+               err = -EALREADY;
+               goto done;
+       }
+
+       if (technology->pending_reply != NULL) {
+               err = -EBUSY;
+               goto done;
+       }
+
+       if (technology->tethering == TRUE)
+               set_tethering(technology, FALSE);
+
+       if (msg != NULL) {
+               technology->enable_persistent = FALSE;
+               save_state(technology);
+       }
+
+       __connman_rfkill_block(technology->type, TRUE);
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               err = __connman_device_disable(device);
+               if (err == 0)
+                       ret = 0;
+       }
+
+done:
+       if (ret == 0) {
+               if (msg != NULL)
+                       g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+               return ret;
+       }
+
+       if (msg != NULL) {
+               if (err == -EINPROGRESS) {
+                       technology->pending_reply = dbus_message_ref(msg);
+                       technology->pending_timeout = g_timeout_add_seconds(10,
+                                       technology_pending_reply, technology);
+               } else {
+                       reply = __connman_error_failed(msg, -err);
+                       if (reply != NULL)
+                               g_dbus_send_message(connection, reply);
+               }
+       }
+
+       return err;
+}
+
+static DBusMessage *set_property(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       struct connman_technology *technology = 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);
+
+       if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+               return __connman_error_invalid_arguments(msg);
+
+       dbus_message_iter_get_basic(&iter, &name);
+       dbus_message_iter_next(&iter);
+
+       if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+               return __connman_error_invalid_arguments(msg);
+
+       dbus_message_iter_recurse(&iter, &value);
+
+       type = dbus_message_iter_get_arg_type(&value);
+
+       DBG("property %s", name);
+
+       if (g_str_equal(name, "Tethering") == TRUE) {
+               int err;
+               connman_bool_t tethering;
+
+               if (type != DBUS_TYPE_BOOLEAN)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &tethering);
+
+               if (technology->tethering == tethering)
+                       return __connman_error_in_progress(msg);
+
+               err = set_tethering(technology, tethering);
+               if (err < 0)
+                       return __connman_error_failed(msg, -err);
+
+       } else if (g_str_equal(name, "TetheringIdentifier") == TRUE) {
+               const char *str;
+
+               dbus_message_iter_get_basic(&value, &str);
+
+               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
+                       return __connman_error_not_supported(msg);
+
+               technology->tethering_ident = g_strdup(str);
+       } else if (g_str_equal(name, "TetheringPassphrase") == TRUE) {
+               const char *str;
+
+               dbus_message_iter_get_basic(&value, &str);
+
+               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
+                       return __connman_error_not_supported(msg);
+
+               if (strlen(str) < 8)
+                       return __connman_error_invalid_arguments(msg);
+
+               technology->tethering_passphrase = g_strdup(str);
+       } else if (g_str_equal(name, "Powered") == TRUE) {
+               connman_bool_t enable;
+
+               if (type != DBUS_TYPE_BOOLEAN)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &enable);
+               if (enable == TRUE)
+                       technology_enable(technology, msg);
+               else
+                       technology_disable(technology, msg);
+
+       } else
+               return __connman_error_invalid_property(msg);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static struct connman_technology *technology_find(enum connman_service_type type)
+{
+       GSList *list;
+
+       DBG("type %d", type);
+
+       for (list = technology_list; list; list = list->next) {
+               struct connman_technology *technology = list->data;
+
+               if (technology->type == type)
+                       return technology;
+       }
+
+       return NULL;
+}
+
+static void reply_scan_pending(struct connman_technology *technology, int err)
+{
+       DBusMessage *reply;
+
+       DBG("technology %p err %d", technology, err);
+
+       while (technology->scan_pending != NULL) {
+               DBusMessage *msg = technology->scan_pending->data;
+
+               DBG("reply to %s", dbus_message_get_sender(msg));
+
+               if (err == 0)
+                       reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+               else
+                       reply = __connman_error_failed(msg, -err);
+               g_dbus_send_message(connection, reply);
+               dbus_message_unref(msg);
+
+               technology->scan_pending =
+                       g_slist_delete_link(technology->scan_pending,
+                                       technology->scan_pending);
+       }
+}
+
+void __connman_technology_scan_started(struct connman_device *device)
+{
+       DBG("device %p", device);
+}
+
+void __connman_technology_scan_stopped(struct connman_device *device)
+{
+       int count = 0;
+       struct connman_technology *technology;
+       enum connman_service_type type;
+       GSList *list;
+
+       type = __connman_device_get_service_type(device);
+       technology = technology_find(type);
+
+       DBG("technology %p device %p", technology, device);
+
+       if (technology == NULL)
+               return;
+
+       for (list = technology->device_list; list != NULL; list = list->next) {
+               struct connman_device *other_device = list->data;
+
+               if (device == other_device)
+                       continue;
+
+               if (__connman_device_get_service_type(other_device) != type)
+                       continue;
+
+               if (connman_device_get_scanning(other_device) == TRUE)
+                       count += 1;
+       }
+
+       if (count == 0)
+               reply_scan_pending(technology, 0);
+}
+
+static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+       struct connman_technology *technology = data;
+       int err;
+
+       DBG ("technology %p request from %s", technology,
+                       dbus_message_get_sender(msg));
+
+       dbus_message_ref(msg);
+       technology->scan_pending =
+               g_slist_prepend(technology->scan_pending, msg);
+
+       err = __connman_device_request_scan(technology->type);
+       if (err < 0)
+               reply_scan_pending(technology, err);
+
+       return NULL;
+}
+
+static const GDBusMethodTable technology_methods[] = {
+       { GDBUS_DEPRECATED_METHOD("GetProperties",
+                       NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+                       get_properties) },
+       { GDBUS_METHOD("SetProperty",
+                       GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+                       NULL, set_property) },
+       { GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
+       { },
+};
+
+static const GDBusSignalTable technology_signals[] = {
+       { GDBUS_SIGNAL("PropertyChanged",
+                       GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+       { },
+};
+
+static struct connman_technology *technology_get(enum connman_service_type type)
+{
+       struct connman_technology *technology;
+       struct connman_technology_driver *driver = NULL;
+       const char *str;
+       GSList *list;
+       int err;
+
+       DBG("type %d", type);
+
+       str = __connman_service_type2string(type);
+       if (str == NULL)
+               return NULL;
+
+       technology = technology_find(type);
+       if (technology != NULL) {
+               __sync_fetch_and_add(&technology->refcount, 1);
+               return technology;
+       }
+
+       /* First check if we have a driver for this technology type */
+       for (list = driver_list; list; list = list->next) {
+               driver = list->data;
+
+               if (driver->type == type)
+                       break;
+               else
+                       driver = NULL;
+       }
+
+       if (driver == NULL) {
+               DBG("No matching driver found for %s.",
+                               __connman_service_type2string(type));
+               return NULL;
+       }
+
        technology = g_try_new0(struct connman_technology, 1);
        if (technology == NULL)
                return NULL;
@@ -475,14 +924,11 @@ static struct connman_technology *technology_get(enum connman_service_type type)
        technology->path = g_strdup_printf("%s/technology/%s",
                                                        CONNMAN_PATH, str);
 
-       technology->rfkill_list = g_hash_table_new_full(g_int_hash, g_int_equal,
-                                                       NULL, free_rfkill);
        technology->device_list = NULL;
 
        technology->pending_reply = NULL;
-       technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
 
-       __connman_storage_load_technology(technology);
+       load_state(technology);
 
        if (g_dbus_register_interface(connection, technology->path,
                                        CONNMAN_TECHNOLOGY_INTERFACE,
@@ -495,26 +941,13 @@ static struct connman_technology *technology_get(enum connman_service_type type)
 
        technology_list = g_slist_append(technology_list, technology);
 
-       technologies_changed();
-
-       if (technology->driver != NULL)
-               goto done;
-
-       for (list = driver_list; list; list = list->next) {
-               struct connman_technology_driver *driver = list->data;
-
-               DBG("driver %p name %s", driver, driver->name);
+       technology_added_signal(technology);
 
-               if (driver->type != technology->type)
-                       continue;
+       technology->driver = driver;
+       err = driver->probe(technology);
+       if (err != 0)
+               DBG("Driver probe failed for technology %p", technology);
 
-               if (driver->probe(technology) == 0) {
-                       technology->driver = driver;
-                       break;
-               }
-       }
-
-done:
        DBG("technology %p", technology);
 
        return technology;
@@ -524,9 +957,11 @@ static void technology_put(struct connman_technology *technology)
 {
        DBG("technology %p", technology);
 
-       if (g_atomic_int_dec_and_test(&technology->refcount) == FALSE)
+       if (__sync_sub_and_fetch(&technology->refcount, 1) > 0)
                return;
 
+       reply_scan_pending(technology, -EINTR);
+
        if (technology->driver) {
                technology->driver->remove(technology);
                technology->driver = NULL;
@@ -534,13 +969,12 @@ static void technology_put(struct connman_technology *technology)
 
        technology_list = g_slist_remove(technology_list, technology);
 
-       technologies_changed();
+       technology_removed_signal(technology);
 
        g_dbus_unregister_interface(connection, technology->path,
                                                CONNMAN_TECHNOLOGY_INTERFACE);
 
        g_slist_free(technology->device_list);
-       g_hash_table_destroy(technology->rfkill_list);
 
        g_free(technology->path);
        g_free(technology->regdom);
@@ -567,10 +1001,10 @@ void __connman_technology_add_interface(enum connman_service_type type,
                break;
        }
 
-       connman_info("Create interface %s [ %s ]", name,
+       connman_info("Adding interface %s [ %s ]", name,
                                __connman_service_type2string(type));
 
-       technology = technology_get(type);
+       technology = technology_find(type);
 
        if (technology == NULL || technology->driver == NULL
                        || technology->driver->add_interface == NULL)
@@ -610,8 +1044,6 @@ void __connman_technology_remove_interface(enum connman_service_type type,
 
        if (technology->driver->remove_interface)
                technology->driver->remove_interface(technology, index);
-
-       technology_put(technology);
 }
 
 int __connman_technology_add_device(struct connman_device *device)
@@ -622,16 +1054,33 @@ int __connman_technology_add_device(struct connman_device *device)
        DBG("device %p", device);
 
        type = __connman_device_get_service_type(device);
-       __connman_notifier_register(type);
 
-       technology = technology_get(type);
-       if (technology == NULL)
+       technology = technology_get(type);
+       if (technology == NULL) {
+               /*
+                * Since no driver can be found for this device at the moment we
+                * add it to the techless device list.
+               */
+               techless_device_list = g_slist_prepend(techless_device_list,
+                                                               device);
+
                return -ENXIO;
+       }
 
-       if (g_atomic_int_get(&technology->blocked))
-               goto done;
-
-done:
+       if (technology->enable_persistent && !global_offlinemode) {
+               int err = __connman_device_enable(device);
+               /*
+                * connman_technology_add_device() calls __connman_device_enable()
+                * but since the device is already enabled, the calls does not
+                * propagate through to connman_technology_enabled via
+                * connman_device_set_powered.
+                */
+               if (err == -EALREADY)
+                       __connman_technology_enabled(type);
+       }
+       /* if technology persistent state is offline */
+       if (!technology->enable_persistent)
+               __connman_device_disable(device);
 
        technology->device_list = g_slist_append(technology->device_list,
                                                                device);
@@ -647,39 +1096,34 @@ int __connman_technology_remove_device(struct connman_device *device)
        DBG("device %p", device);
 
        type = __connman_device_get_service_type(device);
-       __connman_notifier_unregister(type);
 
        technology = technology_find(type);
-       if (technology == NULL)
+       if (technology == NULL) {
+               techless_device_list = g_slist_remove(techless_device_list,
+                                                               device);
                return -ENXIO;
+       }
 
        technology->device_list = g_slist_remove(technology->device_list,
                                                                device);
-       if (technology->device_list == NULL) {
-               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-               state_changed(technology);
-       }
+       technology_put(technology);
 
        return 0;
 }
 
-static gboolean technology_pending_reply(gpointer user_data)
+static void powered_changed(struct connman_technology *technology)
 {
-       struct connman_technology *technology = user_data;
-       DBusMessage *reply;
-
-       /* Power request timedout, send ETIMEDOUT. */
-       if (technology->pending_reply != NULL) {
-               reply = __connman_error_failed(technology->pending_reply, ETIMEDOUT);
-               if (reply != NULL)
-                       g_dbus_send_message(connection, reply);
+       connman_bool_t powered;
 
-               dbus_message_unref(technology->pending_reply);
-               technology->pending_reply = NULL;
-               technology->pending_timeout = 0;
-       }
+       __sync_synchronize();
+       if (technology->enabled >0)
+               powered = TRUE;
+       else
+               powered = FALSE;
 
-       return FALSE;
+       connman_dbus_property_changed_basic(technology->path,
+                       CONNMAN_TECHNOLOGY_INTERFACE, "Powered",
+                       DBUS_TYPE_BOOLEAN, &powered);
 }
 
 int __connman_technology_enabled(enum connman_service_type type)
@@ -690,19 +1134,15 @@ int __connman_technology_enabled(enum connman_service_type type)
        if (technology == NULL)
                return -ENXIO;
 
-       if (g_atomic_int_get(&technology->blocked))
-               return -ERFKILL;
+       if (__sync_fetch_and_add(&technology->enabled, 1) != 0)
+               return -EALREADY;
 
-       __connman_notifier_enable(type);
-
-       if (g_atomic_int_exchange_and_add(&technology->enabled, 1) == 0) {
-               technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED;
-               state_changed(technology);
-       }
+       powered_changed(technology);
 
        if (technology->pending_reply != NULL) {
                g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
                dbus_message_unref(technology->pending_reply);
+               g_source_remove(technology->pending_timeout);
                technology->pending_reply = NULL;
                technology->pending_timeout = 0;
        }
@@ -710,190 +1150,87 @@ int __connman_technology_enabled(enum connman_service_type type)
        return 0;
 }
 
-int __connman_technology_enable(enum connman_service_type type, DBusMessage *msg)
-{
-       struct connman_technology *technology;
-       GSList *list;
-       int err = 0;
-       int ret = -ENODEV;
-       DBusMessage *reply;
-
-       DBG("type %d enable", type);
-
-       technology = technology_find(type);
-       if (technology == NULL) {
-               err = -ENXIO;
-               goto done;
-       }
-
-       if (technology->pending_reply != NULL) {
-               err = -EBUSY;
-               goto done;
-       }
-
-       if (msg != NULL) {
-               technology->pending_reply = dbus_message_ref(msg);
-               /*
-                * This is a bit of a trick. When msg is not NULL it means
-                * thats technology_enable was invoked from the manager API. Hence we save
-                * the state here.
-                */
-               technology->enable_persistent = TRUE;
-               __connman_storage_save_technology(technology);
-       }
-
-       for (list = technology->device_list; list; list = list->next) {
-               struct connman_device *device = list->data;
-
-               err = __connman_device_enable_persistent(device);
-               /*
-                * err = 0 : Device was enabled right away.
-                * If atleast one device gets enabled, we consider
-                * the technology to be enabled.
-                */
-               if (err == 0)
-                       ret = 0;
-       }
-
-done:
-       if (ret == 0)
-               return ret;
-
-       if (msg != NULL) {
-               if (err == -EINPROGRESS)
-                       technology->pending_timeout = g_timeout_add_seconds(10,
-                                       technology_pending_reply, technology);
-               else {
-                       reply = __connman_error_failed(msg, -err);
-                       if (reply != NULL)
-                               g_dbus_send_message(connection, reply);
-               }
-       }
-
-       return err;
-}
-
 int __connman_technology_disabled(enum connman_service_type type)
 {
        struct connman_technology *technology;
-       GSList *list;
 
        technology = technology_find(type);
        if (technology == NULL)
                return -ENXIO;
 
+       if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
+               return -EINPROGRESS;
+
        if (technology->pending_reply != NULL) {
                g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
                dbus_message_unref(technology->pending_reply);
+               g_source_remove(technology->pending_timeout);
                technology->pending_reply = NULL;
+               technology->pending_timeout = 0;
        }
 
-       if (g_atomic_int_dec_and_test(&technology->enabled) == TRUE) {
-               __connman_notifier_disable(type);
-               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-               state_changed(technology);
-       }
-
-       for (list = technology->device_list; list; list = list->next) {
-               struct connman_device *device = list->data;
-
-               if (__connman_device_get_blocked(device) == FALSE)
-                       return 0;
-       }
+       powered_changed(technology);
 
        return 0;
 }
 
-int __connman_technology_disable(enum connman_service_type type, DBusMessage *msg)
-{
-       struct connman_technology *technology;
-       GSList *list;
-       int err = 0;
-       int ret = -ENODEV;
-       DBusMessage *reply;
-
-       DBG("type %d disable", type);
-
-       technology = technology_find(type);
-       if (technology == NULL) {
-               err = -ENXIO;
-               goto done;
-       }
-
-       if (technology->pending_reply != NULL) {
-               err = -EBUSY;
-               goto done;
-       }
-
-       if (msg != NULL) {
-               technology->pending_reply = dbus_message_ref(msg);
-               technology->enable_persistent = FALSE;
-               __connman_storage_save_technology(technology);
-       }
-
-       for (list = technology->device_list; list; list = list->next) {
-               struct connman_device *device = list->data;
-
-               err = __connman_device_disable_persistent(device);
-               if (err == 0)
-                       ret = 0;
-       }
-
-done:
-       if (ret == 0)
-               return ret;
-
-       if (msg != NULL) {
-               if (err == -EINPROGRESS)
-                       technology->pending_timeout = g_timeout_add_seconds(10,
-                                       technology_pending_reply, technology);
-               else {
-                       reply = __connman_error_failed(msg, -err);
-                       if (reply != NULL)
-                               g_dbus_send_message(connection, reply);
-               }
-       }
-
-       return err;
-}
-
 int __connman_technology_set_offlinemode(connman_bool_t offlinemode)
 {
        GSList *list;
        int err = -EINVAL;
 
+       if (global_offlinemode == offlinemode)
+               return 0;
+
        DBG("offlinemode %s", offlinemode ? "On" : "Off");
 
+       /*
+        * This is a bit tricky. When you set offlinemode, there is no
+        * way to differentiate between attempting offline mode and
+        * resuming offlinemode from last saved profile. We need that
+        * information in rfkill_update, otherwise it falls back on the
+        * technology's persistent state. Hence we set the offline mode here
+        * but save it & call the notifier only if its successful.
+        */
+
+       global_offlinemode = offlinemode;
+
        /* Traverse technology list, enable/disable each technology. */
        for (list = technology_list; list; list = list->next) {
                struct connman_technology *technology = list->data;
 
                if (offlinemode)
-                       err = __connman_technology_disable(technology->type, NULL);
+                       err = technology_disable(technology, NULL);
+
                if (!offlinemode && technology->enable_persistent)
-                       err = __connman_technology_enable(technology->type, NULL);
+                       err = technology_enable(technology, NULL);
        }
 
-       if (err == 0 || err == -EINPROGRESS) {
-               __connman_profile_set_offlinemode(offlinemode);
-               __connman_profile_save_default();
-
+       if (err == 0 || err == -EINPROGRESS || err == -EALREADY) {
+               connman_technology_save_offlinemode();
                __connman_notifier_offlinemode(offlinemode);
-       }
+       } else
+               global_offlinemode = connman_technology_load_offlinemode();
 
        return err;
 }
 
-static void technology_blocked(struct connman_technology *technology,
-                               connman_bool_t blocked)
+void __connman_technology_set_connected(enum connman_service_type type,
+               connman_bool_t connected)
 {
-       GSList *list;
+       struct connman_technology *technology;
 
-       for (list = technology->device_list; list; list = list->next) {
-               struct connman_device *device = list->data;
+       technology = technology_find(type);
+       if (technology == NULL)
+               return;
 
-               __connman_device_set_blocked(device, blocked);
-       }
+       DBG("technology %p connected %d", technology, connected);
+
+       technology->connected = connected;
+
+       connman_dbus_property_changed_basic(technology->path,
+                       CONNMAN_TECHNOLOGY_INTERFACE, "Connected",
+                       DBUS_TYPE_BOOLEAN, &connected);
 }
 
 int __connman_technology_add_rfkill(unsigned int index,
@@ -903,14 +1240,13 @@ int __connman_technology_add_rfkill(unsigned int index,
 {
        struct connman_technology *technology;
        struct connman_rfkill *rfkill;
-       connman_bool_t blocked;
 
        DBG("index %u type %d soft %u hard %u", index, type,
                                                        softblock, hardblock);
 
-       technology = technology_get(type);
-       if (technology == NULL)
-               return -ENXIO;
+       rfkill = g_hash_table_lookup(rfkill_list, &index);
+       if (rfkill != NULL)
+               goto done;
 
        rfkill = g_try_new0(struct connman_rfkill, 1);
        if (rfkill == NULL)
@@ -921,17 +1257,32 @@ int __connman_technology_add_rfkill(unsigned int index,
        rfkill->softblock = softblock;
        rfkill->hardblock = hardblock;
 
-       g_hash_table_replace(technology->rfkill_list, &rfkill->index, rfkill);
+       g_hash_table_insert(rfkill_list, &rfkill->index, rfkill);
 
-       blocked = (softblock || hardblock) ? TRUE : FALSE;
-       if (blocked == FALSE)
-               return 0;
+done:
+       technology = technology_get(type);
+       /* If there is no driver for this type, ignore it. */
+       if (technology == NULL)
+               return -ENXIO;
 
-       if (g_atomic_int_exchange_and_add(&technology->blocked, 1) == 0) {
-               technology_blocked(technology, TRUE);
+       if (hardblock) {
+               DBG("%s is switched off.", get_name(type));
+               return 0;
+       }
 
-               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-               state_changed(technology);
+       /*
+        * If Offline mode is on, we softblock the device if it isnt already.
+        * If Offline mode is off, we rely on the persistent state of tech.
+        */
+       if (global_offlinemode) {
+               if (!softblock)
+                       return __connman_rfkill_block(type, TRUE);
+       } else {
+               if (technology->enable_persistent && softblock)
+                       return __connman_rfkill_block(type, FALSE);
+               /* if technology persistent state is offline */
+               if (!technology->enable_persistent && !softblock)
+                       return __connman_rfkill_block(type, TRUE);
        }
 
        return 0;
@@ -944,45 +1295,35 @@ int __connman_technology_update_rfkill(unsigned int index,
 {
        struct connman_technology *technology;
        struct connman_rfkill *rfkill;
-       connman_bool_t blocked, old_blocked;
 
        DBG("index %u soft %u hard %u", index, softblock, hardblock);
 
-       technology = technology_find(type);
-       if (technology == NULL)
-               return -ENXIO;
-
-       rfkill = g_hash_table_lookup(technology->rfkill_list, &index);
+       rfkill = g_hash_table_lookup(rfkill_list, &index);
        if (rfkill == NULL)
                return -ENXIO;
 
-       old_blocked = (rfkill->softblock || rfkill->hardblock) ? TRUE : FALSE;
-       blocked = (softblock || hardblock) ? TRUE : FALSE;
+       if (rfkill->softblock == softblock &&
+               rfkill->hardblock == hardblock)
+               return 0;
 
        rfkill->softblock = softblock;
        rfkill->hardblock = hardblock;
 
-       if (blocked == old_blocked)
+       if (hardblock) {
+               DBG("%s is switched off.", get_name(type));
                return 0;
+       }
 
-       if (blocked) {
-               guint n_blocked;
-
-               n_blocked =
-                       g_atomic_int_exchange_and_add(&technology->blocked, 1);
-               if (n_blocked != g_hash_table_size(technology->rfkill_list) - 1)
-                       return 0;
-
-               technology_blocked(technology, blocked);
-               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-               state_changed(technology);
-       } else {
-               if (g_atomic_int_dec_and_test(&technology->blocked) == FALSE)
-                       return 0;
+       technology = technology_find(type);
+       /* If there is no driver for this type, ignore it. */
+       if (technology == NULL)
+               return -ENXIO;
 
-               technology_blocked(technology, blocked);
-               technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED;
-               state_changed(technology);
+       if (!global_offlinemode) {
+               if (technology->enable_persistent && softblock)
+                       return __connman_rfkill_block(type, FALSE);
+               if (!technology->enable_persistent && !softblock)
+                       return __connman_rfkill_block(type, TRUE);
        }
 
        return 0;
@@ -993,127 +1334,46 @@ int __connman_technology_remove_rfkill(unsigned int index,
 {
        struct connman_technology *technology;
        struct connman_rfkill *rfkill;
-       connman_bool_t blocked;
 
        DBG("index %u", index);
 
-       technology = technology_find(type);
-       if (technology == NULL)
-               return -ENXIO;
-
-       rfkill = g_hash_table_lookup(technology->rfkill_list, &index);
+       rfkill = g_hash_table_lookup(rfkill_list, &index);
        if (rfkill == NULL)
                return -ENXIO;
 
-       blocked = (rfkill->softblock || rfkill->hardblock) ? TRUE : FALSE;
-
-       g_hash_table_remove(technology->rfkill_list, &index);
-
-       if (blocked &&
-               g_atomic_int_dec_and_test(&technology->blocked) == TRUE) {
-               technology_blocked(technology, FALSE);
-               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-               state_changed(technology);
-       }
-
-       return 0;
-}
-
-connman_bool_t __connman_technology_get_blocked(enum connman_service_type type)
-{
-       struct connman_technology *technology;
+       g_hash_table_remove(rfkill_list, &index);
 
        technology = technology_find(type);
        if (technology == NULL)
-               return FALSE;
-
-       if (g_atomic_int_get(&technology->blocked))
-               return TRUE;
-
-       return FALSE;
-}
-
-static int technology_load(struct connman_technology *technology)
-{
-       const char *ident = __connman_profile_active_ident();
-       GKeyFile *keyfile;
-       gchar *identifier;
-       GError *error = NULL;
-       connman_bool_t enable;
-
-       DBG("technology %p", technology);
-
-       keyfile = __connman_storage_open_profile(ident);
-       if (keyfile == NULL)
-               return 0;
-
-       identifier = g_strdup_printf("%s", get_name(technology->type));
-       if (identifier == NULL)
-               goto done;
-
-       enable = g_key_file_get_boolean(keyfile, identifier, "Enable", &error);
-       if (error == NULL)
-               technology->enable_persistent = enable;
-       else
-               technology->enable_persistent = FALSE;
-
-       g_clear_error(&error);
-done:
-       g_free(identifier);
+               return -ENXIO;
 
-       __connman_storage_close_profile(ident, keyfile, FALSE);
+       technology_put(technology);
 
        return 0;
 }
 
-static int technology_save(struct connman_technology *technology)
+int __connman_technology_init(void)
 {
-       const char *ident = __connman_profile_active_ident();
-       GKeyFile *keyfile;
-       gchar *identifier;
-
-       DBG("technology %p", technology);
-
-       keyfile = __connman_storage_open_profile(ident);
-       if (keyfile == NULL)
-               return 0;
+       DBG("");
 
-       identifier = g_strdup_printf("%s", get_name(technology->type));
-       if (identifier == NULL)
-               goto done;
+       connection = connman_dbus_get_connection();
 
-       g_key_file_set_boolean(keyfile, identifier, "Enable",
-                               technology->enable_persistent);
+       rfkill_list = g_hash_table_new_full(g_int_hash, g_int_equal,
+                                                       NULL, free_rfkill);
 
-done:
-       g_free(identifier);
+       global_offlinemode = connman_technology_load_offlinemode();
 
-       __connman_storage_close_profile(ident, keyfile, TRUE);
+       /* This will create settings file if it is missing */
+       connman_technology_save_offlinemode();
 
        return 0;
 }
 
-static struct connman_storage tech_storage = {
-       .name           = "technology",
-       .priority       = CONNMAN_STORAGE_PRIORITY_LOW,
-       .tech_load      = technology_load,
-       .tech_save      = technology_save,
-};
-
-int __connman_technology_init(void)
-{
-       DBG("");
-
-       connection = connman_dbus_get_connection();
-
-       return connman_storage_register(&tech_storage);
-}
-
 void __connman_technology_cleanup(void)
 {
        DBG("");
 
-       dbus_connection_unref(connection);
+       g_hash_table_destroy(rfkill_list);
 
-       connman_storage_unregister(&tech_storage);
+       dbus_connection_unref(connection);
 }