Add setter/getter for handling MAC randomization policy
[platform/upstream/connman.git] / src / technology.c
index 6604599..c476b3e 100644 (file)
@@ -28,6 +28,7 @@
 #if defined TIZEN_EXT
 #include <stdio.h>
 #include <stdlib.h>
+#include <net/if.h>
 #endif
 
 #include <gdbus.h>
@@ -48,13 +49,16 @@ static GHashTable *rfkill_list;
 static bool global_offlinemode;
 
 #if defined TIZEN_EXT
-typedef enum {
-       CONNMAN_SCAN_TYPE_FULL_CHANNEL = 0x00,
-       CONNMAN_SCAN_TYPE_SPECIFIC_AP,
-       CONNMAN_SCAN_TYPE_MULTI_AP,
-} connman_scan_type_e;
+struct connman_scan_pending {
+       char *ifname;
+       connman_scan_type_e scan_type;
+       DBusMessage *msg;
+};
 
-static connman_scan_type_e g_scan_type = -1;
+struct connman_bssid_pending {
+       char *ifname;
+       unsigned char bssid[6];
+};
 #endif
 
 struct connman_rfkill {
@@ -80,7 +84,6 @@ struct connman_technology {
                                              */
        char *tethering_ident;
        char *tethering_passphrase;
-       bool tethering_hidden;
 
        bool enable_persistent; /* Save the tech state */
 
@@ -95,6 +98,12 @@ struct connman_technology {
        bool softblocked;
        bool hardblocked;
        bool dbus_registered;
+#if defined TIZEN_EXT
+       char **enabled_devices;
+       unsigned int mac_policy;
+       unsigned int preassoc_mac_policy;
+       unsigned int random_mac_lifetime;
+#endif
 #if defined TIZEN_EXT_WIFI_MESH
        DBusMessage *mesh_dbus_msg;
 #endif
@@ -118,7 +127,7 @@ 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. */
+       /* Calling _technology_add_rfkill will update the tech. */
        if (rfkill->type == type)
                __connman_technology_add_rfkill(rfkill->index, type,
                                rfkill->softblock, rfkill->hardblock);
@@ -202,9 +211,6 @@ static void technology_save(struct connman_technology *technology)
        g_key_file_set_boolean(keyfile, identifier, "Tethering",
                                technology->tethering_persistent);
 
-       g_key_file_set_boolean(keyfile, identifier, "Hidden",
-                               technology->tethering_hidden);
-
        if (technology->tethering_ident)
                g_key_file_set_string(keyfile, identifier,
                                        "Tethering.Identifier",
@@ -215,14 +221,25 @@ static void technology_save(struct connman_technology *technology)
                                        "Tethering.Passphrase",
                                        technology->tethering_passphrase);
 
+#ifdef TIZEN_EXT
+       if (technology->type == CONNMAN_SERVICE_TYPE_WIFI) {
+               g_key_file_set_uint64(keyfile, identifier, "MacPolicy",
+                                       technology->mac_policy);
+
+               g_key_file_set_uint64(keyfile, identifier, "PreassocMacPolicy",
+                                       technology->preassoc_mac_policy);
+
+               g_key_file_set_uint64(keyfile, identifier, "RandomMacLifetime",
+                                       technology->random_mac_lifetime);
+       }
+#endif /* TIZEN_EXT */
+
 done:
        g_free(identifier);
 
        __connman_storage_save_global(keyfile);
 
        g_key_file_free(keyfile);
-
-       return;
 }
 
 static void tethering_changed(struct connman_technology *technology)
@@ -278,7 +295,8 @@ static int set_tethering(struct connman_technology *technology,
        if (!bridge)
                return -EOPNOTSUPP;
 
-       if (technology->type == CONNMAN_SERVICE_TYPE_WIFI && (!ident))
+       if (technology->type == CONNMAN_SERVICE_TYPE_WIFI &&
+           (!ident || !passphrase))
                return -EINVAL;
 
        for (tech_drivers = technology->driver_list; tech_drivers;
@@ -371,6 +389,15 @@ static struct connman_technology *technology_find(enum connman_service_type type
        return NULL;
 }
 
+enum connman_service_type connman_technology_get_type
+                               (struct connman_technology *technology)
+{
+       if (!technology)
+               return CONNMAN_SERVICE_TYPE_UNKNOWN;
+
+       return technology->type;
+}
+
 bool connman_technology_get_wifi_tethering(const char **ssid,
                                                        const char **psk)
 {
@@ -394,6 +421,18 @@ bool connman_technology_get_wifi_tethering(const char **ssid,
        return true;
 }
 
+#if defined TIZEN_EXT
+const char *connman_techonology_get_path(enum connman_service_type type)
+{
+       struct connman_technology *technology = technology_find(type);
+
+       if (!technology)
+               return NULL;
+
+       return technology->path;
+}
+#endif
+
 static void free_rfkill(gpointer data)
 {
        struct connman_rfkill *rfkill = data;
@@ -425,6 +464,16 @@ static void technology_load(struct connman_technology *technology)
        if (!identifier)
                goto done;
 
+#ifdef TIZEN_EXT
+       gsize length;
+       technology->enabled_devices = g_key_file_get_string_list(keyfile,
+                       identifier, "Enable.Devices", &length, NULL);
+       if (technology->enabled_devices && length == 0) {
+               g_strfreev(technology->enabled_devices);
+               technology->enabled_devices = NULL;
+       }
+#endif
+
        enable = g_key_file_get_boolean(keyfile, identifier, "Enable", &error);
        if (!error)
                technology->enable_persistent = enable;
@@ -455,12 +504,38 @@ static void technology_load(struct connman_technology *technology)
 
        technology->tethering_passphrase = g_key_file_get_string(keyfile,
                                identifier, "Tethering.Passphrase", NULL);
+
+#ifdef TIZEN_EXT
+       if (technology->type == CONNMAN_SERVICE_TYPE_WIFI) {
+               unsigned int val = 0;
+
+               val = g_key_file_get_uint64(keyfile,
+                               identifier, "MacPolicy", NULL);
+               if (val <= 2)
+                       technology->mac_policy = val;
+               else
+                       technology->mac_policy = 0;
+
+               val = g_key_file_get_uint64(keyfile,
+                               identifier, "PreassocMacPolicy", NULL);
+               if (val <= 2)
+                       technology->preassoc_mac_policy = val;
+               else
+                       technology->preassoc_mac_policy = 0;
+
+               val = g_key_file_get_uint64(keyfile,
+                               identifier, "RandomMacLifetime", NULL);
+               if (val > 0)
+                       technology->random_mac_lifetime = val;
+               else
+                       technology->random_mac_lifetime = 60;
+       }
+#endif /* TIZEN_EXT */
+
 done:
        g_free(identifier);
 
        g_key_file_free(keyfile);
-
-       return;
 }
 
 bool __connman_technology_get_offlinemode(void)
@@ -498,8 +573,6 @@ static void connman_technology_save_offlinemode(void)
        }
 
        g_key_file_free(keyfile);
-
-       return;
 }
 
 static bool connman_technology_load_offlinemode(void)
@@ -525,6 +598,74 @@ static bool connman_technology_load_offlinemode(void)
        return offlinemode;
 }
 
+#if defined TIZEN_EXT
+static void append_devices(DBusMessageIter *iter, void *user_data)
+{
+       GSList *list;
+       dbus_bool_t val;
+       struct connman_technology *technology = user_data;
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               const char *str = connman_device_get_string(device, "Interface");
+               struct connman_network *network = connman_device_get_default_network(device);
+               struct connman_service *service = connman_service_lookup_from_network(network);
+
+               connman_dbus_dict_append_basic(iter, "Ifname",
+                               DBUS_TYPE_STRING, &str);
+
+               val = connman_device_get_powered(device);
+               connman_dbus_dict_append_basic(iter, "Powered",
+                               DBUS_TYPE_BOOLEAN, &val);
+
+               if (__connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV4) ||
+                               __connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV6))
+                       val = TRUE;
+               else
+                       val = FALSE;
+
+               connman_dbus_dict_append_basic(iter, "Connected",
+                               DBUS_TYPE_BOOLEAN, &val);
+
+               str = connman_device_get_string(device, "Address");
+               connman_dbus_dict_append_basic(iter, "MAC.Address",
+                               DBUS_TYPE_STRING, &str);
+       }
+}
+
+void __connman_technology_append_interfaces(DBusMessageIter *array,
+                               enum connman_service_type type, const char *ifname)
+{
+       GSList *list;
+       struct connman_technology *technology = NULL;
+
+       for (list = technology_list; list; list = list->next) {
+               struct connman_technology *local_tech = list->data;
+
+               if (local_tech->type != type)
+                       continue;
+
+               technology = local_tech;
+               break;
+       }
+
+       if (!technology)
+               return;
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               const char *str = connman_device_get_string(device, "Interface");
+
+               if (g_strcmp0(ifname, str) == 0)
+                       continue;
+
+               dbus_message_iter_append_basic(array,
+                               DBUS_TYPE_STRING, &str);
+       }
+}
+#endif
+
 static void append_properties(DBusMessageIter *iter,
                struct connman_technology *technology)
 {
@@ -570,11 +711,22 @@ static void append_properties(DBusMessageIter *iter,
                                        DBUS_TYPE_STRING,
                                        &technology->tethering_passphrase);
 
-       val = technology->tethering_hidden;
-       connman_dbus_dict_append_basic(&dict, "Hidden",
-                                       DBUS_TYPE_BOOLEAN,
-                                       &val);
+       connman_dbus_dict_append_basic(&dict, "MacPolicy",
+                                       DBUS_TYPE_UINT32,
+                                       &(technology->mac_policy));
 
+       connman_dbus_dict_append_basic(&dict, "PreassocMacPolicy",
+                                       DBUS_TYPE_UINT32,
+                                       &(technology->preassoc_mac_policy));
+
+       connman_dbus_dict_append_basic(&dict, "RandomMacLifetime",
+                                       DBUS_TYPE_UINT32,
+                                       &(technology->random_mac_lifetime));
+#if defined TIZEN_EXT
+       if (technology->type == CONNMAN_SERVICE_TYPE_WIFI)
+               connman_dbus_dict_append_dict(&dict, "Device.List",
+                                       append_devices, technology);
+#endif
        connman_dbus_dict_close(iter, &dict);
 }
 
@@ -649,7 +801,7 @@ static gboolean technology_pending_reply(gpointer user_data)
        struct connman_technology *technology = user_data;
        DBusMessage *reply;
 
-       /* Power request timedout, send ETIMEDOUT. */
+       /* Power request timed out, send ETIMEDOUT. */
        if (technology->pending_reply) {
                reply = __connman_error_failed(technology->pending_reply, ETIMEDOUT);
                if (reply)
@@ -825,6 +977,8 @@ static int technology_disable(struct connman_technology *technology)
 
        if (technology->type == CONNMAN_SERVICE_TYPE_P2P) {
                technology->enable_persistent = false;
+               __connman_device_stop_scan(CONNMAN_SERVICE_TYPE_P2P);
+               __connman_peer_disconnect_all();
                return technology_disabled(technology);
        } else if (technology->type == CONNMAN_SERVICE_TYPE_WIFI) {
                struct connman_technology *p2p;
@@ -893,25 +1047,52 @@ make_reply:
 }
 
 #if defined TIZEN_EXT
-int set_connman_bssid(enum bssid_type mode, char *bssid)
+int set_connman_bssid(enum bssid_type mode, char *bssid, const char *ifname)
 {
-       static unsigned char bssid_for_connect[6];
        static int bssid_len;
+       static const char *def_ifname = "default";
+       static GSList *bssid_list = NULL;
+       GSList *list;
+       const char *local_ifname = ifname;
+       bool found = false;
+       struct connman_bssid_pending *bssid_info;
+
+       DBG("mode: %d, ifname: %s", mode, ifname);
+
+       if (!ifname)
+               local_ifname = def_ifname;
 
-       DBG("mode : %d", mode);
+       for (list = bssid_list; list; list = list->next) {
+               bssid_info = list->data;
+
+               if (g_strcmp0(bssid_info->ifname, local_ifname) == 0) {
+                       found = true;
+                       break;
+               }
+       }
 
        if (mode == CHECK_BSSID) {
-               return bssid_len;
+               if (found)
+                       return 6;
+
+               return 0;
        }
 
        if (mode == GET_BSSID && bssid) {
-               memcpy(bssid, bssid_for_connect, 6);
-               return bssid_len;
+               if (found) {
+                       memcpy(bssid, bssid_info->bssid, 6);
+                       return 6;
+               }
+               return 0;
        }
 
        if (mode == RESET_BSSID) {
-               bssid_len = 0;
-               return bssid_len;
+               if (found) {
+                       bssid_list = g_slist_remove(bssid_list, bssid_info);
+                       g_free(bssid_info->ifname);
+                       g_free(bssid_info);
+               }
+               return 0;
        }
 
        if (mode != SET_BSSID || !bssid) {
@@ -919,20 +1100,224 @@ int set_connman_bssid(enum bssid_type mode, char *bssid)
                return 0;
        }
 
+       if (found) {
+               bssid_list = g_slist_remove(bssid_list, bssid_info);
+               g_free(bssid_info->ifname);
+               g_free(bssid_info);
+       }
+
+       bssid_info = g_try_malloc0(sizeof(struct connman_bssid_pending));
+       if (!bssid_info) {
+               DBG("Failed to allocate memory");
+               return 0;
+       }
+
+       unsigned char *bssid_data = bssid_info->bssid;
+
        bssid_len = sscanf(bssid, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
-               &bssid_for_connect[0], &bssid_for_connect[1], &bssid_for_connect[2],
-               &bssid_for_connect[3], &bssid_for_connect[4], &bssid_for_connect[5]);
+               &bssid_data[0], &bssid_data[1], &bssid_data[2],
+               &bssid_data[3], &bssid_data[4], &bssid_data[5]);
        if (bssid_len != 6) {
                DBG("Incorrect BSSID format. bssid_len = %d", bssid_len);
-               bssid_len = 0;
+               g_free(bssid_info);
+               return 0;
        }
 
-       DBG("SET BSSID len : %d, BSSID : %02x:%02x:%02x:%02x:%02x:%02x", bssid_len,
-               bssid_for_connect[0], bssid_for_connect[1], bssid_for_connect[2],
-               bssid_for_connect[3], bssid_for_connect[4], bssid_for_connect[5]);
+       DBG("SET BSSID len: %d, BSSID: %02x:%02x:%02x:%02x:%02x:%02x ifname: %s",
+               bssid_len,
+               bssid_data[0], bssid_data[1], bssid_data[2],
+               bssid_data[3], bssid_data[4], bssid_data[5],
+               ifname);
+
+       bssid_info->ifname = g_strdup(ifname);
+       bssid_list = g_slist_prepend(bssid_list, bssid_info);
 
        return bssid_len;
 }
+
+void connman_technology_mac_policy_notify(struct connman_technology *technology,
+                                                       unsigned int policy)
+{
+       DBG("Mac polict set to %u", policy);
+
+       technology->mac_policy = policy;
+       technology_save(technology);
+}
+
+void __connman_technology_notify_mac_policy_by_device(struct connman_device *device,
+                                               int result, unsigned int policy)
+{
+       struct connman_technology *technology;
+       enum connman_service_type type;
+
+       type = __connman_device_get_service_type(device);
+       technology = technology_find(type);
+
+       if (!technology)
+               return;
+
+       connman_technology_mac_policy_notify(technology, policy);
+}
+
+static DBusMessage *set_mac_policy(struct connman_technology *technology,
+                               DBusMessage *msg, unsigned int policy)
+{
+       DBusMessage *reply = NULL;
+       int err = 0;
+       unsigned int last_policy = technology->mac_policy;
+
+       if (technology->rfkill_driven && technology->hardblocked) {
+               err = -EACCES;
+               goto make_reply;
+       }
+
+       for (GSList *list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               err = connman_device_set_mac_policy(device, policy);
+               if (err < 0)
+                       break;
+       }
+
+make_reply:
+       if (err < 0) {
+               if (err != -EACCES && err != -EOPNOTSUPP) {
+                       for (GSList *list = technology->device_list; list; list = list->next) {
+                               struct connman_device *device = list->data;
+
+                               connman_device_set_mac_policy(device, last_policy);
+                       }
+               }
+
+               reply = __connman_error_failed(msg, -err);
+       } else {
+               reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+       }
+
+       return reply;
+}
+
+void connman_technology_preassoc_mac_policy_notify(struct connman_technology *technology,
+                                                       unsigned int policy)
+{
+       DBG("Preassoc mac polict set to %u", policy);
+
+       technology->preassoc_mac_policy = policy;
+       technology_save(technology);
+}
+
+void __connman_technology_notify_preassoc_mac_policy_by_device(struct connman_device *device,
+                                               int result, unsigned int policy)
+{
+       struct connman_technology *technology;
+       enum connman_service_type type;
+
+       type = __connman_device_get_service_type(device);
+       technology = technology_find(type);
+
+       if (!technology)
+               return;
+
+       connman_technology_preassoc_mac_policy_notify(technology, policy);
+}
+
+static DBusMessage *set_preassoc_mac_policy(struct connman_technology *technology,
+                               DBusMessage *msg, unsigned int policy)
+{
+       DBusMessage *reply = NULL;
+       int err = 0;
+       unsigned int last_policy = technology->preassoc_mac_policy;
+
+       if (technology->rfkill_driven && technology->hardblocked) {
+               err = -EACCES;
+               goto make_reply;
+       }
+
+       for (GSList *list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               err = connman_device_set_preassoc_mac_policy(device, policy);
+               if (err < 0)
+                       break;
+       }
+
+make_reply:
+       if (err < 0) {
+               if (err != -EACCES && err != -EOPNOTSUPP) {
+                       for (GSList *list = technology->device_list; list; list = list->next) {
+                               struct connman_device *device = list->data;
+
+                               connman_device_set_preassoc_mac_policy(device, last_policy);
+                       }
+               }
+
+               reply = __connman_error_failed(msg, -err);
+       } else {
+               reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+       }
+
+       return reply;
+}
+
+void connman_technology_random_mac_lifetime_notify(struct connman_technology *technology,
+                                                       unsigned int lifetime)
+{
+       DBG("Random mac lifetime set to %u", lifetime);
+
+       technology->random_mac_lifetime = lifetime;
+       technology_save(technology);
+}
+
+void __connman_technology_notify_random_mac_lifetime_by_device(struct connman_device *device,
+                                               int result, unsigned int lifetime)
+{
+       struct connman_technology *technology;
+       enum connman_service_type type;
+
+       type = __connman_device_get_service_type(device);
+       technology = technology_find(type);
+
+       if (!technology)
+               return;
+
+       connman_technology_random_mac_lifetime_notify(technology, lifetime);
+}
+
+static DBusMessage *set_random_mac_lifetime(struct connman_technology *technology,
+                               DBusMessage *msg, unsigned int lifetime)
+{
+       DBusMessage *reply = NULL;
+       int err = 0;
+       unsigned int last_lifetime = technology->random_mac_lifetime;
+
+       if (technology->rfkill_driven && technology->hardblocked) {
+               err = -EACCES;
+               goto make_reply;
+       }
+
+       for (GSList *list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               err = connman_device_set_random_mac_lifetime(device, lifetime);
+       }
+
+make_reply:
+       if (err < 0) {
+               if (err != -EACCES && err != -EOPNOTSUPP) {
+                       for (GSList *list = technology->device_list; list; list = list->next) {
+                               struct connman_device *device = list->data;
+
+                               connman_device_set_random_mac_lifetime(device, last_lifetime);
+                       }
+               }
+
+               reply = __connman_error_failed(msg, -err);
+       } else {
+               reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+       }
+
+       return reply;
+}
 #endif
 
 static DBusMessage *set_property(DBusConnection *conn,
@@ -963,21 +1348,6 @@ static DBusMessage *set_property(DBusConnection *conn,
 
        DBG("property %s", name);
 
-       if (technology->type == CONNMAN_SERVICE_TYPE_WIFI && technology->connected) {
-               uid_t uid;
-               if (connman_dbus_get_connection_unix_user_sync(conn,
-                                               dbus_message_get_sender(msg),
-                                               &uid) < 0) {
-                       DBG("Can not get unix user id!");
-                       return __connman_error_permission_denied(msg);
-               }
-
-               if (!__connman_service_is_user_allowed(CONNMAN_SERVICE_TYPE_WIFI, uid)) {
-                       DBG("Not allow this user to operate wifi technology now!");
-                       return __connman_error_permission_denied(msg);
-               }
-       }
-
        if (g_str_equal(name, "Tethering")) {
                dbus_bool_t tethering;
                int err;
@@ -1054,25 +1424,6 @@ static DBusMessage *set_property(DBusConnection *conn,
                                        DBUS_TYPE_STRING,
                                        &technology->tethering_passphrase);
                }
-       } else if (g_str_equal(name, "Hidden")) {
-               dbus_bool_t hidden;
-
-               if (type != DBUS_TYPE_BOOLEAN)
-                       return __connman_error_invalid_arguments(msg);
-
-               dbus_message_iter_get_basic(&value, &hidden);
-
-               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
-                       return __connman_error_not_supported(msg);
-
-               technology->tethering_hidden = hidden;
-               technology_save(technology);
-
-               connman_dbus_property_changed_basic(technology->path,
-                                       CONNMAN_TECHNOLOGY_INTERFACE,
-                                       "Hidden",
-                                       DBUS_TYPE_BOOLEAN,
-                                       &hidden);
        } else if (g_str_equal(name, "Powered")) {
                dbus_bool_t enable;
 
@@ -1091,7 +1442,54 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                dbus_message_iter_get_basic(&value, &key);
                DBG("BSSID %s", key);
-               set_connman_bssid(SET_BSSID, key);
+               set_connman_bssid(SET_BSSID, key, NULL);
+       } else if (g_str_equal(name, "MacPolicy")) {
+               dbus_uint32_t mac_policy;
+
+               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
+                       return __connman_error_not_supported(msg);
+
+               if (type != DBUS_TYPE_UINT32)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &mac_policy);
+
+               if (mac_policy <= 2)
+                       return set_mac_policy(technology, msg, mac_policy);
+               else
+                       return __connman_error_invalid_arguments(msg);
+
+       } else if (g_str_equal(name, "PreassocMacPolicy")) {
+               dbus_uint32_t preassoc_mac_policy;
+
+               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
+                       return __connman_error_not_supported(msg);
+
+               if (type != DBUS_TYPE_UINT32)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &preassoc_mac_policy);
+
+               if (preassoc_mac_policy <= 2)
+                       return set_preassoc_mac_policy(technology, msg, preassoc_mac_policy);
+               else
+                       return __connman_error_invalid_arguments(msg);
+
+       } else if (g_str_equal(name, "RandomMacLifetime")) {
+               dbus_uint32_t random_mac_lifetime;
+
+               if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
+                       return __connman_error_not_supported(msg);
+
+               if (type != DBUS_TYPE_UINT32)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &random_mac_lifetime);
+
+               if (random_mac_lifetime > 0)
+                       return set_random_mac_lifetime(technology, msg, random_mac_lifetime);
+               else
+                       return __connman_error_invalid_arguments(msg);
 #endif
        } else
                return __connman_error_invalid_property(msg);
@@ -1106,8 +1504,12 @@ static void reply_scan_pending(struct connman_technology *technology, int err)
        DBG("technology %p err %d", technology, err);
 
        while (technology->scan_pending) {
+#if defined TIZEN_EXT
+               struct connman_scan_pending *pending_data = technology->scan_pending->data;
+               DBusMessage *msg = pending_data->msg;
+#else
                DBusMessage *msg = technology->scan_pending->data;
-
+#endif
                DBG("reply to %s", dbus_message_get_sender(msg));
 
                if (err == 0)
@@ -1120,6 +1522,10 @@ static void reply_scan_pending(struct connman_technology *technology, int err)
                technology->scan_pending =
                        g_slist_delete_link(technology->scan_pending,
                                        technology->scan_pending);
+#if defined TIZEN_EXT
+               g_free(pending_data->ifname);
+               g_free(pending_data);
+#endif
        }
 }
 
@@ -1137,7 +1543,10 @@ dbus_bool_t __connman_technology_notify_scan_changed(const char *key, void *val)
                return result;
 
        dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_basic(&iter, key, DBUS_TYPE_BOOLEAN, val);
+       if (key)
+               connman_dbus_property_append_basic(&iter, key, DBUS_TYPE_BOOLEAN, val);
+       else
+               connman_dbus_property_append_basic(&iter, "", DBUS_TYPE_BOOLEAN, val);
 
        result = dbus_connection_send(connection, signal, NULL);
        dbus_message_unref(signal);
@@ -1146,6 +1555,102 @@ dbus_bool_t __connman_technology_notify_scan_changed(const char *key, void *val)
 
        return result;
 }
+
+void __connman_technology_notify_scan_done(const char *ifname, int val)
+{
+       DBG("");
+       DBusMessage *signal;
+       DBusMessageIter iter;
+
+       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+                       CONNMAN_MANAGER_INTERFACE, "ScanDone");
+       if (!signal)
+               return;
+
+       dbus_message_iter_init_append(signal, &iter);
+       if (ifname)
+               connman_dbus_property_append_basic(&iter, ifname,
+                               DBUS_TYPE_INT32, &val);
+       else
+               connman_dbus_property_append_basic(&iter, "",
+                               DBUS_TYPE_INT32, &val);
+
+       dbus_connection_send(connection, signal, NULL);
+       dbus_message_unref(signal);
+
+       DBG("Successfuly sent ScanDone signal");
+}
+
+static void reply_scan_pending_device(
+               struct connman_technology *technology, const char *ifname, int count)
+{
+       DBusMessage *reply;
+       GSList *list;
+       dbus_bool_t status = 0;
+       connman_scan_type_e scan_type = CONNMAN_SCAN_TYPE_UNKNOWN;
+
+       DBG("technology %p ifname %s count %d", technology, ifname, count);
+
+       list = technology->scan_pending;
+
+       while (list) {
+               struct connman_scan_pending *pending_data = list->data;
+               DBusMessage *msg = pending_data->msg;
+               list = list->next;
+
+               if (scan_type == CONNMAN_SCAN_TYPE_UNKNOWN)
+                       scan_type = pending_data->scan_type;
+
+               if (count != 0 && g_strcmp0(pending_data->ifname, ifname) != 0)
+                       continue;
+
+               scan_type = pending_data->scan_type;
+
+               DBG("reply to %s", dbus_message_get_sender(msg));
+               reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+
+               g_dbus_send_message(connection, reply);
+               dbus_message_unref(msg);
+
+               technology->scan_pending =
+                               g_slist_remove(technology->scan_pending, pending_data);
+
+               g_free(pending_data->ifname);
+               g_free(pending_data);
+       }
+
+       if (scan_type == CONNMAN_SCAN_TYPE_UNKNOWN)
+               scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
+
+       __connman_technology_notify_scan_changed(ifname, &status);
+       __connman_technology_notify_scan_done(ifname, scan_type);
+}
+
+static void __connman_technology_notify_device_detected(
+               struct connman_technology *technology, const char *ifname, bool val)
+{
+       DBG("");
+       DBusMessage *signal;
+       DBusMessageIter iter;
+       dbus_bool_t detected = val;
+
+       if (!ifname)
+               return;
+
+       signal = dbus_message_new_signal(technology->path,
+                       CONNMAN_TECHNOLOGY_INTERFACE, "DeviceDetected");
+       if (!signal)
+               return;
+
+       dbus_message_iter_init_append(signal, &iter);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &ifname);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &detected);
+
+       dbus_connection_send(connection, signal, NULL);
+       dbus_message_unref(signal);
+
+       DBG("Successfuly sent DeviceDetected signal");
+}
 #endif
 
 void __connman_technology_scan_started(struct connman_device *device)
@@ -1153,7 +1658,9 @@ void __connman_technology_scan_started(struct connman_device *device)
        DBG("device %p", device);
 #if defined TIZEN_EXT
        dbus_bool_t status = 1;
-       __connman_technology_notify_scan_changed("scan_started", &status);
+       const char *ifname = connman_device_get_string(device, "Interface");
+
+       __connman_technology_notify_scan_changed(ifname, &status);
 #endif
 }
 
@@ -1177,35 +1684,15 @@ void __connman_technology_scan_stopped(struct connman_device *device,
                if (device == other_device)
                        continue;
 
-               if (__connman_device_get_service_type(other_device) != type)
-                       continue;
-
-               if (connman_device_get_scanning(other_device))
+               if (connman_device_get_scanning(other_device, type))
                        count += 1;
        }
 
 #if defined TIZEN_EXT
-       if (count == 0) {
-               DBusMessage *signal;
-               DBusMessageIter iter;
-               dbus_bool_t status = 0;
-               __connman_technology_notify_scan_changed("scan_done", &status);
-
-               signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
-                               CONNMAN_MANAGER_INTERFACE, "ScanDone");
-               if (!signal)
-                       return;
-
-               dbus_message_iter_init_append(signal, &iter);
-               connman_dbus_property_append_basic(&iter, "Scantype",
-                               DBUS_TYPE_INT32, &g_scan_type);
-
-               dbus_connection_send(connection, signal, NULL);
-               dbus_message_unref(signal);
-               reply_scan_pending(technology, 0);
+       const char *ifname = connman_device_get_string(device, "Interface");
+       reply_scan_pending_device(technology, ifname, count);
 
-               DBG("Successfuly sent ScanDone signal");
-       }
+       return;
 #else
        if (count == 0)
                reply_scan_pending(technology, 0);
@@ -1260,33 +1747,86 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
                                !technology->enabled)
                return __connman_error_permission_denied(msg);
 
-       dbus_message_ref(msg);
 #if !defined TIZEN_EXT
+       dbus_message_ref(msg);
        technology->scan_pending =
                g_slist_prepend(technology->scan_pending, msg);
 #endif
 
-       err = __connman_device_request_scan(technology->type);
-#if defined TIZEN_EXT
+       err = __connman_device_request_scan_full(technology->type);
        if (err < 0)
+#if defined TIZEN_EXT
                return __connman_error_failed(msg, -err);
 #else
-       if (err < 0)
                reply_scan_pending(technology, err);
 #endif
 
-#if defined TIZEN_EXT
-       if (err == 0) {
-               g_scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
-               DBG("g_scan_type %d", g_scan_type);
+#if defined TIZEN_EXT
+       struct connman_scan_pending *pending_data =
+                       g_try_malloc0(sizeof(struct connman_scan_pending));
+       if (!pending_data)
+               return __connman_error_failed(msg, ENOMEM);
+
+       pending_data->scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
+       DBG("scan_type %d", pending_data->scan_type);
+
+       pending_data->msg = dbus_message_ref(msg);
+
+       technology->scan_pending =
+               g_slist_prepend(technology->scan_pending, pending_data);
+#endif
+       return NULL;
+}
+
+#if defined TIZEN_EXT
+static DBusMessage *scan_device(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+       struct connman_technology *technology = data;
+       DBusMessageIter iter;
+       const char *ifname;
+       int err;
+
+       DBG("technology %p request from %s", technology,
+                       dbus_message_get_sender(msg));
+
+       if (!dbus_message_iter_init(msg, &iter))
+               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, &ifname);
+       DBG("Interface name %s", ifname);
+
+       if (!ifname || strlen(ifname) == 0)
+               return __connman_error_invalid_arguments(msg);
+
+       err = connman_device_request_device_scan(technology->type, ifname, true);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       struct connman_scan_pending *pending_data =
+                       g_try_malloc0(sizeof(struct connman_scan_pending));
+       if (!pending_data)
+               return __connman_error_failed(msg, ENOMEM);
+
+       pending_data->ifname =  g_strdup(ifname);
+       if (pending_data->ifname == NULL) {
+               g_free(pending_data);
+               return __connman_error_failed(msg, ENOMEM);
        }
+
+       pending_data->scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
+       DBG("scan_type %d", pending_data->scan_type);
+
+       pending_data->msg = dbus_message_ref(msg);
+
        technology->scan_pending =
-               g_slist_prepend(technology->scan_pending, msg);
-#endif
+               g_slist_prepend(technology->scan_pending, pending_data);
+
        return NULL;
 }
 
-#if defined TIZEN_EXT
 static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *data)
 {
        struct connman_technology *technology = data;
@@ -1294,6 +1834,7 @@ static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *
        int scan_type = 0;
        const char *name = NULL;
        const char *freq = NULL;
+       const char *ifname = NULL;
        DBusMessageIter iter, dict;
        int err;
 
@@ -1328,7 +1869,11 @@ static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *
 
                dbus_message_iter_recurse(&entry, &value2);
                type = dbus_message_iter_get_arg_type(&value2);
-               if (g_str_equal(key, "SSID")) {
+               if (g_str_equal(key, "Ifname") && type == DBUS_TYPE_STRING) {
+
+                       dbus_message_iter_get_basic(&value2, &ifname);
+                       DBG("ifname %s", ifname);
+               } else if (g_str_equal(key, "SSID")) {
                        if (type != DBUS_TYPE_STRING) {
                                g_slist_free_full(specific_scan_list, g_free);
                                return __connman_error_invalid_arguments(msg);
@@ -1357,7 +1902,8 @@ static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *
                        scan_type = CONNMAN_MULTI_SCAN_SSID_FREQ; /* SSID & Frequency mixed scan */
                        dbus_message_iter_get_basic(&value2, &name);
 
-                       connman_multi_scan_ap_s *ap = (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
+                       connman_multi_scan_ap_s *ap =
+                                       (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
                        if (ap) {
                                g_strlcpy(ap->str, name, strlen(name) + 1);
                                ap->flag = true;
@@ -1374,7 +1920,8 @@ static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *
                        scan_type = CONNMAN_MULTI_SCAN_SSID_FREQ; /* SSID & Frequency mixed scan */
                        dbus_message_iter_get_basic(&value2, &freq);
 
-                       connman_multi_scan_ap_s *ap = (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
+                       connman_multi_scan_ap_s *ap =
+                                       (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
                        if (ap) {
                                g_strlcpy(ap->str, freq, strlen(freq) + 1);
                                ap->flag = false;
@@ -1385,31 +1932,78 @@ static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *
                dbus_message_iter_next(&dict);
        }
 
-       dbus_message_ref(msg);
-
-       err = __connman_device_request_specific_scan(technology->type, scan_type, specific_scan_list);
+       err = __connman_device_request_specific_scan(technology->type, ifname, scan_type, specific_scan_list);
        if (err < 0)
                return __connman_error_failed(msg, -err);
 
-       if (err == 0) {
-               guint list_size = g_slist_length(specific_scan_list);
-               if (list_size == 1)
-                       g_scan_type = CONNMAN_SCAN_TYPE_SPECIFIC_AP;
-               else
-                       g_scan_type = CONNMAN_SCAN_TYPE_MULTI_AP;
-               DBG("list_size %u g_scan_type %d", list_size, g_scan_type);
-       }
-       technology->scan_pending =
-               g_slist_prepend(technology->scan_pending, msg);
+       guint list_size = g_slist_length(specific_scan_list);
 
        if (scan_type == CONNMAN_MULTI_SCAN_SSID ||
-                       scan_type == CONNMAN_MULTI_SCAN_SSID_FREQ) {
+                       scan_type == CONNMAN_MULTI_SCAN_SSID_FREQ)
                g_slist_free_full(specific_scan_list, g_free);
-               scan_type = 0;
+
+       struct connman_scan_pending *pending_data =
+                       g_try_malloc0(sizeof(struct connman_scan_pending));
+       if (!pending_data)
+               return __connman_error_failed(msg, ENOMEM);
+
+       if (ifname) {
+               pending_data->ifname =  g_strdup(ifname);
+               if (pending_data->ifname == NULL) {
+                       g_free(pending_data);
+                       return __connman_error_failed(msg, ENOMEM);
+               }
        }
+
+       if (list_size == 1)
+               pending_data->scan_type = CONNMAN_SCAN_TYPE_SPECIFIC_AP;
+       else
+               pending_data->scan_type = CONNMAN_SCAN_TYPE_MULTI_AP;
+       DBG("list_size %u scan_type %d", list_size, pending_data->scan_type);
+
+       pending_data->msg = dbus_message_ref(msg);
+
+       technology->scan_pending =
+               g_slist_prepend(technology->scan_pending, pending_data);
+
        return NULL;
 }
 
+static DBusMessage *get_5ghz_supported(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       DBusMessageIter iter, dict;
+       GSList *list;
+       struct connman_technology *technology = data;
+       dbus_bool_t supported = false;
+       const char *ifname = NULL;
+
+       DBG("technology %p", technology);
+
+       reply = dbus_message_new_method_return(msg);
+       if (!reply)
+               return NULL;
+
+       dbus_message_iter_init_append(reply, &iter);
+       connman_dbus_dict_open(&iter, &dict);
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               supported = connman_device_get_wifi_5ghz_supported(device);
+               ifname = connman_device_get_string(device, "Interface");
+
+               DBG("ifname %s supported : %d", ifname, supported);
+               connman_dbus_dict_append_basic(&dict, ifname,
+                                               DBUS_TYPE_BOOLEAN,
+                                               &supported);
+       }
+
+       connman_dbus_dict_close(&iter, &dict);
+
+       return reply;
+}
+
 static DBusMessage *get_scan_state(DBusConnection *conn, DBusMessage *msg, void *data)
 {
        DBusMessage *reply;
@@ -1417,32 +2011,280 @@ static DBusMessage *get_scan_state(DBusConnection *conn, DBusMessage *msg, void
        GSList *list;
        struct connman_technology *technology = data;
        dbus_bool_t scanning = false;
+       const char *ifname = NULL;
 
        DBG("technology %p", technology);
 
+       reply = dbus_message_new_method_return(msg);
+       if (!reply)
+               return NULL;
+
+       dbus_message_iter_init_append(reply, &iter);
+       connman_dbus_dict_open(&iter, &dict);
+
        for (list = technology->device_list; list; list = list->next) {
                struct connman_device *device = list->data;
-               scanning = connman_device_get_scanning(device);
-               if(scanning)
-                       break;
+
+               scanning = connman_device_get_scanning(device, technology->type);
+               ifname = connman_device_get_string(device, "Interface");
+
+               DBG("ifname %s scanning : %d", ifname, scanning);
+               connman_dbus_dict_append_basic(&dict, ifname,
+                                               DBUS_TYPE_BOOLEAN,
+                                               &scanning);
        }
 
-       DBG("scanning : %d", scanning);
+       connman_dbus_dict_close(&iter, &dict);
+
+       return reply;
+}
+
+static DBusMessage *get_max_scan_ssid(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       DBusMessageIter iter, dict;
+       GSList *list;
+       struct connman_technology *technology = data;
+       dbus_int32_t max_scan_ssids = 0;
+       const char *ifname = NULL;
+
+       DBG("technology %p", technology);
+
        reply = dbus_message_new_method_return(msg);
        if (!reply)
                return NULL;
 
        dbus_message_iter_init_append(reply, &iter);
-
        connman_dbus_dict_open(&iter, &dict);
-       connman_dbus_dict_append_basic(&dict, "Scanstate",
-                                       DBUS_TYPE_BOOLEAN,
-                                       &scanning);
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+
+               max_scan_ssids = connman_device_get_max_scan_ssids(device);
+               ifname = connman_device_get_string(device, "Interface");
+
+               DBG("ifname %s max_scan_ssids : %d", ifname, max_scan_ssids);
+               connman_dbus_dict_append_basic(&dict, ifname,
+                               DBUS_TYPE_INT32,
+                               &max_scan_ssids);
+       }
 
        connman_dbus_dict_close(&iter, &dict);
 
        return reply;
 }
+
+static int technology_enable_device(struct connman_technology *technology,
+                               bool enable_device, const char *ifname, struct connman_device **device_out)
+{
+       int err = 0;
+       GSList *list;
+
+       for (list = technology->device_list; list; list = list->next) {
+               struct connman_device *device = list->data;
+               const char *str = connman_device_get_string(device, "Interface");
+
+               if (g_strcmp0(str, ifname) != 0)
+                       continue;
+
+               if (enable_device)
+                       err = __connman_device_enable(device);
+               else
+                       err = __connman_device_disable(device);
+
+               *device_out = device;
+               return err;
+       }
+
+       return -ENXIO;
+}
+
+static DBusMessage *technology_set_device_powered(struct connman_technology *technology,
+                               DBusMessage *msg, bool powered, const char *ifname)
+{
+       DBusMessage *reply = NULL;
+       struct connman_device *device = NULL;
+       int err = 0;
+
+       err = technology_enable_device(technology, powered, ifname, &device);
+
+       if (err == -EINPROGRESS) {
+               if (device)
+                       connman_device_set_pending_reply(device, msg);
+               return reply;
+       } else if (err == -EALREADY) {
+               if (powered)
+                       reply = __connman_error_already_enabled(msg);
+               else
+                       reply = __connman_error_already_disabled(msg);
+       } else if (err < 0)
+               reply = __connman_error_failed(msg, -err);
+       else
+               reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+static DBusMessage *set_device_power(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       struct connman_technology *technology = data;
+       DBusMessageIter iter;
+       const char *name;
+       int len;
+       dbus_bool_t enable;
+
+       DBG("conn %p", conn);
+
+       if (!dbus_message_iter_init(msg, &iter))
+               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_BOOLEAN)
+               return __connman_error_invalid_arguments(msg);
+
+       DBG("interface name %s", name);
+
+       len = strlen(name);
+
+       if (len + 1 > IFNAMSIZ)
+               return __connman_error_invalid_arguments(msg);
+
+       dbus_message_iter_get_basic(&iter, &enable);
+       DBG("powered %s", enable ? "TRUE" : "FALSE");
+
+       return technology_set_device_powered(technology, msg, enable, name);
+}
+
+static DBusMessage *set_bssid(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessageIter iter;
+       char *name, *bssid;
+       int len;
+
+       DBG("conn %p", conn);
+
+       if (!dbus_message_iter_init(msg, &iter))
+               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_STRING)
+               return __connman_error_invalid_arguments(msg);
+
+       dbus_message_iter_get_basic(&iter, &bssid);
+
+       DBG("interface name %s bssid %s", name, bssid);
+
+       len = strlen(name);
+
+       if (len + 1 > IFNAMSIZ)
+               return __connman_error_invalid_arguments(msg);
+
+       set_connman_bssid(SET_BSSID, bssid, name);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+static struct connman_technology *technology_get(enum connman_service_type type);
+
+void technology_save_device(struct connman_device *device)
+{
+       struct connman_technology *technology;
+       enum connman_service_type type;
+
+       type = __connman_device_get_service_type(device);
+       technology = technology_get(type);
+       if (!technology)
+               return;
+
+       GKeyFile *keyfile;
+       gchar *identifier;
+       const char *name = get_name(technology->type);
+
+       DBG("technology %p type %d name %s", technology, technology->type,
+                                                                       name);
+       if (!name)
+               return;
+
+       keyfile = __connman_storage_load_global();
+       if (!keyfile)
+               keyfile = g_key_file_new();
+
+       identifier = g_strdup_printf("%s", name);
+       if (!identifier)
+               goto done;
+
+       GSList *list = NULL;
+       gchar **ifname_list = NULL;
+       guint dev_count = g_slist_length(technology->device_list);
+
+       if (dev_count > 1) {
+               GString *ifname_str = g_string_new(NULL);
+
+               if (ifname_str) {
+                       for (list = technology->device_list; list; list = list->next) {
+                               struct connman_device *device = list->data;
+
+                               if (connman_device_get_powered(device)) {
+                                       const char *ifname = connman_device_get_string(device, "Interface");
+
+                                       if (ifname_str->len > 0)
+                                               g_string_append_printf(ifname_str, " %s", ifname);
+                                       else
+                                               g_string_append(ifname_str, ifname);
+                               }
+                       }
+
+                       if (ifname_str->len > 0) {
+                               ifname_list = g_strsplit_set(ifname_str->str, " ", 0);
+                               dev_count = g_strv_length(ifname_list);
+                               g_key_file_set_string_list(keyfile, identifier, "Enable.Devices",
+                                                               (const gchar **) ifname_list, dev_count);
+
+                               technology->enable_persistent = true;
+                       } else {
+                               g_key_file_remove_key(keyfile, identifier, "Enable.Devices", NULL);
+                               technology->enable_persistent = false;
+                       }
+
+                       g_strfreev(ifname_list);
+                       g_string_free(ifname_str, TRUE);
+               }
+       }
+
+       g_key_file_set_boolean(keyfile, identifier, "Enable",
+                               technology->enable_persistent);
+
+       g_key_file_set_boolean(keyfile, identifier, "Tethering",
+                               technology->tethering_persistent);
+
+       if (technology->tethering_ident)
+               g_key_file_set_string(keyfile, identifier,
+                                       "Tethering.Identifier",
+                                       technology->tethering_ident);
+
+       if (technology->tethering_passphrase)
+               g_key_file_set_string(keyfile, identifier,
+                                       "Tethering.Passphrase",
+                                       technology->tethering_passphrase);
+
+done:
+       g_free(identifier);
+
+       __connman_storage_save_global(keyfile);
+
+       g_key_file_free(keyfile);
+}
 #endif
 
 #if defined TIZEN_EXT_WIFI_MESH
@@ -1837,9 +2679,15 @@ static DBusMessage *mesh_commands(DBusConnection *conn,
                DBG("MeshID %s Frequency %d sender %s", name, freq,
                                                dbus_message_get_sender(msg));
 
-               dbus_message_ref(msg);
+               struct connman_scan_pending *pending_data =
+                               g_try_malloc0(sizeof(struct connman_scan_pending));
+               if (!pending_data)
+                       return __connman_error_failed(msg, ENOMEM);
+
+               pending_data->msg = dbus_message_ref(msg);
+
                technology->scan_pending =
-                       g_slist_prepend(technology->scan_pending, msg);
+                       g_slist_prepend(technology->scan_pending, pending_data);
 
                err = __connman_device_request_mesh_specific_scan(technology->type,
                                                                  name, freq);
@@ -1919,10 +2767,22 @@ static const GDBusMethodTable technology_methods[] = {
                        NULL, set_property) },
        { GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
 #if defined TIZEN_EXT
+       { GDBUS_ASYNC_METHOD("ScanDevice", GDBUS_ARGS({ "interface_name", "s" }),
+                       NULL, scan_device) },
        { GDBUS_ASYNC_METHOD("SpecificScan", GDBUS_ARGS({ "specificscan", "a{sv}" }),
                        NULL, specific_scan) },
        { GDBUS_METHOD("GetScanState", NULL, GDBUS_ARGS({ "scan_state", "a{sv}" }),
                        get_scan_state) },
+       { GDBUS_METHOD("Get5GhzSupported", NULL, GDBUS_ARGS({ "supported", "a{sv}" }),
+                       get_5ghz_supported) },
+       { GDBUS_METHOD("GetMaxScanSsid", NULL, GDBUS_ARGS({ "maxscanssid", "a{sv}" }),
+                       get_max_scan_ssid) },
+       { GDBUS_ASYNC_METHOD("SetDevicePower",
+                       GDBUS_ARGS({ "ifname", "s" }, { "value", "b" }),
+                       NULL, set_device_power) },
+       { GDBUS_ASYNC_METHOD("SetBSSID",
+                       GDBUS_ARGS({ "ifname", "s" }, { "bssid", "s" }),
+                       NULL, set_bssid) },
 #endif
 #if defined TIZEN_EXT_WIFI_MESH
        { GDBUS_ASYNC_METHOD("MeshCommands",
@@ -1935,16 +2795,12 @@ static const GDBusMethodTable technology_methods[] = {
 static const GDBusSignalTable technology_signals[] = {
        { GDBUS_SIGNAL("PropertyChanged",
                        GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
-       { GDBUS_SIGNAL("DhcpConnected",
-                       GDBUS_ARGS({ "aptype", "s" },
-                               { "ipaddr", "s" },
-                               { "macaddr", "s" },
-                               { "hostname", "s" })) },
-       { GDBUS_SIGNAL("DhcpLeaseDeleted",
-                       GDBUS_ARGS({ "aptype", "s" },
-                               { "ipaddr", "s" },
-                               { "macaddr", "s" },
-                               { "hostname", "s" })) },
+#if defined TIZEN_EXT
+       { GDBUS_SIGNAL("DeviceChanged",
+                       GDBUS_ARGS({ "device_property", "a{sv}" })) },
+       { GDBUS_SIGNAL("DeviceDetected",
+                       GDBUS_ARGS({ "ifname", "s" }, { "detected", "b" })) },
+#endif
        { },
 };
 
@@ -2015,7 +2871,9 @@ static void technology_put(struct connman_technology *technology)
         g_source_remove(technology->pending_timeout);
         technology->pending_timeout = 0;
     }
-
+#ifdef TIZEN_EXT
+    g_strfreev(technology->enabled_devices);
+#endif
        g_free(technology->path);
        g_free(technology->regdom);
        g_free(technology->tethering_ident);
@@ -2071,7 +2929,6 @@ static struct connman_technology *technology_get(enum connman_service_type type)
 
        technology->refcount = 1;
        technology->type = type;
-       technology->tethering_hidden = FALSE;
        technology->path = g_strdup_printf("%s/technology/%s",
                                                        CONNMAN_PATH, str);
 
@@ -2348,10 +3205,31 @@ int __connman_technology_add_device(struct connman_device *device)
 
        if (technology->enable_persistent &&
                                        !global_offlinemode) {
+#if defined TIZEN_EXT
+               bool found = true;
+               int err = 0;
+               if (technology->enabled_devices) {
+                       int i = 0;
+                       found = false;
+                       const char *ifname = connman_device_get_string(device, "Interface");
+
+                       while (technology->enabled_devices[i]) {
+                               if (g_strcmp0(technology->enabled_devices[i], ifname) == 0) {
+                                       found = true;
+                                       break;
+                               }
+                               i++;
+                       }
+               }
+
+               if (found)
+                       err = __connman_device_enable(device);
+#else
                int err = __connman_device_enable(device);
+#endif
                /*
                 * connman_technology_add_device() calls __connman_device_enable()
-                * but since the device is already enabled, the calls does not
+                * but since the device is already enabled, the call does not
                 * propagate through to connman_technology_enabled via
                 * connman_device_set_powered.
                 */
@@ -2366,6 +3244,14 @@ done:
        technology->device_list = g_slist_prepend(technology->device_list,
                                                                device);
 
+#if defined TIZEN_EXT
+       const char *ifname = connman_device_get_string(device, "Interface");
+       __connman_technology_notify_device_detected(technology, ifname, true);
+
+       connman_device_set_mac_policy(device, technology->mac_policy);
+       connman_device_set_preassoc_mac_policy(device, technology->preassoc_mac_policy);
+       connman_device_set_random_mac_lifetime(device, technology->random_mac_lifetime);
+#endif
        return 0;
 }
 
@@ -2388,6 +3274,11 @@ int __connman_technology_remove_device(struct connman_device *device)
        technology->device_list = g_slist_remove(technology->device_list,
                                                                device);
 
+#if defined TIZEN_EXT
+       const char *ifname = connman_device_get_string(device, "Interface");
+       __connman_technology_notify_device_detected(technology, ifname, false);
+#endif
+
        if (technology->tethering)
                set_tethering(technology, false);
 
@@ -2407,6 +3298,7 @@ int __connman_technology_enabled(enum connman_service_type type)
        DBG("technology %p type %s rfkill %d enabled %d", technology,
                get_name(type), technology->rfkill_driven,
                technology->enabled);
+
 #if !defined TIZEN_EXT
        if (technology->rfkill_driven) {
                if (technology->tethering_persistent)
@@ -2426,9 +3318,11 @@ int __connman_technology_disabled(enum connman_service_type type)
        technology = technology_find(type);
        if (!technology)
                return -ENXIO;
+
 #if !defined TIZEN_EXT
        if (technology->rfkill_driven)
                return 0;
+
 #endif
        for (list = technology->device_list; list; list = list->next) {
                struct connman_device *device = list->data;
@@ -2456,7 +3350,7 @@ int __connman_technology_set_offlinemode(bool offlinemode)
         * 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.
+        * but save it & call the notifier only if it is successful.
         */
 
        global_offlinemode = offlinemode;
@@ -2639,6 +3533,7 @@ done:
                                softblock, hardblock, true))
                return 0;
 #endif
+
        if (global_offlinemode)
                return 0;