Merge tag 'upstream/1.40' into tizen.
[platform/upstream/connman.git] / plugins / wifi.c
old mode 100644 (file)
new mode 100755 (executable)
index e701451..bcb9344
 
 #define ASSOC_STATUS_AUTH_TIMEOUT 16
 #define ASSOC_STATUS_NO_CLIENT 17
+#if defined TIZEN_EXT
+#define LOAD_SHAPING_MAX_RETRIES 7
+#else
 #define LOAD_SHAPING_MAX_RETRIES 3
+#endif
+
+#if defined TIZEN_EXT
+#define WIFI_EAP_FAST_PAC_FILE         "/var/lib/wifi/wifi.pac"        /* path of Pac file for EAP-FAST */
+
+       /* Wi-Fi Signal Strength (for 2.4G (dB))
+        * Excellent :     ~ -63
+        * Good      : -64 ~ -74
+        * Weak      : -75 ~ -82
+        * Very weak : -83 ~ -88
+        * No signal : -89 ~
+        *
+        * Wi-Fi Signal Strength (for 5G (dB))
+        * Excellent :     ~ -67
+        * Good      : -68 ~ -76
+        * Weak      : -77 ~ -82
+        * Very weak : -83 ~ -88
+        * No signal : -89 ~
+        */
+#define RSSI_LEVEL_2_5G  -77
+#define RSSI_LEVEL_2_24G -75
+#define RSSI_LEVEL_3_5G  -68
+#define RSSI_LEVEL_3_24G -64
+#define WIFI_BSSID_STR_LEN 18
+#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
+#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
+#define ROAM_SCAN_INTERVAL 60 /* 60 seconds */
+#endif
 
 static struct connman_technology *wifi_technology = NULL;
 static struct connman_technology *p2p_technology = NULL;
@@ -162,8 +193,22 @@ struct wifi_data {
        bool p2p_connecting;
        bool p2p_device;
        int servicing;
+#if defined TIZEN_EXT
+       int assoc_retry_count;
+       struct connman_network *scan_pending_network;
+       bool allow_full_scan;
+       unsigned int automaxspeed_timeout;
+       GSupplicantScanParams *hidden_scan_params;
+       unsigned int mac_policy;
+       unsigned int preassoc_mac_policy;
+       unsigned int mac_lifetime;
+#endif
        int disconnect_code;
        int assoc_code;
+#if defined TIZEN_EXT_WIFI_MESH
+       bool mesh_interface;
+       struct wifi_mesh_info *mesh_info;
+#endif
 };
 
 struct disconnect_data {
@@ -171,6 +216,19 @@ struct disconnect_data {
        struct connman_network *network;
 };
 
+#if defined TIZEN_EXT
+#include "connman.h"
+#include "dbus.h"
+
+#define TIZEN_ASSOC_RETRY_COUNT                4
+
+static gboolean wifi_first_scan = false;
+static gboolean found_with_first_scan = false;
+static gboolean is_wifi_notifier_registered = false;
+static GHashTable *failed_bssids = NULL;
+static unsigned char buff_bssid[WIFI_BSSID_LEN_MAX] = { 0, };
+#endif
+
 static GList *iface_list = NULL;
 
 static GList *pending_wifi_device = NULL;
@@ -182,6 +240,123 @@ static int tech_set_tethering(struct connman_technology *technology,
                                const char *identifier, const char *passphrase,
                                const char *bridge, bool enabled);
 
+#if defined TIZEN_EXT
+#define NETCONFIG_SERVICE "net.netconfig"
+#define NETCONFIG_WIFI_PATH "/net/netconfig/wifi"
+#define NETCONFIG_WIFI_INTERFACE NETCONFIG_SERVICE ".wifi"
+
+struct enc_method_call_data {
+       DBusConnection *connection;
+       struct connman_network *network;
+};
+
+static struct enc_method_call_data encrypt_request_data;
+
+static void encryption_request_reply(DBusPendingCall *call,
+                                               void *user_data)
+{
+       DBusMessage *reply;
+       DBusError error;
+       DBusMessageIter args;
+       char *out_data;
+       struct connman_service *service;
+       gchar* encrypted_value = NULL;
+       struct connman_network *network = encrypt_request_data.network;
+
+       DBG("");
+
+       reply = dbus_pending_call_steal_reply(call);
+
+       dbus_error_init(&error);
+       if (dbus_set_error_from_message(&error, reply)) {
+               DBG("send_encryption_request() %s %s", error.name, error.message);
+               dbus_error_free(&error);
+               goto done;
+       }
+
+       if (dbus_message_iter_init(reply, &args) == FALSE)
+               goto done;
+
+       dbus_message_iter_get_basic(&args, &out_data);
+
+       encrypted_value = g_strdup((const gchar *)out_data);
+       service = connman_service_lookup_from_network(network);
+
+       if (!service) {
+               DBG("encryption result: no service");
+               goto done;
+       }
+
+       if (connman_service_get_favorite(service)) {
+               __connman_service_set_passphrase(service, encrypted_value);
+               __connman_service_save(service);
+       } else
+               connman_network_set_string(network, "WiFi.Passphrase",
+                                                       encrypted_value);
+
+       DBG("encryption result: succeeded");
+
+done:
+       dbus_message_unref(reply);
+       dbus_pending_call_unref(call);
+       dbus_connection_unref(encrypt_request_data.connection);
+       g_free(encrypted_value);
+
+       encrypt_request_data.connection = NULL;
+       encrypt_request_data.network = NULL;
+}
+
+static int send_encryption_request(const char *passphrase,
+                               struct connman_network *network)
+{
+       DBusConnection *connection = NULL;
+       DBusMessage *msg = NULL;
+       DBusPendingCall *call;
+
+       if (!passphrase) {
+               DBG("Invalid parameter");
+               return -EINVAL;
+       }
+
+       connection = connman_dbus_get_connection();
+       if (!connection) {
+               DBG("dbus connection does not exist");
+               return -EINVAL;
+       }
+
+       msg = dbus_message_new_method_call(NETCONFIG_SERVICE, NETCONFIG_WIFI_PATH,
+                       NETCONFIG_WIFI_INTERFACE, "EncryptPassphrase");
+       if (!msg) {
+               dbus_connection_unref(connection);
+               return -EINVAL;
+       }
+
+       dbus_message_append_args(msg, DBUS_TYPE_STRING, &passphrase,
+                                                       DBUS_TYPE_INVALID);
+
+       if (!dbus_connection_send_with_reply(connection, msg,
+                               &call, DBUS_TIMEOUT_USE_DEFAULT)) {
+               dbus_message_unref(msg);
+               dbus_connection_unref(connection);
+               return -EIO;
+       }
+
+       if (!call) {
+               dbus_message_unref(msg);
+               dbus_connection_unref(connection);
+               return -EIO;
+       }
+
+       encrypt_request_data.connection = connection;
+       encrypt_request_data.network = network;
+
+       dbus_pending_call_set_notify(call, encryption_request_reply, NULL, NULL);
+       dbus_message_unref(msg);
+
+       return 0;
+}
+#endif
+
 static int p2p_tech_probe(struct connman_technology *technology)
 {
        p2p_technology = technology;
@@ -223,1671 +398,2984 @@ static void add_pending_wifi_device(struct wifi_data *wifi)
        pending_wifi_device = g_list_append(pending_wifi_device, wifi);
 }
 
-static struct wifi_data *get_pending_wifi_data(const char *ifname)
-{
-       GList *list;
-
-       for (list = pending_wifi_device; list; list = list->next) {
-               struct wifi_data *wifi;
-               const char *dev_name;
-
-               wifi = list->data;
-               if (!wifi || !wifi->device)
-                       continue;
+#if defined TIZEN_EXT_WIFI_MESH
+struct wifi_mesh_info {
+       struct wifi_data *wifi;
+       GSupplicantInterface *interface;
+       struct connman_mesh *mesh;
+       char *parent_ifname;
+       char *ifname;
+       char *identifier;
+       int index;
+};
 
-               dev_name = connman_device_get_string(wifi->device, "Interface");
-               if (!g_strcmp0(ifname, dev_name)) {
-                       pending_wifi_device = g_list_delete_link(
-                                               pending_wifi_device, list);
-                       return wifi;
-               }
-       }
+struct mesh_change_peer_status_info {
+       char *peer_address;
+       enum connman_mesh_peer_status peer_status;
+       mesh_change_peer_status_cb_t callback;
+       void *user_data;
+};
 
-       return NULL;
-}
+static struct connman_technology_driver mesh_tech_driver = {
+       .name = "mesh",
+       .type = CONNMAN_SERVICE_TYPE_MESH,
+};
 
-static void remove_pending_wifi_device(struct wifi_data *wifi)
+static void mesh_interface_create_callback(int result,
+                                          GSupplicantInterface *interface,
+                                          void *user_data)
 {
-       GList *link;
-
-       link = g_list_find(pending_wifi_device, wifi);
+       struct wifi_mesh_info *mesh_info = user_data;
+       struct wifi_data *wifi;
+       bool success = false;
 
-       if (!link)
-               return;
+       DBG("result %d ifname %s, mesh_info %p", result,
+                               g_supplicant_interface_get_ifname(interface),
+                               mesh_info);
 
-       pending_wifi_device = g_list_delete_link(pending_wifi_device, link);
-}
+       if (result < 0 || !mesh_info)
+               goto done;
 
-static void peer_cancel_timeout(struct wifi_data *wifi)
-{
-       if (wifi->p2p_connection_timeout > 0)
-               g_source_remove(wifi->p2p_connection_timeout);
+       wifi = mesh_info->wifi;
 
-       wifi->p2p_connection_timeout = 0;
-       wifi->p2p_connecting = false;
+       mesh_info->interface = interface;
+       mesh_info->identifier = connman_inet_ifaddr(mesh_info->ifname);
+       mesh_info->index = connman_inet_ifindex(mesh_info->ifname);
+       DBG("Mesh Interface identifier %s", mesh_info->identifier);
+       wifi->mesh_interface = true;
+       wifi->mesh_info = mesh_info;
+       g_supplicant_interface_set_data(interface, wifi);
+       success = true;
 
-       if (wifi->pending_peer) {
-               connman_peer_unref(wifi->pending_peer);
-               wifi->pending_peer = NULL;
-       }
+done:
+       connman_mesh_notify_interface_create(success);
 }
 
-static gboolean peer_connect_timeout(gpointer data)
+static int add_mesh_interface(const char *ifname, const char *parent_ifname)
 {
-       struct wifi_data *wifi = data;
+       GList *list;
+       struct wifi_data *wifi;
+       struct wifi_mesh_info *mesh_info;
+       const char *wifi_ifname;
+       bool parent_found = false;
+       const char *driver = "nl80211";
 
-       DBG("");
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
 
-       if (wifi->p2p_connecting) {
-               enum connman_peer_state state = CONNMAN_PEER_STATE_FAILURE;
-               GSupplicantPeer *gs_peer =
-                       g_supplicant_interface_peer_lookup(wifi->interface,
-                               connman_peer_get_identifier(wifi->pending_peer));
+               if (!g_supplicant_interface_has_mesh(wifi->interface))
+                       continue;
 
-               if (g_supplicant_peer_has_requested_connection(gs_peer))
-                       state = CONNMAN_PEER_STATE_IDLE;
+               wifi_ifname = g_supplicant_interface_get_ifname(wifi->interface);
+               if (!wifi_ifname)
+                       continue;
 
-               connman_peer_set_state(wifi->pending_peer, state);
+               if (!g_strcmp0(wifi_ifname, parent_ifname)) {
+                       parent_found = true;
+                       break;
+               }
        }
 
-       peer_cancel_timeout(wifi);
+       if (!parent_found) {
+               DBG("Parent interface %s doesn't exist", parent_ifname);
+               return -ENODEV;
+       }
 
-       return FALSE;
+       mesh_info = g_try_malloc0(sizeof(struct wifi_mesh_info));
+       if (!mesh_info)
+               return -ENOMEM;
+
+       mesh_info->wifi = wifi;
+       mesh_info->ifname = g_strdup(ifname);
+       mesh_info->parent_ifname = g_strdup(parent_ifname);
+
+       g_supplicant_mesh_interface_create(ifname, driver, NULL, parent_ifname,
+                                               mesh_interface_create_callback, mesh_info);
+       return -EINPROGRESS;
 }
 
-static void peer_connect_callback(int result, GSupplicantInterface *interface,
+static void mesh_interface_remove_callback(int result,
+                                       GSupplicantInterface *interface,
                                                        void *user_data)
 {
        struct wifi_data *wifi = user_data;
-       struct connman_peer *peer = wifi->pending_peer;
+       struct wifi_mesh_info *mesh_info = wifi->mesh_info;
+       bool success = false;
 
-       DBG("peer %p - %d", peer, result);
-
-       if (!peer)
-               return;
+       DBG("result %d mesh_info %p", result, mesh_info);
 
-       if (result < 0) {
-               peer_connect_timeout(wifi);
-               return;
-       }
+       if (result < 0 || !mesh_info)
+               goto done;
 
-       connman_peer_set_state(peer, CONNMAN_PEER_STATE_ASSOCIATION);
+       mesh_info->interface = NULL;
+       g_free(mesh_info->parent_ifname);
+       g_free(mesh_info->ifname);
+       g_free(mesh_info->identifier);
+       g_free(mesh_info);
+       wifi->mesh_interface = false;
+       wifi->mesh_info = NULL;
+       success = true;
 
-       wifi->p2p_connection_timeout = g_timeout_add_seconds(
-                                               P2P_CONNECTION_TIMEOUT,
-                                               peer_connect_timeout, wifi);
+done:
+       connman_mesh_notify_interface_remove(success);
 }
 
-static int peer_connect(struct connman_peer *peer,
-                       enum connman_peer_wps_method wps_method,
-                       const char *wps_pin)
+static int remove_mesh_interface(const char *ifname)
 {
-       struct connman_device *device = connman_peer_get_device(peer);
-       GSupplicantPeerParams *peer_params;
-       GSupplicantPeer *gs_peer;
+       GList *list;
        struct wifi_data *wifi;
-       bool pbc, pin;
+       struct wifi_mesh_info *mesh_info;
+       bool mesh_if_found = false;
        int ret;
 
-       DBG("peer %p", peer);
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
 
-       if (!device)
-               return -ENODEV;
+               if (wifi->mesh_interface) {
+                       mesh_if_found = true;
+                       break;
+               }
+       }
 
-       wifi = connman_device_get_data(device);
-       if (!wifi || !wifi->interface)
+       if (!mesh_if_found) {
+               DBG("Mesh interface %s doesn't exist", ifname);
                return -ENODEV;
-
-       if (wifi->p2p_connecting)
-               return -EBUSY;
-
-       gs_peer = g_supplicant_interface_peer_lookup(wifi->interface,
-                                       connman_peer_get_identifier(peer));
-       if (!gs_peer)
-               return -EINVAL;
-
-       pbc = g_supplicant_peer_is_wps_pbc(gs_peer);
-       pin = g_supplicant_peer_is_wps_pin(gs_peer);
-
-       switch (wps_method) {
-       case CONNMAN_PEER_WPS_UNKNOWN:
-               if ((pbc && pin) || pin)
-                       return -ENOKEY;
-               break;
-       case CONNMAN_PEER_WPS_PBC:
-               if (!pbc)
-                       return -EINVAL;
-               wps_pin = NULL;
-               break;
-       case CONNMAN_PEER_WPS_PIN:
-               if (!pin || !wps_pin)
-                       return -EINVAL;
-               break;
        }
 
-       peer_params = g_try_malloc0(sizeof(GSupplicantPeerParams));
-       if (!peer_params)
-               return -ENOMEM;
-
-       peer_params->path = g_strdup(g_supplicant_peer_get_path(gs_peer));
-       if (wps_pin)
-               peer_params->wps_pin = g_strdup(wps_pin);
+       mesh_info = wifi->mesh_info;
+       ret = g_supplicant_interface_remove(mesh_info->interface,
+                                               mesh_interface_remove_callback, wifi);
+       if (ret < 0)
+               return ret;
 
-       peer_params->master = connman_peer_service_is_master();
+       return -EINPROGRESS;
+}
 
-       ret = g_supplicant_interface_p2p_connect(wifi->interface, peer_params,
-                                               peer_connect_callback, wifi);
-       if (ret == -EINPROGRESS) {
-               wifi->pending_peer = connman_peer_ref(peer);
-               wifi->p2p_connecting = true;
-       } else if (ret < 0) {
-               g_free(peer_params->path);
-               g_free(peer_params->wps_pin);
-               g_free(peer_params);
-       }
+static void mesh_disconnect_callback(int result,
+                                       GSupplicantInterface *interface, void *user_data)
+{
+       struct connman_mesh *mesh = user_data;
 
-       return ret;
+       DBG("result %d interface %p mesh %p", result, interface, mesh);
 }
 
-static int peer_disconnect(struct connman_peer *peer)
+static int mesh_peer_disconnect(struct connman_mesh *mesh)
 {
-       struct connman_device *device = connman_peer_get_device(peer);
-       GSupplicantPeerParams peer_params = {};
-       GSupplicantPeer *gs_peer;
+       GList *list;
        struct wifi_data *wifi;
-       int ret;
+       struct wifi_mesh_info *mesh_info;
+       bool mesh_if_found = false;
+       GSupplicantInterface *interface;
 
-       DBG("peer %p", peer);
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
 
-       if (!device)
-               return -ENODEV;
+               if (wifi->mesh_interface) {
+                       mesh_if_found = true;
+                       break;
+               }
+       }
 
-       wifi = connman_device_get_data(device);
-       if (!wifi)
+       if (!mesh_if_found) {
+               DBG("Mesh interface is not created");
                return -ENODEV;
+       }
 
-       gs_peer = g_supplicant_interface_peer_lookup(wifi->interface,
-                                       connman_peer_get_identifier(peer));
-       if (!gs_peer)
-               return -EINVAL;
-
-       peer_params.path = g_strdup(g_supplicant_peer_get_path(gs_peer));
+       mesh_info = wifi->mesh_info;
 
-       ret = g_supplicant_interface_p2p_disconnect(wifi->interface,
-                                                       &peer_params);
-       g_free(peer_params.path);
+       interface = mesh_info->interface;
+       return g_supplicant_interface_disconnect(interface,
+                                               mesh_disconnect_callback, mesh);
+}
 
-       if (ret == -EINPROGRESS) {
-               peer_cancel_timeout(wifi);
-               wifi->p2p_device = false;
-       }
+static void mesh_connect_callback(int result, GSupplicantInterface *interface,
+                                                                 void *user_data)
+{
+       struct connman_mesh *mesh = user_data;
+       DBG("mesh %p result %d", mesh, result);
 
-       return ret;
+       if (result < 0)
+               connman_mesh_peer_set_state(mesh, CONNMAN_MESH_STATE_FAILURE);
+       else
+               connman_mesh_peer_set_state(mesh, CONNMAN_MESH_STATE_ASSOCIATION);
 }
 
-struct peer_service_registration {
-       peer_service_registration_cb_t callback;
-       void *user_data;
-};
-
-static bool is_service_wfd(const unsigned char *specs, int length)
+static GSupplicantSecurity mesh_network_security(const char *security)
 {
-       if (length < 9 || specs[0] != 0 || specs[1] != 0 || specs[2] != 6)
-               return false;
+       if (g_str_equal(security, "none"))
+               return G_SUPPLICANT_SECURITY_NONE;
+       else if (g_str_equal(security, "sae"))
+               return G_SUPPLICANT_SECURITY_SAE;
 
-       return true;
+       return G_SUPPLICANT_SECURITY_UNKNOWN;
 }
 
-static void apply_p2p_listen_on_iface(gpointer data, gpointer user_data)
+static void mesh_ssid_init(GSupplicantSSID *ssid, struct connman_mesh *mesh)
 {
-       struct wifi_data *wifi = data;
-
-       if (!wifi->interface ||
-                       !g_supplicant_interface_has_p2p(wifi->interface))
-               return;
-
-       if (!wifi->servicing) {
-               g_supplicant_interface_p2p_listen(wifi->interface,
-                               P2P_LISTEN_PERIOD, P2P_LISTEN_INTERVAL);
-       }
+       const char *name;
+       const char *security;
 
-       wifi->servicing++;
-}
+       if (ssid->ssid)
+               g_free(ssid->ssid);
 
-static void register_wfd_service_cb(int result,
-                               GSupplicantInterface *iface, void *user_data)
-{
-       struct peer_service_registration *reg_data = user_data;
+       memset(ssid, 0, sizeof(*ssid));
+       ssid->mode = G_SUPPLICANT_MODE_MESH;
 
-       DBG("");
+       security = connman_mesh_get_security(mesh);
+       ssid->security = mesh_network_security(security);
 
-       if (result == 0)
-               g_list_foreach(iface_list, apply_p2p_listen_on_iface, NULL);
+       if (ssid->security == G_SUPPLICANT_SECURITY_SAE)
+               ssid->passphrase = connman_mesh_get_passphrase(mesh);
 
-       if (reg_data && reg_data->callback) {
-               reg_data->callback(result, reg_data->user_data);
-               g_free(reg_data);
+       ssid->freq = connman_mesh_get_frequency(mesh);
+       name = connman_mesh_get_name(mesh);
+       if (name) {
+               ssid->ssid_len = strlen(name);
+               ssid->ssid = g_malloc0(ssid->ssid_len + 1);
+               memcpy(ssid->ssid, name, ssid->ssid_len);
+               ssid->scan_ssid = 1;
        }
 }
 
-static GSupplicantP2PServiceParams *fill_in_peer_service_params(
-                               const unsigned char *spec,
-                               int spec_length, const unsigned char *query,
-                               int query_length, int version)
+static int mesh_peer_connect(struct connman_mesh *mesh)
 {
-       GSupplicantP2PServiceParams *params;
+       GList *list;
+       struct wifi_data *wifi;
+       struct wifi_mesh_info *mesh_info;
+       bool mesh_if_found = false;
+       GSupplicantInterface *interface;
+       GSupplicantSSID *ssid;
 
-       params = g_try_malloc0(sizeof(GSupplicantP2PServiceParams));
-       if (!params)
-               return NULL;
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
 
-       if (version > 0) {
-               params->version = version;
-               if (spec_length > 0) {
-                       params->service = g_malloc(spec_length);
-                       memcpy(params->service, spec, spec_length);
+               if (wifi->mesh_interface) {
+                       mesh_if_found = true;
+                       break;
                }
-       } else if (query_length > 0 && spec_length > 0) {
-               params->query = g_malloc(query_length);
-               memcpy(params->query, query, query_length);
-               params->query_length = query_length;
+       }
 
-               params->response = g_malloc(spec_length);
-               memcpy(params->response, spec, spec_length);
-               params->response_length = spec_length;
-       } else {
-               if (spec_length > 0) {
-                       params->wfd_ies = g_malloc(spec_length);
-                       memcpy(params->wfd_ies, spec, spec_length);
-               }
-               params->wfd_ies_length = spec_length;
+       if (!mesh_if_found) {
+               DBG("Mesh interface is not created");
+               return -ENODEV;
        }
 
-       return params;
+       mesh_info = wifi->mesh_info;
+
+       interface = mesh_info->interface;
+
+       ssid = g_try_malloc0(sizeof(GSupplicantSSID));
+       if (!ssid)
+               return -ENOMEM;
+
+       mesh_info->mesh = mesh;
+
+       mesh_ssid_init(ssid, mesh);
+       return g_supplicant_interface_connect(interface, ssid,
+                                               mesh_connect_callback, mesh);
 }
 
-static void free_peer_service_params(GSupplicantP2PServiceParams *params)
+static void mesh_peer_change_status_callback(int result,
+                                            GSupplicantInterface *interface,
+                                            void *user_data)
 {
-       if (!params)
-               return;
+       struct mesh_change_peer_status_info *data = user_data;
 
-       g_free(params->service);
-       g_free(params->query);
-       g_free(params->response);
-       g_free(params->wfd_ies);
+       DBG("result %d Peer Status %d", result, data->peer_status);
 
-       g_free(params);
+       if (result == 0 && data->peer_status == CONNMAN_MESH_PEER_REMOVE) {
+               /* WLAN_REASON_MESH_PEERING_CANCELLED = 52 */
+               connman_mesh_remove_connected_peer(data->peer_address, 52);
+       }
+
+       if (data->callback)
+               data->callback(result, data->user_data);
+
+       g_free(data->peer_address);
+       g_free(data);
+       return;
 }
 
-static int peer_register_wfd_service(const unsigned char *specification,
-                               int specification_length,
-                               peer_service_registration_cb_t callback,
-                               void *user_data)
+static int mesh_change_peer_status(const char *peer_address,
+                                  enum connman_mesh_peer_status status,
+                                  mesh_change_peer_status_cb_t callback, void *user_data)
 {
-       struct peer_service_registration *reg_data = NULL;
-       static GSupplicantP2PServiceParams *params;
-       int ret;
-
-       DBG("");
+       GList *list;
+       struct wifi_data *wifi;
+       struct wifi_mesh_info *mesh_info;
+       bool mesh_if_found = false;
+       GSupplicantInterface *interface;
+       struct mesh_change_peer_status_info *data;
+       const char *method;
 
-       if (wfd_service_registered)
-               return -EBUSY;
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
 
-       params = fill_in_peer_service_params(specification,
-                                       specification_length, NULL, 0, 0);
-       if (!params)
-               return -ENOMEM;
+               if (wifi->mesh_interface) {
+                       mesh_if_found = true;
+                       break;
+               }
+       }
 
-       reg_data = g_try_malloc0(sizeof(*reg_data));
-       if (!reg_data) {
-               ret = -ENOMEM;
-               goto error;
+       if (!mesh_if_found) {
+               DBG("Mesh interface is not created");
+               return -ENODEV;
        }
 
-       reg_data->callback = callback;
-       reg_data->user_data = user_data;
+       mesh_info = wifi->mesh_info;
 
-       ret = g_supplicant_set_widi_ies(params,
-                                       register_wfd_service_cb, reg_data);
-       if (ret < 0 && ret != -EINPROGRESS)
-               goto error;
+       interface = mesh_info->interface;
 
-       wfd_service_registered = true;
+       switch (status) {
+       case CONNMAN_MESH_PEER_ADD:
+               method = "MeshPeerAdd";
+               break;
+       case CONNMAN_MESH_PEER_REMOVE:
+               method = "MeshPeerRemove";
+               break;
+       default:
+               DBG("Invalid method");
+               return -EINVAL;
+       }
 
-       return ret;
-error:
-       free_peer_service_params(params);
-       g_free(reg_data);
+       data = g_try_malloc0(sizeof(struct mesh_change_peer_status_info));
+       if (data == NULL) {
+               DBG("Memory allocation failed");
+               return -ENOMEM;
+       }
 
-       return ret;
+       data->peer_address = g_strdup(peer_address);
+       data->peer_status = status;
+       data->callback = callback;
+       data->user_data = user_data;
+
+       return g_supplicant_interface_mesh_peer_change_status(interface,
+                                               mesh_peer_change_status_callback, peer_address, method,
+                                               data);
 }
 
-static void register_peer_service_cb(int result,
-                               GSupplicantInterface *iface, void *user_data)
-{
-       struct wifi_data *wifi = g_supplicant_interface_get_data(iface);
-       struct peer_service_registration *reg_data = user_data;
+static struct connman_mesh_driver mesh_driver = {
+       .add_interface      = add_mesh_interface,
+       .remove_interface   = remove_mesh_interface,
+       .connect            = mesh_peer_connect,
+       .disconnect         = mesh_peer_disconnect,
+       .change_peer_status = mesh_change_peer_status,
+};
 
+static void mesh_support(GSupplicantInterface *interface)
+{
        DBG("");
 
-       if (result == 0)
-               apply_p2p_listen_on_iface(wifi, NULL);
+       if (!g_supplicant_interface_has_mesh(interface))
+               return;
 
-       if (reg_data->callback)
-               reg_data->callback(result, reg_data->user_data);
+       if (connman_technology_driver_register(&mesh_tech_driver) < 0) {
+               DBG("Could not register Mesh technology driver");
+               return;
+       }
 
-       g_free(reg_data);
+       connman_mesh_driver_register(&mesh_driver);
 }
 
-static int peer_register_service(const unsigned char *specification,
-                               int specification_length,
-                               const unsigned char *query,
-                               int query_length, int version,
-                               peer_service_registration_cb_t callback,
-                               void *user_data)
+static void check_mesh_technology(void)
 {
-       struct peer_service_registration *reg_data;
-       GSupplicantP2PServiceParams *params;
-       bool found = false;
-       int ret, ret_f;
+       bool mesh_exists = false;
        GList *list;
 
-       DBG("");
+       for (list = iface_list; list; list = list->next) {
+               struct wifi_data *w = list->data;
 
-       if (specification && !version && !query &&
-                       is_service_wfd(specification, specification_length)) {
-               return peer_register_wfd_service(specification,
-                               specification_length, callback, user_data);
+               if (w->interface &&
+                               g_supplicant_interface_has_mesh(w->interface))
+                       mesh_exists = true;
        }
 
-       reg_data = g_try_malloc0(sizeof(*reg_data));
-       if (!reg_data)
-               return -ENOMEM;
-
-       reg_data->callback = callback;
-       reg_data->user_data = user_data;
-
-       ret_f = -EOPNOTSUPP;
+       if (!mesh_exists) {
+               connman_technology_driver_unregister(&mesh_tech_driver);
+               connman_mesh_driver_unregister(&mesh_driver);
+       }
+}
 
-       for (list = iface_list; list; list = list->next) {
-               struct wifi_data *wifi = list->data;
-               GSupplicantInterface *iface = wifi->interface;
+static void mesh_group_started(GSupplicantInterface *interface)
+{
+       struct wifi_data *wifi;
+       struct wifi_mesh_info *mesh_info;
+       struct connman_mesh *mesh;
+       const unsigned char *ssid;
+       unsigned int ssid_len;
+       char name[33];
 
-               if (!g_supplicant_interface_has_p2p(iface))
-                       continue;
+       ssid = g_supplicant_interface_get_mesh_group_ssid(interface, &ssid_len);
+       memcpy(name, ssid, ssid_len);
+       name[ssid_len] = '\0';
+       DBG("name %s", name);
+       wifi = g_supplicant_interface_get_data(interface);
+       DBG("wifi %p", wifi);
 
-               params = fill_in_peer_service_params(specification,
-                                               specification_length, query,
-                                               query_length, version);
-               if (!params)
-                       continue;
+       if (!wifi)
+               return;
 
-               if (!found) {
-                       ret_f = g_supplicant_interface_p2p_add_service(iface,
-                               register_peer_service_cb, params, reg_data);
-                       if (ret_f == 0 || ret_f == -EINPROGRESS)
-                               found = true;
-                       ret = ret_f;
-               } else
-                       ret = g_supplicant_interface_p2p_add_service(iface,
-                               register_peer_service_cb, params, NULL);
-               if (ret != 0 && ret != -EINPROGRESS)
-                       free_peer_service_params(params);
-       }
+       mesh_info = wifi->mesh_info;
+       if (!mesh_info)
+               return;
 
-       if (ret_f != 0 && ret_f != -EINPROGRESS)
-               g_free(reg_data);
+       mesh = mesh_info->mesh;
+       if (!mesh)
+               return;
 
-       return ret_f;
+       connman_mesh_peer_set_state(mesh, CONNMAN_MESH_STATE_CONFIGURATION);
 }
 
-static int peer_unregister_wfd_service(void)
+static void mesh_group_removed(GSupplicantInterface *interface)
 {
-       GSupplicantP2PServiceParams *params;
-       GList *list;
-
-       if (!wfd_service_registered)
-               return -EALREADY;
+       struct wifi_data *wifi;
+       struct wifi_mesh_info *mesh_info;
+       struct connman_mesh *mesh;
+       const unsigned char *ssid;
+       unsigned int ssid_len;
+       int disconnect_reason;
+       char name[33];
 
-       params = fill_in_peer_service_params(NULL, 0, NULL, 0, 0);
-       if (!params)
-               return -ENOMEM;
+       ssid = g_supplicant_interface_get_mesh_group_ssid(interface, &ssid_len);
+       memcpy(name, ssid, ssid_len);
+       name[ssid_len] = '\0';
+       DBG("name %s", name);
 
-       wfd_service_registered = false;
+       disconnect_reason = g_supplicant_mesh_get_disconnect_reason(interface);
+       DBG("Disconnect Reason %d", disconnect_reason);
 
-       g_supplicant_set_widi_ies(params, NULL, NULL);
+       wifi = g_supplicant_interface_get_data(interface);
+       DBG("wifi %p", wifi);
 
-       for (list = iface_list; list; list = list->next) {
-               struct wifi_data *wifi = list->data;
+       if (!wifi)
+               return;
 
-               if (!g_supplicant_interface_has_p2p(wifi->interface))
-                       continue;
+       mesh_info = wifi->mesh_info;
+       if (!mesh_info)
+               return;
 
-               wifi->servicing--;
-               if (!wifi->servicing || wifi->servicing < 0) {
-                       g_supplicant_interface_p2p_listen(wifi->interface,
-                                                                       0, 0);
-                       wifi->servicing = 0;
+       mesh = connman_get_connected_mesh_from_name(name);
+       if (!mesh) {
+               DBG("%s is not connected", name);
+               mesh = connman_get_connecting_mesh_from_name(name);
+               if (!mesh) {
+                       DBG("%s is not connecting", name);
+                       return;
                }
        }
 
-       return 0;
+       connman_mesh_peer_set_disconnect_reason(mesh, disconnect_reason);
+       connman_mesh_peer_set_state(mesh, CONNMAN_MESH_STATE_DISCONNECT);
 }
 
-static int peer_unregister_service(const unsigned char *specification,
-                                               int specification_length,
-                                               const unsigned char *query,
-                                               int query_length, int version)
+static void mesh_peer_connected(GSupplicantMeshPeer *mesh_peer)
 {
-       GSupplicantP2PServiceParams *params;
-       bool wfd = false;
-       GList *list;
-       int ret;
+       const char *peer_address;
 
-       if (specification && !version && !query &&
-                       is_service_wfd(specification, specification_length)) {
-               ret = peer_unregister_wfd_service();
-               if (ret != 0 && ret != -EINPROGRESS)
-                       return ret;
-               wfd = true;
-       }
-
-       for (list = iface_list; list; list = list->next) {
-               struct wifi_data *wifi = list->data;
-               GSupplicantInterface *iface = wifi->interface;
-
-               if (wfd)
-                       goto stop_listening;
-
-               if (!g_supplicant_interface_has_p2p(iface))
-                       continue;
-
-               params = fill_in_peer_service_params(specification,
-                                               specification_length, query,
-                                               query_length, version);
-               if (!params)
-                       continue;
+       peer_address = g_supplicant_mesh_peer_get_address(mesh_peer);
 
-               ret = g_supplicant_interface_p2p_del_service(iface, params);
-               if (ret != 0 && ret != -EINPROGRESS)
-                       free_peer_service_params(params);
-stop_listening:
-               wifi->servicing--;
-               if (!wifi->servicing || wifi->servicing < 0) {
-                       g_supplicant_interface_p2p_listen(iface, 0, 0);
-                       wifi->servicing = 0;
-               }
-       }
+       if (!peer_address)
+               return;
 
-       return 0;
+       DBG("Peer %s connected", peer_address);
+       connman_mesh_add_connected_peer(peer_address);
 }
 
-static struct connman_peer_driver peer_driver = {
-       .connect    = peer_connect,
-       .disconnect = peer_disconnect,
-       .register_service = peer_register_service,
-       .unregister_service = peer_unregister_service,
-};
-
-static void handle_tethering(struct wifi_data *wifi)
+static void mesh_peer_disconnected(GSupplicantMeshPeer *mesh_peer)
 {
-       if (!wifi->tethering)
-               return;
+       const char *peer_address;
+       int reason;
 
-       if (!wifi->bridge)
-               return;
+       peer_address = g_supplicant_mesh_peer_get_address(mesh_peer);
 
-       if (wifi->bridged)
+       if (!peer_address)
                return;
 
-       DBG("index %d bridge %s", wifi->index, wifi->bridge);
-
-       if (connman_inet_add_to_bridge(wifi->index, wifi->bridge) < 0)
-               return;
+       reason = g_supplicant_mesh_peer_get_disconnect_reason(mesh_peer);
 
-       wifi->bridged = true;
+       DBG("Peer %s disconnected with reason %d", peer_address, reason);
+       connman_mesh_remove_connected_peer(peer_address, reason);
 }
+#endif
 
-static void wifi_newlink(unsigned flags, unsigned change, void *user_data)
+static struct wifi_data *get_pending_wifi_data(const char *ifname)
 {
-       struct connman_device *device = user_data;
-       struct wifi_data *wifi = connman_device_get_data(device);
-
-       if (!wifi)
-               return;
+       GList *list;
 
-       DBG("index %d flags %d change %d", wifi->index, flags, change);
+       for (list = pending_wifi_device; list; list = list->next) {
+               struct wifi_data *wifi;
+               const char *dev_name;
 
-       if ((wifi->flags & IFF_UP) != (flags & IFF_UP)) {
-               if (flags & IFF_UP)
-                       DBG("interface up");
-               else
-                       DBG("interface down");
-       }
+               wifi = list->data;
+               if (!wifi || !wifi->device)
+                       continue;
 
-       if ((wifi->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
-               if (flags & IFF_LOWER_UP)
-                       DBG("carrier on");
-               else
-                       DBG("carrier off");
+               dev_name = connman_device_get_string(wifi->device, "Interface");
+               if (!g_strcmp0(ifname, dev_name)) {
+                       pending_wifi_device = g_list_delete_link(
+                                               pending_wifi_device, list);
+                       return wifi;
+               }
        }
 
-       if (flags & IFF_LOWER_UP)
-               handle_tethering(wifi);
-
-       wifi->flags = flags;
+       return NULL;
 }
 
-static int wifi_probe(struct connman_device *device)
+static void remove_pending_wifi_device(struct wifi_data *wifi)
 {
-       struct wifi_data *wifi;
-
-       DBG("device %p", device);
-
-       wifi = g_try_new0(struct wifi_data, 1);
-       if (!wifi)
-               return -ENOMEM;
-
-       wifi->state = G_SUPPLICANT_STATE_INACTIVE;
-       wifi->ap_supported = WIFI_AP_UNKNOWN;
-       wifi->tethering_param = NULL;
-
-       connman_device_set_data(device, wifi);
-       wifi->device = connman_device_ref(device);
+       GList *link;
 
-       wifi->index = connman_device_get_index(device);
-       wifi->flags = 0;
+       link = g_list_find(pending_wifi_device, wifi);
 
-       wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
-                                                       wifi_newlink, device);
-       if (is_p2p_connecting())
-               add_pending_wifi_device(wifi);
-       else
-               iface_list = g_list_append(iface_list, wifi);
+       if (!link)
+               return;
 
-       return 0;
+       pending_wifi_device = g_list_delete_link(pending_wifi_device, link);
 }
 
-static void remove_networks(struct connman_device *device,
-                               struct wifi_data *wifi)
+static void peer_cancel_timeout(struct wifi_data *wifi)
 {
-       GSList *list;
+       if (wifi->p2p_connection_timeout > 0)
+               g_source_remove(wifi->p2p_connection_timeout);
 
-       for (list = wifi->networks; list; list = list->next) {
-               struct connman_network *network = list->data;
+       wifi->p2p_connection_timeout = 0;
+       wifi->p2p_connecting = false;
 
-               connman_device_remove_network(device, network);
-               connman_network_unref(network);
+       if (wifi->pending_peer) {
+               connman_peer_unref(wifi->pending_peer);
+               wifi->pending_peer = NULL;
        }
-
-       g_slist_free(wifi->networks);
-       wifi->networks = NULL;
 }
 
-static void remove_peers(struct wifi_data *wifi)
+static gboolean peer_connect_timeout(gpointer data)
 {
-       GSList *list;
+       struct wifi_data *wifi = data;
 
-       for (list = wifi->peers; list; list = list->next) {
-               struct connman_peer *peer = list->data;
+       DBG("");
 
-               connman_peer_unregister(peer);
-               connman_peer_unref(peer);
+       if (wifi->p2p_connecting) {
+               enum connman_peer_state state = CONNMAN_PEER_STATE_FAILURE;
+               GSupplicantPeer *gs_peer =
+                       g_supplicant_interface_peer_lookup(wifi->interface,
+                               connman_peer_get_identifier(wifi->pending_peer));
+
+               if (g_supplicant_peer_has_requested_connection(gs_peer))
+                       state = CONNMAN_PEER_STATE_IDLE;
+
+               connman_peer_set_state(wifi->pending_peer, state);
        }
 
-       g_slist_free(wifi->peers);
-       wifi->peers = NULL;
+       peer_cancel_timeout(wifi);
+
+       return FALSE;
 }
 
-static void reset_autoscan(struct connman_device *device)
+static void peer_connect_callback(int result, GSupplicantInterface *interface,
+                                                       void *user_data)
 {
-       struct wifi_data *wifi = connman_device_get_data(device);
-       struct autoscan_params *autoscan;
+       struct wifi_data *wifi = user_data;
+       struct connman_peer *peer = wifi->pending_peer;
 
-       DBG("");
+       DBG("peer %p - %d", peer, result);
 
-       if (!wifi || !wifi->autoscan)
+       if (!peer)
                return;
 
-       autoscan = wifi->autoscan;
-
-       autoscan->interval = 0;
-
-       if (autoscan->timeout == 0)
+       if (result < 0) {
+               peer_connect_timeout(wifi);
                return;
+       }
 
-       g_source_remove(autoscan->timeout);
-       autoscan->timeout = 0;
+       connman_peer_set_state(peer, CONNMAN_PEER_STATE_ASSOCIATION);
 
-       connman_device_unref(device);
+       wifi->p2p_connection_timeout = g_timeout_add_seconds(
+                                               P2P_CONNECTION_TIMEOUT,
+                                               peer_connect_timeout, wifi);
 }
 
-static void stop_autoscan(struct connman_device *device)
+static int peer_connect(struct connman_peer *peer,
+                       enum connman_peer_wps_method wps_method,
+                       const char *wps_pin)
 {
-       const struct wifi_data *wifi = connman_device_get_data(device);
+       struct connman_device *device = connman_peer_get_device(peer);
+       GSupplicantPeerParams *peer_params;
+       GSupplicantPeer *gs_peer;
+       struct wifi_data *wifi;
+       bool pbc, pin;
+       int ret;
 
-       if (!wifi || !wifi->autoscan)
-               return;
+       DBG("peer %p", peer);
 
-       reset_autoscan(device);
+       if (!device)
+               return -ENODEV;
 
-       connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI, false);
-}
+       wifi = connman_device_get_data(device);
+       if (!wifi || !wifi->interface)
+               return -ENODEV;
 
-static void check_p2p_technology(void)
-{
-       bool p2p_exists = false;
-       GList *list;
+       if (wifi->p2p_connecting)
+               return -EBUSY;
 
-       for (list = iface_list; list; list = list->next) {
-               struct wifi_data *w = list->data;
+       gs_peer = g_supplicant_interface_peer_lookup(wifi->interface,
+                                       connman_peer_get_identifier(peer));
+       if (!gs_peer)
+               return -EINVAL;
 
-               if (w->interface &&
-                               g_supplicant_interface_has_p2p(w->interface))
-                       p2p_exists = true;
-       }
+       pbc = g_supplicant_peer_is_wps_pbc(gs_peer);
+       pin = g_supplicant_peer_is_wps_pin(gs_peer);
 
-       if (!p2p_exists) {
-               connman_technology_driver_unregister(&p2p_tech_driver);
-               connman_peer_driver_unregister(&peer_driver);
+       switch (wps_method) {
+       case CONNMAN_PEER_WPS_UNKNOWN:
+               if ((pbc && pin) || pin)
+                       return -ENOKEY;
+               break;
+       case CONNMAN_PEER_WPS_PBC:
+               if (!pbc)
+                       return -EINVAL;
+               wps_pin = NULL;
+               break;
+       case CONNMAN_PEER_WPS_PIN:
+               if (!pin || !wps_pin)
+                       return -EINVAL;
+               break;
        }
-}
-
-static void wifi_remove(struct connman_device *device)
-{
-       struct wifi_data *wifi = connman_device_get_data(device);
 
-       DBG("device %p wifi %p", device, wifi);
+       peer_params = g_try_malloc0(sizeof(GSupplicantPeerParams));
+       if (!peer_params)
+               return -ENOMEM;
 
-       if (!wifi)
+       peer_params->path = g_strdup(g_supplicant_peer_get_path(gs_peer));
+       if (wps_pin)
+               peer_params->wps_pin = g_strdup(wps_pin);
+
+       peer_params->master = connman_peer_service_is_master();
+
+       ret = g_supplicant_interface_p2p_connect(wifi->interface, peer_params,
+                                               peer_connect_callback, wifi);
+       if (ret == -EINPROGRESS) {
+               wifi->pending_peer = connman_peer_ref(peer);
+               wifi->p2p_connecting = true;
+       } else if (ret < 0) {
+               g_free(peer_params->path);
+               g_free(peer_params->wps_pin);
+               g_free(peer_params);
+       }
+
+       return ret;
+}
+
+static int peer_disconnect(struct connman_peer *peer)
+{
+       struct connman_device *device = connman_peer_get_device(peer);
+       GSupplicantPeerParams peer_params = {};
+       GSupplicantPeer *gs_peer;
+       struct wifi_data *wifi;
+       int ret;
+
+       DBG("peer %p", peer);
+
+       if (!device)
+               return -ENODEV;
+
+       wifi = connman_device_get_data(device);
+       if (!wifi)
+               return -ENODEV;
+
+       gs_peer = g_supplicant_interface_peer_lookup(wifi->interface,
+                                       connman_peer_get_identifier(peer));
+       if (!gs_peer)
+               return -EINVAL;
+
+       peer_params.path = g_strdup(g_supplicant_peer_get_path(gs_peer));
+
+       ret = g_supplicant_interface_p2p_disconnect(wifi->interface,
+                                                       &peer_params);
+       g_free(peer_params.path);
+
+       if (ret == -EINPROGRESS) {
+               peer_cancel_timeout(wifi);
+               wifi->p2p_device = false;
+       }
+
+       return ret;
+}
+
+struct peer_service_registration {
+       peer_service_registration_cb_t callback;
+       void *user_data;
+};
+
+static bool is_service_wfd(const unsigned char *specs, int length)
+{
+       if (length < 9 || specs[0] != 0 || specs[1] != 0 || specs[2] != 6)
+               return false;
+
+       return true;
+}
+
+static void apply_p2p_listen_on_iface(gpointer data, gpointer user_data)
+{
+       struct wifi_data *wifi = data;
+
+       if (!wifi->interface ||
+                       !g_supplicant_interface_has_p2p(wifi->interface))
+               return;
+
+       if (!wifi->servicing) {
+               g_supplicant_interface_p2p_listen(wifi->interface,
+                               P2P_LISTEN_PERIOD, P2P_LISTEN_INTERVAL);
+       }
+
+       wifi->servicing++;
+}
+
+static void register_wfd_service_cb(int result,
+                               GSupplicantInterface *iface, void *user_data)
+{
+       struct peer_service_registration *reg_data = user_data;
+
+       DBG("");
+
+       if (result == 0)
+               g_list_foreach(iface_list, apply_p2p_listen_on_iface, NULL);
+
+       if (reg_data && reg_data->callback) {
+               reg_data->callback(result, reg_data->user_data);
+               g_free(reg_data);
+       }
+}
+
+static GSupplicantP2PServiceParams *fill_in_peer_service_params(
+                               const unsigned char *spec,
+                               int spec_length, const unsigned char *query,
+                               int query_length, int version)
+{
+       GSupplicantP2PServiceParams *params;
+
+       params = g_try_malloc0(sizeof(GSupplicantP2PServiceParams));
+       if (!params)
+               return NULL;
+
+       if (version > 0) {
+               params->version = version;
+               if (spec_length > 0) {
+                       params->service = g_malloc(spec_length);
+                       memcpy(params->service, spec, spec_length);
+               }
+       } else if (query_length > 0 && spec_length > 0) {
+               params->query = g_malloc(query_length);
+               memcpy(params->query, query, query_length);
+               params->query_length = query_length;
+
+               params->response = g_malloc(spec_length);
+               memcpy(params->response, spec, spec_length);
+               params->response_length = spec_length;
+       } else {
+               if (spec_length > 0) {
+                       params->wfd_ies = g_malloc(spec_length);
+                       memcpy(params->wfd_ies, spec, spec_length);
+               }
+               params->wfd_ies_length = spec_length;
+       }
+
+       return params;
+}
+
+static void free_peer_service_params(GSupplicantP2PServiceParams *params)
+{
+       if (!params)
+               return;
+
+       g_free(params->service);
+       g_free(params->query);
+       g_free(params->response);
+       g_free(params->wfd_ies);
+
+       g_free(params);
+}
+
+static int peer_register_wfd_service(const unsigned char *specification,
+                               int specification_length,
+                               peer_service_registration_cb_t callback,
+                               void *user_data)
+{
+       struct peer_service_registration *reg_data = NULL;
+       static GSupplicantP2PServiceParams *params;
+       int ret;
+
+       DBG("");
+
+       if (wfd_service_registered)
+               return -EBUSY;
+
+       params = fill_in_peer_service_params(specification,
+                                       specification_length, NULL, 0, 0);
+       if (!params)
+               return -ENOMEM;
+
+       reg_data = g_try_malloc0(sizeof(*reg_data));
+       if (!reg_data) {
+               ret = -ENOMEM;
+               goto error;
+       }
+
+       reg_data->callback = callback;
+       reg_data->user_data = user_data;
+
+       ret = g_supplicant_set_widi_ies(params,
+                                       register_wfd_service_cb, reg_data);
+       if (ret < 0 && ret != -EINPROGRESS)
+               goto error;
+
+       wfd_service_registered = true;
+
+       return ret;
+error:
+       free_peer_service_params(params);
+       g_free(reg_data);
+
+       return ret;
+}
+
+static void register_peer_service_cb(int result,
+                               GSupplicantInterface *iface, void *user_data)
+{
+       struct wifi_data *wifi = g_supplicant_interface_get_data(iface);
+       struct peer_service_registration *reg_data = user_data;
+
+#if defined TIZEN_EXT
+       if (!wifi)
                return;
+#endif
+
+       DBG("");
+
+       if (result == 0)
+               apply_p2p_listen_on_iface(wifi, NULL);
+
+       if (reg_data->callback)
+               reg_data->callback(result, reg_data->user_data);
+
+       g_free(reg_data);
+}
+
+static int peer_register_service(const unsigned char *specification,
+                               int specification_length,
+                               const unsigned char *query,
+                               int query_length, int version,
+                               peer_service_registration_cb_t callback,
+                               void *user_data)
+{
+       struct peer_service_registration *reg_data;
+       GSupplicantP2PServiceParams *params;
+       bool found = false;
+       int ret, ret_f;
+       GList *list;
+
+       DBG("");
+
+       if (specification && !version && !query &&
+                       is_service_wfd(specification, specification_length)) {
+               return peer_register_wfd_service(specification,
+                               specification_length, callback, user_data);
+       }
+
+       reg_data = g_try_malloc0(sizeof(*reg_data));
+       if (!reg_data)
+               return -ENOMEM;
+
+       reg_data->callback = callback;
+       reg_data->user_data = user_data;
+
+       ret_f = -EOPNOTSUPP;
+
+       for (list = iface_list; list; list = list->next) {
+               struct wifi_data *wifi = list->data;
+               GSupplicantInterface *iface = wifi->interface;
+
+               if (!g_supplicant_interface_has_p2p(iface))
+                       continue;
+
+               params = fill_in_peer_service_params(specification,
+                                               specification_length, query,
+                                               query_length, version);
+               if (!params)
+                       continue;
+
+               if (!found) {
+                       ret_f = g_supplicant_interface_p2p_add_service(iface,
+                               register_peer_service_cb, params, reg_data);
+                       if (ret_f == 0 || ret_f == -EINPROGRESS)
+                               found = true;
+                       ret = ret_f;
+               } else
+                       ret = g_supplicant_interface_p2p_add_service(iface,
+                               register_peer_service_cb, params, NULL);
+               if (ret != 0 && ret != -EINPROGRESS)
+                       free_peer_service_params(params);
+       }
+
+       if (ret_f != 0 && ret_f != -EINPROGRESS)
+               g_free(reg_data);
+
+       return ret_f;
+}
+
+static int peer_unregister_wfd_service(void)
+{
+       GSupplicantP2PServiceParams *params;
+       GList *list;
+
+       if (!wfd_service_registered)
+               return -EALREADY;
+
+       params = fill_in_peer_service_params(NULL, 0, NULL, 0, 0);
+       if (!params)
+               return -ENOMEM;
+
+       wfd_service_registered = false;
+
+       g_supplicant_set_widi_ies(params, NULL, NULL);
+
+       for (list = iface_list; list; list = list->next) {
+               struct wifi_data *wifi = list->data;
+
+               if (!g_supplicant_interface_has_p2p(wifi->interface))
+                       continue;
+
+               wifi->servicing--;
+               if (!wifi->servicing || wifi->servicing < 0) {
+                       g_supplicant_interface_p2p_listen(wifi->interface,
+                                                                       0, 0);
+                       wifi->servicing = 0;
+               }
+       }
+
+       return 0;
+}
+
+static int peer_unregister_service(const unsigned char *specification,
+                                               int specification_length,
+                                               const unsigned char *query,
+                                               int query_length, int version)
+{
+       GSupplicantP2PServiceParams *params;
+       bool wfd = false;
+       GList *list;
+       int ret;
+
+       if (specification && !version && !query &&
+                       is_service_wfd(specification, specification_length)) {
+               ret = peer_unregister_wfd_service();
+               if (ret != 0 && ret != -EINPROGRESS)
+                       return ret;
+               wfd = true;
+       }
+
+       for (list = iface_list; list; list = list->next) {
+               struct wifi_data *wifi = list->data;
+               GSupplicantInterface *iface = wifi->interface;
+
+               if (wfd)
+                       goto stop_listening;
+
+               if (!g_supplicant_interface_has_p2p(iface))
+                       continue;
+
+               params = fill_in_peer_service_params(specification,
+                                               specification_length, query,
+                                               query_length, version);
+               if (!params)
+                       continue;
+
+               ret = g_supplicant_interface_p2p_del_service(iface, params);
+               if (ret != 0 && ret != -EINPROGRESS)
+                       free_peer_service_params(params);
+stop_listening:
+               wifi->servicing--;
+               if (!wifi->servicing || wifi->servicing < 0) {
+                       g_supplicant_interface_p2p_listen(iface, 0, 0);
+                       wifi->servicing = 0;
+               }
+       }
+
+       return 0;
+}
+
+static struct connman_peer_driver peer_driver = {
+       .connect    = peer_connect,
+       .disconnect = peer_disconnect,
+       .register_service = peer_register_service,
+       .unregister_service = peer_unregister_service,
+};
+
+static void handle_tethering(struct wifi_data *wifi)
+{
+       if (!wifi->tethering)
+               return;
+
+       if (!wifi->bridge)
+               return;
+
+       if (wifi->bridged)
+               return;
+
+       DBG("index %d bridge %s", wifi->index, wifi->bridge);
+
+       if (connman_inet_add_to_bridge(wifi->index, wifi->bridge) < 0)
+               return;
+
+       wifi->bridged = true;
+}
+
+static void wifi_newlink(unsigned flags, unsigned change, void *user_data)
+{
+       struct connman_device *device = user_data;
+       struct wifi_data *wifi = connman_device_get_data(device);
+
+       if (!wifi)
+               return;
+
+       DBG("index %d flags %d change %d", wifi->index, flags, change);
+
+       if ((wifi->flags & IFF_UP) != (flags & IFF_UP)) {
+               if (flags & IFF_UP)
+                       DBG("interface up");
+               else
+                       DBG("interface down");
+       }
+
+       if ((wifi->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
+               if (flags & IFF_LOWER_UP)
+                       DBG("carrier on");
+               else
+                       DBG("carrier off");
+       }
+
+       if (flags & IFF_LOWER_UP)
+               handle_tethering(wifi);
+
+       wifi->flags = flags;
+}
+
+static int wifi_probe(struct connman_device *device)
+{
+       struct wifi_data *wifi;
+
+       DBG("device %p", device);
+
+       wifi = g_try_new0(struct wifi_data, 1);
+       if (!wifi)
+               return -ENOMEM;
+
+       wifi->state = G_SUPPLICANT_STATE_INACTIVE;
+       wifi->ap_supported = WIFI_AP_UNKNOWN;
+       wifi->tethering_param = NULL;
+
+       connman_device_set_data(device, wifi);
+       wifi->device = connman_device_ref(device);
+
+       wifi->index = connman_device_get_index(device);
+       wifi->flags = 0;
+
+       wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
+                                                       wifi_newlink, device);
+       if (is_p2p_connecting())
+               add_pending_wifi_device(wifi);
+       else
+               iface_list = g_list_append(iface_list, wifi);
+
+       return 0;
+}
+
+static void remove_networks(struct connman_device *device,
+                               struct wifi_data *wifi)
+{
+       GSList *list;
+
+       for (list = wifi->networks; list; list = list->next) {
+               struct connman_network *network = list->data;
+
+               connman_device_remove_network(device, network);
+               connman_network_unref(network);
+       }
+
+       g_slist_free(wifi->networks);
+       wifi->networks = NULL;
+}
+
+static void remove_peers(struct wifi_data *wifi)
+{
+       GSList *list;
+
+       for (list = wifi->peers; list; list = list->next) {
+               struct connman_peer *peer = list->data;
+
+               connman_peer_unregister(peer);
+               connman_peer_unref(peer);
+       }
+
+       g_slist_free(wifi->peers);
+       wifi->peers = NULL;
+}
+
+static void reset_autoscan(struct connman_device *device)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+       struct autoscan_params *autoscan;
+
+       DBG("");
+
+       if (!wifi || !wifi->autoscan)
+               return;
+
+       autoscan = wifi->autoscan;
+
+       autoscan->interval = 0;
+
+       if (autoscan->timeout == 0)
+               return;
+
+       g_source_remove(autoscan->timeout);
+       autoscan->timeout = 0;
+
+       connman_device_unref(device);
+}
+
+static void stop_autoscan(struct connman_device *device)
+{
+       const struct wifi_data *wifi = connman_device_get_data(device);
+
+       if (!wifi || !wifi->autoscan)
+               return;
+
+       reset_autoscan(device);
+
+       connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI, false);
+}
+
+static void check_p2p_technology(void)
+{
+       bool p2p_exists = false;
+       GList *list;
+
+       for (list = iface_list; list; list = list->next) {
+               struct wifi_data *w = list->data;
+
+               if (w->interface &&
+                               g_supplicant_interface_has_p2p(w->interface))
+                       p2p_exists = true;
+       }
+
+       if (!p2p_exists) {
+               connman_technology_driver_unregister(&p2p_tech_driver);
+               connman_peer_driver_unregister(&peer_driver);
+       }
+}
+
+struct last_connected {
+       GTimeVal modified;
+       gchar *ssid;
+       int freq;
+};
+
+static gint sort_entry(gconstpointer a, gconstpointer b, gpointer user_data)
+{
+       GTimeVal *aval = (GTimeVal *)a;
+       GTimeVal *bval = (GTimeVal *)b;
+
+       /* Note that the sort order is descending */
+       if (aval->tv_sec < bval->tv_sec)
+               return 1;
+
+       if (aval->tv_sec > bval->tv_sec)
+               return -1;
+
+       return 0;
+}
+
+static void free_entry(gpointer data)
+{
+       struct last_connected *entry = data;
+
+       g_free(entry->ssid);
+       g_free(entry);
+}
+
+static void wifi_remove(struct connman_device *device)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+
+       DBG("device %p wifi %p", device, wifi);
+
+       if (!wifi)
+               return;
+
+       stop_autoscan(device);
+
+       if (wifi->p2p_device)
+               p2p_iface_list = g_list_remove(p2p_iface_list, wifi);
+       else
+               iface_list = g_list_remove(iface_list, wifi);
+
+       check_p2p_technology();
+#if defined TIZEN_EXT_WIFI_MESH
+       check_mesh_technology();
+#endif
+
+       remove_pending_wifi_device(wifi);
+
+       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_P2P)) {
+               g_source_remove(wifi->p2p_find_timeout);
+               connman_device_unref(wifi->device);
+       }
+
+       if (wifi->p2p_connection_timeout)
+               g_source_remove(wifi->p2p_connection_timeout);
+
+#if defined TIZEN_EXT
+       if (wifi->automaxspeed_timeout != 0) {
+               g_source_remove(wifi->automaxspeed_timeout);
+               wifi->automaxspeed_timeout = 0;
+       }
+#endif
+
+       remove_networks(device, wifi);
+       remove_peers(wifi);
+
+       connman_device_set_powered(device, false);
+       connman_device_set_data(device, NULL);
+       connman_device_unref(wifi->device);
+       connman_rtnl_remove_watch(wifi->watch);
+
+       g_supplicant_interface_set_data(wifi->interface, NULL);
+
+       g_supplicant_interface_cancel(wifi->interface);
+
+       if (wifi->scan_params)
+               g_supplicant_free_scan_params(wifi->scan_params);
+#if defined TIZEN_EXT
+       if (wifi->hidden_scan_params) {
+               while (wifi->hidden_scan_params->ssids) {
+                       struct scan_ssid *ssid;
+                       ssid = wifi->hidden_scan_params->ssids->data;
+                       wifi->hidden_scan_params->ssids = g_slist_remove(wifi->hidden_scan_params->ssids, ssid);
+               }
+               g_supplicant_free_scan_params(wifi->hidden_scan_params);
+       }
+#endif
+
+       g_free(wifi->autoscan);
+       g_free(wifi->identifier);
+       g_free(wifi);
+}
+
+static bool is_duplicate(GSList *list, gchar *ssid, int ssid_len)
+{
+       GSList *iter;
+
+       for (iter = list; iter; iter = g_slist_next(iter)) {
+               struct scan_ssid *scan_ssid = iter->data;
+
+               if (ssid_len == scan_ssid->ssid_len &&
+                               memcmp(ssid, scan_ssid->ssid, ssid_len) == 0)
+                       return true;
+       }
+
+       return false;
+}
+
+static int add_scan_param(gchar *hex_ssid, char *raw_ssid, int ssid_len,
+                       int freq, GSupplicantScanParams *scan_data,
+                       int driver_max_scan_ssids, char *ssid_name)
+{
+       unsigned int i;
+       struct scan_ssid *scan_ssid;
+
+       if ((driver_max_scan_ssids == 0 ||
+                       driver_max_scan_ssids > scan_data->num_ssids) &&
+                       (hex_ssid || raw_ssid)) {
+               gchar *ssid;
+               unsigned int j = 0, hex;
+
+               if (hex_ssid) {
+                       size_t hex_ssid_len = strlen(hex_ssid);
+
+                       ssid = g_try_malloc0(hex_ssid_len / 2);
+                       if (!ssid)
+                               return -ENOMEM;
+
+                       for (i = 0; i < hex_ssid_len; i += 2) {
+                               sscanf(hex_ssid + i, "%02x", &hex);
+                               ssid[j++] = hex;
+                       }
+               } else {
+                       ssid = raw_ssid;
+                       j = ssid_len;
+               }
+
+               /*
+                * If we have already added hidden AP to the list,
+                * then do not do it again. This might happen if you have
+                * used or are using multiple wifi cards, so in that case
+                * you might have multiple service files for same AP.
+                */
+               if (is_duplicate(scan_data->ssids, ssid, j)) {
+                       if (hex_ssid)
+                               g_free(ssid);
+                       return 0;
+               }
+
+               scan_ssid = g_try_new(struct scan_ssid, 1);
+               if (!scan_ssid) {
+                       if (hex_ssid)
+                               g_free(ssid);
+                       return -ENOMEM;
+               }
+
+               memcpy(scan_ssid->ssid, ssid, j);
+               scan_ssid->ssid_len = j;
+               scan_data->ssids = g_slist_prepend(scan_data->ssids,
+                                                               scan_ssid);
+
+               scan_data->num_ssids++;
+
+               DBG("SSID %s added to scanned list of %d entries", ssid_name,
+                                                       scan_data->num_ssids);
+
+               if (hex_ssid)
+                       g_free(ssid);
+       } else
+               return -EINVAL;
+
+       scan_data->ssids = g_slist_reverse(scan_data->ssids);
+
+       if (!scan_data->freqs) {
+               scan_data->freqs = g_try_malloc0(sizeof(uint16_t));
+               if (!scan_data->freqs) {
+                       g_slist_free_full(scan_data->ssids, g_free);
+                       return -ENOMEM;
+               }
+
+               scan_data->num_freqs = 1;
+               scan_data->freqs[0] = freq;
+       } else {
+               bool duplicate = false;
+
+               /* Don't add duplicate entries */
+               for (i = 0; i < scan_data->num_freqs; i++) {
+                       if (scan_data->freqs[i] == freq) {
+                               duplicate = true;
+                               break;
+                       }
+               }
+
+               if (!duplicate) {
+                       scan_data->num_freqs++;
+                       scan_data->freqs = g_try_realloc(scan_data->freqs,
+                               sizeof(uint16_t) * scan_data->num_freqs);
+                       if (!scan_data->freqs) {
+                               g_slist_free_full(scan_data->ssids, g_free);
+                               return -ENOMEM;
+                       }
+                       scan_data->freqs[scan_data->num_freqs - 1] = freq;
+               }
+       }
+
+       return 1;
+}
+
+static int get_hidden_connections(GSupplicantScanParams *scan_data)
+{
+       struct connman_config_entry **entries;
+       GKeyFile *keyfile;
+#if defined TIZEN_EXT
+       gchar **services = NULL;
+#else
+       gchar **services;
+#endif /* defined TIZEN_EXT */
+       char *ssid, *name;
+       int i, ret;
+       bool value;
+       int num_ssids = 0, add_param_failed = 0;
+#if defined TIZEN_EXT
+       GSequenceIter *iter;
+       GSequence *latest_list;
+       struct last_connected *entry;
+       GTimeVal modified;
+
+       latest_list = g_sequence_new(free_entry);
+       if (!latest_list)
+               goto out;
+#endif
+       services = connman_storage_get_services();
+       for (i = 0; services && services[i]; i++) {
+               if (strncmp(services[i], "wifi_", 5) != 0)
+                       continue;
+
+               keyfile = connman_storage_load_service(services[i]);
+               if (!keyfile)
+                       continue;
+
+               value = g_key_file_get_boolean(keyfile,
+                                       services[i], "Hidden", NULL);
+               if (!value) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+
+               value = g_key_file_get_boolean(keyfile,
+                                       services[i], "Favorite", NULL);
+               if (!value) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+
+#if defined TIZEN_EXT
+               value = g_key_file_get_boolean(keyfile,
+                                       services[i], "AutoConnect", NULL);
+               if (!value) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+
+               gchar *str = g_key_file_get_string(keyfile,
+                                       services[i], "Modified", NULL);
+               if (!str) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+               g_time_val_from_iso8601(str, &modified);
+               g_free(str);
+#endif
+
+               ssid = g_key_file_get_string(keyfile,
+                                       services[i], "SSID", NULL);
+
+               name = g_key_file_get_string(keyfile, services[i], "Name",
+                                                               NULL);
+
+#if defined TIZEN_EXT
+               entry = g_try_new(struct last_connected, 1);
+               if (!entry) {
+                       g_sequence_free(latest_list);
+                       g_free(ssid);
+                       g_free(name);
+                       g_key_file_free(keyfile);
+                       goto out;
+               }
+
+               entry->modified = modified;
+               entry->ssid = ssid;
+
+               g_sequence_insert_sorted(latest_list, entry,
+                               sort_entry, NULL);
+#else
+               ret = add_scan_param(ssid, NULL, 0, 0, scan_data, 0, name);
+               if (ret < 0)
+                       add_param_failed++;
+               else if (ret > 0)
+                       num_ssids++;
+
+               g_free(ssid);
+#endif
+               g_free(name);
+               g_key_file_free(keyfile);
+       }
+
+#if defined TIZEN_EXT
+       gint length = g_sequence_get_length(latest_list);
+       iter = g_sequence_get_begin_iter(latest_list);
+
+       for (i = 0; i < length; i++) {
+               entry = g_sequence_get(iter);
+
+               ret = add_scan_param(entry->ssid, NULL, 0, 0, scan_data, 0, entry->ssid);
+               if (ret < 0)
+                       add_param_failed++;
+               else if (ret > 0)
+                       num_ssids++;
+
+               iter = g_sequence_iter_next(iter);
+       }
+
+       g_sequence_free(latest_list);
+out:
+#endif
+       /*
+        * Check if there are any hidden AP that needs to be provisioned.
+        */
+       entries = connman_config_get_entries("wifi");
+       for (i = 0; entries && entries[i]; i++) {
+               int len;
+
+               if (!entries[i]->hidden)
+                       continue;
+
+               if (!entries[i]->ssid) {
+                       ssid = entries[i]->name;
+                       len = strlen(ssid);
+               } else {
+                       ssid = entries[i]->ssid;
+                       len = entries[i]->ssid_len;
+               }
+
+               if (!ssid)
+                       continue;
+
+               ret = add_scan_param(NULL, ssid, len, 0, scan_data, 0, ssid);
+               if (ret < 0)
+                       add_param_failed++;
+               else if (ret > 0)
+                       num_ssids++;
+       }
 
-       stop_autoscan(device);
+       connman_config_free_entries(entries);
 
-       if (wifi->p2p_device)
-               p2p_iface_list = g_list_remove(p2p_iface_list, wifi);
-       else
-               iface_list = g_list_remove(iface_list, wifi);
+       if (add_param_failed > 0)
+               DBG("Unable to scan %d out of %d SSIDs",
+                                       add_param_failed, num_ssids);
 
-       check_p2p_technology();
+       g_strfreev(services);
 
-       remove_pending_wifi_device(wifi);
+       return num_ssids;
+}
 
-       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_P2P)) {
-               g_source_remove(wifi->p2p_find_timeout);
-               connman_device_unref(wifi->device);
+static int get_hidden_connections_params(struct wifi_data *wifi,
+                                       GSupplicantScanParams *scan_params)
+{
+       int driver_max_ssids, i;
+       GSupplicantScanParams *orig_params;
+
+       /*
+        * Scan hidden networks so that we can autoconnect to them.
+        * We will assume 1 as a default number of ssid to scan.
+        */
+       driver_max_ssids = g_supplicant_interface_get_max_scan_ssids(
+                                                       wifi->interface);
+       if (driver_max_ssids == 0)
+               driver_max_ssids = 1;
+
+       DBG("max ssids %d", driver_max_ssids);
+
+#if defined TIZEN_EXT
+       if (!wifi->hidden_scan_params) {
+               wifi->hidden_scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!wifi->hidden_scan_params)
+                       return 0;
+
+               if (get_hidden_connections(wifi->hidden_scan_params) == 0) {
+                       g_supplicant_free_scan_params(wifi->hidden_scan_params);
+                       wifi->hidden_scan_params = NULL;
+
+                       return 0;
+               }
        }
 
-       if (wifi->p2p_connection_timeout)
-               g_source_remove(wifi->p2p_connection_timeout);
+       orig_params = wifi->hidden_scan_params;
+#else
+       if (!wifi->scan_params) {
+               wifi->scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!wifi->scan_params)
+                       return 0;
 
-       remove_networks(device, wifi);
-       remove_peers(wifi);
+               if (get_hidden_connections(wifi->scan_params) == 0) {
+                       g_supplicant_free_scan_params(wifi->scan_params);
+                       wifi->scan_params = NULL;
 
-       connman_device_set_powered(device, false);
-       connman_device_set_data(device, NULL);
-       connman_device_unref(wifi->device);
-       connman_rtnl_remove_watch(wifi->watch);
+                       return 0;
+               }
+       }
 
-       g_supplicant_interface_set_data(wifi->interface, NULL);
+       orig_params = wifi->scan_params;
+#endif
 
-       g_supplicant_interface_cancel(wifi->interface);
+       /* Let's transfer driver_max_ssids params */
+       for (i = 0; i < driver_max_ssids; i++) {
+               struct scan_ssid *ssid;
 
-       if (wifi->scan_params)
-               g_supplicant_free_scan_params(wifi->scan_params);
+#if defined TIZEN_EXT
+               if (!wifi->hidden_scan_params->ssids)
+#else
+               if (!wifi->scan_params->ssids)
+#endif
+                       break;
 
-       g_free(wifi->autoscan);
-       g_free(wifi->identifier);
-       g_free(wifi);
+               ssid = orig_params->ssids->data;
+               orig_params->ssids = g_slist_remove(orig_params->ssids, ssid);
+               scan_params->ssids = g_slist_prepend(scan_params->ssids, ssid);
+       }
+
+       if (i > 0) {
+               scan_params->num_ssids = i;
+               scan_params->ssids = g_slist_reverse(scan_params->ssids);
+
+               if (orig_params->num_freqs <= 0)
+                       goto err;
+
+               scan_params->freqs =
+                       g_malloc(sizeof(uint16_t) * orig_params->num_freqs);
+               memcpy(scan_params->freqs, orig_params->freqs,
+                       sizeof(uint16_t) *orig_params->num_freqs);
+
+               scan_params->num_freqs = orig_params->num_freqs;
+
+       } else
+               goto err;
+
+       orig_params->num_ssids -= scan_params->num_ssids;
+
+       return scan_params->num_ssids;
+
+err:
+       g_slist_free_full(scan_params->ssids, g_free);
+#if defined TIZEN_EXT
+       g_supplicant_free_scan_params(wifi->hidden_scan_params);
+       wifi->hidden_scan_params = NULL;
+#else
+       g_supplicant_free_scan_params(wifi->scan_params);
+       wifi->scan_params = NULL;
+#endif
+
+       return 0;
 }
 
-static bool is_duplicate(GSList *list, gchar *ssid, int ssid_len)
+static int throw_wifi_scan(struct connman_device *device,
+                       GSupplicantInterfaceCallback callback)
 {
-       GSList *iter;
+       struct wifi_data *wifi = connman_device_get_data(device);
+       int ret;
 
-       for (iter = list; iter; iter = g_slist_next(iter)) {
-               struct scan_ssid *scan_ssid = iter->data;
+       if (!wifi)
+               return -ENODEV;
 
-               if (ssid_len == scan_ssid->ssid_len &&
-                               memcmp(ssid, scan_ssid->ssid, ssid_len) == 0)
-                       return true;
+       DBG("device %p %p", device, wifi->interface);
+
+       if (wifi->tethering)
+               return -EBUSY;
+
+#if defined TIZEN_EXT
+       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI)
+           && !wifi->allow_full_scan)
+#else
+       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI))
+#endif
+               return -EALREADY;
+
+       connman_device_ref(device);
+
+       ret = g_supplicant_interface_scan(wifi->interface, NULL,
+                                               callback, device);
+       if (ret == 0) {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, true);
+       } else
+               connman_device_unref(device);
+
+       return ret;
+}
+
+static void hidden_free(struct hidden_params *hidden)
+{
+       if (!hidden)
+               return;
+
+       if (hidden->scan_params)
+               g_supplicant_free_scan_params(hidden->scan_params);
+       g_free(hidden->identity);
+       g_free(hidden->passphrase);
+       g_free(hidden->security);
+       g_free(hidden);
+}
+
+#if defined TIZEN_EXT
+static void service_state_changed(struct connman_service *service,
+                                       enum connman_service_state state);
+
+static int network_connect(struct connman_network *network);
+
+static struct connman_notifier notifier = {
+       .name                   = "wifi",
+       .priority               = CONNMAN_NOTIFIER_PRIORITY_DEFAULT,
+       .service_state_changed  = service_state_changed,
+};
+
+static void service_state_changed(struct connman_service *service,
+                                       enum connman_service_state state)
+{
+       enum connman_service_type type;
+
+       type = connman_service_get_type(service);
+       if (type != CONNMAN_SERVICE_TYPE_WIFI)
+               return;
+
+       DBG("service %p state %d", service, state);
+
+       switch (state) {
+       case CONNMAN_SERVICE_STATE_READY:
+       case CONNMAN_SERVICE_STATE_ONLINE:
+       case CONNMAN_SERVICE_STATE_FAILURE:
+               connman_notifier_unregister(&notifier);
+               is_wifi_notifier_registered = FALSE;
+
+               __connman_device_request_scan(type);
+               break;
+
+       default:
+               break;
        }
+}
 
-       return false;
+static gboolean need_bss_transition(uint16_t freq, int snr, int strength)
+{
+       /*
+        * Since bssid->strength is a positive value,
+        * it need to be changed to its original value.
+        */
+       int signal = strength - 120;
+
+       /*
+        * If the currently connected AP matches the following conditions,
+        * scan for BSS transition is started.
+        *   - SNR is less than 20 or RSSI level is less than 3
+        */
+       if (snr < 20 && snr != 0)
+               return TRUE;
+       else if (freq > 4900 && signal <= RSSI_LEVEL_2_5G)
+               return TRUE;
+       else if (freq <= 4900 && signal <= RSSI_LEVEL_2_24G)
+               return TRUE;
+
+       return FALSE;
 }
 
-static int add_scan_param(gchar *hex_ssid, char *raw_ssid, int ssid_len,
-                       int freq, GSupplicantScanParams *scan_data,
-                       int driver_max_scan_ssids, char *ssid_name)
+static gboolean check_bss_condition(uint16_t freq, int snr, uint16_t strength)
 {
-       unsigned int i;
-       struct scan_ssid *scan_ssid;
+       /*
+        * Since bssid->strength is a positive value,
+        * it need to be changed to its original value.
+        */
+       int signal = strength - 120;
 
-       if ((driver_max_scan_ssids == 0 ||
-                       driver_max_scan_ssids > scan_data->num_ssids) &&
-                       (hex_ssid || raw_ssid)) {
-               gchar *ssid;
-               unsigned int j = 0, hex;
+       /*
+        * If the AP that matches the following conditions exists in the SCAN result,
+        * BSS transition is started.
+        *   - SNR is 25 or more and RSSI level is greater than 3
+        */
+       if (snr < 25 && snr != 0)
+               return FALSE;
 
-               if (hex_ssid) {
-                       size_t hex_ssid_len = strlen(hex_ssid);
+       if (freq > 4900 && signal > RSSI_LEVEL_3_5G)
+               return TRUE;
+       else if (freq <= 4900 && signal > RSSI_LEVEL_3_24G)
+               return TRUE;
 
-                       ssid = g_try_malloc0(hex_ssid_len / 2);
-                       if (!ssid)
-                               return -ENOMEM;
+       return FALSE;
+}
 
-                       for (i = 0; i < hex_ssid_len; i += 2) {
-                               sscanf(hex_ssid + i, "%02x", &hex);
-                               ssid[j++] = hex;
-                       }
-               } else {
-                       ssid = raw_ssid;
-                       j = ssid_len;
-               }
+static void scan_callback_hidden(int result,
+                       GSupplicantInterface *interface, void *user_data);
 
-               /*
-                * If we have already added hidden AP to the list,
-                * then do not do it again. This might happen if you have
-                * used or are using multiple wifi cards, so in that case
-                * you might have multiple service files for same AP.
-                */
-               if (is_duplicate(scan_data->ssids, ssid, j)) {
-                       if (hex_ssid)
-                               g_free(ssid);
-                       return 0;
-               }
+static int network_disconnect(struct connman_network *network);
+#endif
 
-               scan_ssid = g_try_new(struct scan_ssid, 1);
-               if (!scan_ssid) {
-                       if (hex_ssid)
-                               g_free(ssid);
-                       return -ENOMEM;
+static void scan_callback(int result, GSupplicantInterface *interface,
+                                               void *user_data)
+{
+       struct connman_device *device = user_data;
+       struct wifi_data *wifi = connman_device_get_data(device);
+       bool scanning;
+#if defined TIZEN_EXT
+       bool roaming_needed = false;
+       bool roaming_ap_found = false;
+       GSList *list = NULL;
+       GSList *bssid_list = NULL;
+       bool favorite_exists = false;
+       struct connman_network *network = NULL;
+       struct connman_service *service = NULL;
+#endif
+
+       DBG("result %d wifi %p", result, wifi);
+
+       if (wifi) {
+               if (wifi->hidden && !wifi->postpone_hidden) {
+                       connman_network_clear_hidden(wifi->hidden->user_data);
+                       hidden_free(wifi->hidden);
+                       wifi->hidden = NULL;
                }
 
-               memcpy(scan_ssid->ssid, ssid, j);
-               scan_ssid->ssid_len = j;
-               scan_data->ssids = g_slist_prepend(scan_data->ssids,
-                                                               scan_ssid);
+               if (wifi->scan_params) {
+                       g_supplicant_free_scan_params(wifi->scan_params);
+                       wifi->scan_params = NULL;
+               }
 
-               scan_data->num_ssids++;
+#if defined TIZEN_EXT
+               if (wifi->hidden_scan_params && !wifi->hidden_scan_params->ssids) {
+                       g_supplicant_free_scan_params(wifi->hidden_scan_params);
+                       wifi->hidden_scan_params = NULL;
+               }
+#endif
+       }
 
-               DBG("SSID %s added to scanned list of %d entries", ssid_name,
-                                                       scan_data->num_ssids);
+       if (result < 0)
+               connman_device_reset_scanning(device);
 
-               if (hex_ssid)
-                       g_free(ssid);
-       } else
-               return -EINVAL;
+       /* User is connecting to a hidden AP, let's wait for finished event */
+       if (wifi && wifi->hidden && wifi->postpone_hidden) {
+               GSupplicantScanParams *scan_params;
+               int ret;
 
-       scan_data->ssids = g_slist_reverse(scan_data->ssids);
+               wifi->postpone_hidden = false;
+               scan_params = wifi->hidden->scan_params;
+               wifi->hidden->scan_params = NULL;
 
-       if (!scan_data->freqs) {
-               scan_data->freqs = g_try_malloc0(sizeof(uint16_t));
-               if (!scan_data->freqs) {
-                       g_slist_free_full(scan_data->ssids, g_free);
-                       return -ENOMEM;
-               }
+               reset_autoscan(device);
 
-               scan_data->num_freqs = 1;
-               scan_data->freqs[0] = freq;
-       } else {
-               bool duplicate = false;
+               ret = g_supplicant_interface_scan(wifi->interface, scan_params,
+                                                       scan_callback, device);
+               if (ret == 0)
+                       return;
 
-               /* Don't add duplicate entries */
-               for (i = 0; i < scan_data->num_freqs; i++) {
-                       if (scan_data->freqs[i] == freq) {
-                               duplicate = true;
+               /* On error, let's recall scan_callback, which will cleanup */
+               return scan_callback(ret, interface, user_data);
+       }
+
+#if defined TIZEN_EXT
+       if (wifi) {
+               for (list = wifi->networks; list; list = list->next) {
+                       network = list->data;
+                       service = connman_service_lookup_from_network(network);
+
+                       if (service != NULL &&
+                               (connman_service_get_favorite(service) == true) &&
+                               (connman_service_get_autoconnect(service) == true)) {
+                               DBG("Favorite service exists [%s]",
+                                               connman_network_get_string(network, "Name"));
+                               favorite_exists = true;
                                break;
                        }
                }
+       }
 
-               if (!duplicate) {
-                       scan_data->num_freqs++;
-                       scan_data->freqs = g_try_realloc(scan_data->freqs,
-                               sizeof(uint16_t) * scan_data->num_freqs);
-                       if (!scan_data->freqs) {
-                               g_slist_free_full(scan_data->ssids, g_free);
-                               return -ENOMEM;
-                       }
-                       scan_data->freqs[scan_data->num_freqs - 1] = freq;
+       if (favorite_exists == false) {
+               if (wifi && wifi->allow_full_scan) {
+                       int ret;
+                       DBG("Trigger full channel scan");
+                       wifi->allow_full_scan = false;
+
+                       ret = g_supplicant_interface_scan(wifi->interface, NULL,
+                                                               scan_callback_hidden, device);
+                       if (ret == 0)
+                               return;
+
+                       /* On error, let's recall scan_callback, which will cleanup */
+                       return scan_callback(ret, interface, user_data);
                }
+       } else
+               wifi->allow_full_scan = false;
+#endif
+
+       scanning = connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI);
+
+       if (scanning) {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, false);
        }
 
-       return 1;
-}
+       if (result != -ENOLINK)
+#if defined TIZEN_EXT
+       if (result != -EIO)
+#endif
+               start_autoscan(device);
 
-static int get_hidden_connections(GSupplicantScanParams *scan_data)
-{
-       struct connman_config_entry **entries;
-       GKeyFile *keyfile;
-       gchar **services;
-       char *ssid, *name;
-       int i, ret;
-       bool value;
-       int num_ssids = 0, add_param_failed = 0;
+       /*
+        * If we are here then we were scanning; however, if we are
+        * also mid-flight disabling the interface, then wifi_disable
+        * has already cleared the device scanning state and
+        * unreferenced the device, obviating the need to do it here.
+        */
 
-       services = connman_storage_get_services();
-       for (i = 0; services && services[i]; i++) {
-               if (strncmp(services[i], "wifi_", 5) != 0)
-                       continue;
+       if (scanning)
+               connman_device_unref(device);
 
-               keyfile = connman_storage_load_service(services[i]);
-               if (!keyfile)
-                       continue;
+#if defined TIZEN_EXT
+       if (!wifi)
+               goto done;
 
-               value = g_key_file_get_boolean(keyfile,
-                                       services[i], "Hidden", NULL);
-               if (!value) {
-                       g_key_file_free(keyfile);
-                       continue;
-               }
+       if (wifi->scan_pending_network && result != -EIO) {
+               network_connect(wifi->scan_pending_network);
+               wifi->scan_pending_network = NULL;
+               connman_network_set_connecting(wifi->network);
+       } else if (connman_setting_get_bool("WifiRoaming") && wifi->network) {
+               bssid_list = connman_network_get_bssid_list(wifi->network);
 
-               value = g_key_file_get_boolean(keyfile,
-                                       services[i], "Favorite", NULL);
-               if (!value) {
-                       g_key_file_free(keyfile);
-                       continue;
-               }
+               if (g_slist_length(bssid_list) <= 1)
+                       goto done;
 
-               ssid = g_key_file_get_string(keyfile,
-                                       services[i], "SSID", NULL);
+               if (!connman_network_get_connected(wifi->network))
+                       goto done;
 
-               name = g_key_file_get_string(keyfile, services[i], "Name",
-                                                               NULL);
+               if (connman_network_get_bool(wifi->network, "WiFi.Roaming"))
+                       goto done;
 
-               ret = add_scan_param(ssid, NULL, 0, 0, scan_data, 0, name);
-               if (ret < 0)
-                       add_param_failed++;
-               else if (ret > 0)
-                       num_ssids++;
+               if (!need_bss_transition(
+                               connman_network_get_frequency(wifi->network),
+                               connman_network_get_snr(wifi->network),
+                               connman_network_get_strength(wifi->network)))
+                       goto done;
 
-               g_free(ssid);
-               g_free(name);
-               g_key_file_free(keyfile);
-       }
+               for (bssid_list; bssid_list; bssid_list = bssid_list->next) {
+                       struct g_connman_bssids *bssid = bssid_list->data;
 
-       /*
-        * Check if there are any hidden AP that needs to be provisioned.
-        */
-       entries = connman_config_get_entries("wifi");
-       for (i = 0; entries && entries[i]; i++) {
-               int len;
+                       if (check_bss_condition(bssid->frequency,
+                                       bssid->score_snr, bssid->strength))
+                               roaming_ap_found = true;
+               }
 
-               if (!entries[i]->hidden)
-                       continue;
+               if (roaming_ap_found) {
+                       char bssid_buff[WIFI_BSSID_STR_LEN] = {0,};
+                       char *bssid_str = bssid_buff;
+                       unsigned char *bssid;
 
-               if (!entries[i]->ssid) {
-                       ssid = entries[i]->name;
-                       len = strlen(ssid);
-               } else {
-                       ssid = entries[i]->ssid;
-                       len = entries[i]->ssid_len;
+                       bssid = connman_network_get_bssid(wifi->network);
+                       snprintf(bssid_str, WIFI_BSSID_STR_LEN, MACSTR, MAC2STR(bssid));
+                       connman_network_set_string(wifi->network,
+                                       "WiFi.RoamingCurBSSID", bssid_str);
+
+                       network_disconnect(wifi->network);
+                       wifi->pending_network = wifi->network;
+                       connman_network_set_bool(wifi->network, "WiFi.Roaming", true);
                }
+       }
 
-               if (!ssid)
-                       continue;
+done:
+       if (is_wifi_notifier_registered != true &&
+                       wifi_first_scan == true && found_with_first_scan == true) {
+               wifi_first_scan = false;
+               found_with_first_scan = false;
 
-               ret = add_scan_param(NULL, ssid, len, 0, scan_data, 0, ssid);
-               if (ret < 0)
-                       add_param_failed++;
-               else if (ret > 0)
-                       num_ssids++;
+               connman_notifier_register(&notifier);
+               is_wifi_notifier_registered = true;
        }
+#endif
+}
 
-       connman_config_free_entries(entries);
+static void scan_callback_hidden(int result,
+                       GSupplicantInterface *interface, void *user_data)
+{
+       struct connman_device *device = user_data;
+       struct wifi_data *wifi = connman_device_get_data(device);
+       GSupplicantScanParams *scan_params;
+       int ret;
 
-       if (add_param_failed > 0)
-               DBG("Unable to scan %d out of %d SSIDs",
-                                       add_param_failed, num_ssids);
+       DBG("result %d wifi %p", result, wifi);
 
-       g_strfreev(services);
+       if (!wifi)
+               goto out;
 
-       return num_ssids;
+       /* User is trying to connect to a hidden AP */
+       if (wifi->hidden && wifi->postpone_hidden)
+               goto out;
+
+       scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+       if (!scan_params)
+               goto out;
+
+       if (get_hidden_connections_params(wifi, scan_params) > 0) {
+               ret = g_supplicant_interface_scan(wifi->interface,
+                                                       scan_params,
+#if defined TIZEN_EXT
+                                                       scan_callback,
+#else
+                                                       scan_callback_hidden,
+#endif
+                                                       device);
+               if (ret == 0)
+                       return;
+       }
+
+       g_supplicant_free_scan_params(scan_params);
+
+out:
+       scan_callback(result, interface, user_data);
 }
 
-static int get_hidden_connections_params(struct wifi_data *wifi,
-                                       GSupplicantScanParams *scan_params)
+static gboolean autoscan_timeout(gpointer data)
 {
-       int driver_max_ssids, i;
-       GSupplicantScanParams *orig_params;
+       struct connman_device *device = data;
+       struct wifi_data *wifi = connman_device_get_data(device);
+       struct autoscan_params *autoscan;
+       int interval;
 
-       /*
-        * Scan hidden networks so that we can autoconnect to them.
-        * We will assume 1 as a default number of ssid to scan.
-        */
-       driver_max_ssids = g_supplicant_interface_get_max_scan_ssids(
-                                                       wifi->interface);
-       if (driver_max_ssids == 0)
-               driver_max_ssids = 1;
+       if (!wifi)
+               return FALSE;
 
-       DBG("max ssids %d", driver_max_ssids);
+       autoscan = wifi->autoscan;
 
-       if (!wifi->scan_params) {
-               wifi->scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
-               if (!wifi->scan_params)
-                       return 0;
+#if defined TIZEN_EXT
+       if (!autoscan)
+               return FALSE;
+#endif
 
-               if (get_hidden_connections(wifi->scan_params) == 0) {
-                       g_supplicant_free_scan_params(wifi->scan_params);
-                       wifi->scan_params = NULL;
+       if (autoscan->interval <= 0) {
+               interval = autoscan->base;
+               goto set_interval;
+       } else
+               interval = autoscan->interval * autoscan->base;
 
-                       return 0;
-               }
-       }
+#if defined TIZEN_EXT
+       if (autoscan->interval >= autoscan->limit)
+#else
+       if (interval > autoscan->limit)
+#endif
+               interval = autoscan->limit;
 
-       orig_params = wifi->scan_params;
+       throw_wifi_scan(wifi->device, scan_callback_hidden);
 
-       /* Let's transfer driver_max_ssids params */
-       for (i = 0; i < driver_max_ssids; i++) {
-               struct scan_ssid *ssid;
+       /*
+        * In case BackgroundScanning is disabled, interval will reach the
+        * limit exactly after the very first passive scanning. It allows
+        * to ensure at most one passive scan is performed in such cases.
+        */
+       if (!connman_setting_get_bool("BackgroundScanning") &&
+                                       interval == autoscan->limit) {
+               g_source_remove(autoscan->timeout);
+               autoscan->timeout = 0;
 
-               if (!wifi->scan_params->ssids)
-                       break;
+               connman_device_unref(device);
 
-               ssid = orig_params->ssids->data;
-               orig_params->ssids = g_slist_remove(orig_params->ssids, ssid);
-               scan_params->ssids = g_slist_prepend(scan_params->ssids, ssid);
+               return FALSE;
        }
 
-       if (i > 0) {
-               scan_params->num_ssids = i;
-               scan_params->ssids = g_slist_reverse(scan_params->ssids);
+set_interval:
+       DBG("interval %d", interval);
+
+       autoscan->interval = interval;
+
+       autoscan->timeout = g_timeout_add_seconds(interval,
+                                               autoscan_timeout, device);
+
+       return FALSE;
+}
+
+static void start_autoscan(struct connman_device *device)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+       struct autoscan_params *autoscan;
 
-               if (orig_params->num_freqs <= 0)
-                       goto err;
+       DBG("");
 
-               scan_params->freqs =
-                       g_malloc(sizeof(uint16_t) * orig_params->num_freqs);
-               memcpy(scan_params->freqs, orig_params->freqs,
-                       sizeof(uint16_t) *orig_params->num_freqs);
+       if (!wifi)
+               return;
 
-               scan_params->num_freqs = orig_params->num_freqs;
+       if (wifi->p2p_device)
+               return;
 
-       } else
-               goto err;
+       if (wifi->connected)
+               return;
 
-       orig_params->num_ssids -= scan_params->num_ssids;
+       autoscan = wifi->autoscan;
+       if (!autoscan)
+               return;
 
-       return scan_params->num_ssids;
+       if (autoscan->timeout > 0 || autoscan->interval > 0)
+               return;
 
-err:
-       g_slist_free_full(scan_params->ssids, g_free);
-       g_supplicant_free_scan_params(wifi->scan_params);
-       wifi->scan_params = NULL;
+       connman_device_ref(device);
 
-       return 0;
+       autoscan_timeout(device);
 }
 
-static int throw_wifi_scan(struct connman_device *device,
-                       GSupplicantInterfaceCallback callback)
+static struct autoscan_params *parse_autoscan_params(const char *params)
 {
-       struct wifi_data *wifi = connman_device_get_data(device);
-       int ret;
+       struct autoscan_params *autoscan;
+       char **list_params;
+       int limit;
+       int base;
 
-       if (!wifi)
-               return -ENODEV;
+       DBG("");
 
-       DBG("device %p %p", device, wifi->interface);
+       list_params = g_strsplit(params, ":", 0);
+       if (list_params == 0)
+               return NULL;
 
-       if (wifi->tethering)
-               return -EBUSY;
+       if (!g_strcmp0(list_params[0], "exponential") &&
+                               g_strv_length(list_params) == 3) {
+               base = atoi(list_params[1]);
+               limit = atoi(list_params[2]);
+       } else if (!g_strcmp0(list_params[0], "single") &&
+                               g_strv_length(list_params) == 2)
+               base = limit = atoi(list_params[1]);
+       else {
+               g_strfreev(list_params);
+               return NULL;
+       }
 
-       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI))
-               return -EALREADY;
+       DBG("Setup %s autoscanning", list_params[0]);
 
-       connman_device_ref(device);
+       g_strfreev(list_params);
 
-       ret = g_supplicant_interface_scan(wifi->interface, NULL,
-                                               callback, device);
-       if (ret == 0) {
-               connman_device_set_scanning(device,
-                               CONNMAN_SERVICE_TYPE_WIFI, true);
-       } else
-               connman_device_unref(device);
+       autoscan = g_try_malloc0(sizeof(struct autoscan_params));
+       if (!autoscan) {
+               DBG("Could not allocate memory for autoscan");
+               return NULL;
+       }
 
-       return ret;
+       DBG("base %d - limit %d", base, limit);
+       autoscan->base = base;
+       autoscan->limit = limit;
+
+       return autoscan;
 }
 
-static void hidden_free(struct hidden_params *hidden)
+static void setup_autoscan(struct wifi_data *wifi)
 {
-       if (!hidden)
+       /*
+        * If BackgroundScanning is enabled, setup exponential
+        * autoscanning if it has not been previously done.
+        */
+       if (connman_setting_get_bool("BackgroundScanning")) {
+               wifi->autoscan = parse_autoscan_params(AUTOSCAN_EXPONENTIAL);
                return;
+       }
+#if defined TIZEN_EXT
+       else {
+               if (wifi->autoscan) {
+                       g_free(wifi->autoscan);
+                       wifi->autoscan = NULL;
+               }
 
-       if (hidden->scan_params)
-               g_supplicant_free_scan_params(hidden->scan_params);
-       g_free(hidden->identity);
-       g_free(hidden->passphrase);
-       g_free(hidden->security);
-       g_free(hidden);
+               DBG("BackgroundScanning is disabled");
+
+               return;
+       }
+#else
+
+       /*
+        * On the contrary, if BackgroundScanning is disabled, update autoscan
+        * parameters based on the type of scanning that is being performed.
+        */
+       if (wifi->autoscan) {
+               g_free(wifi->autoscan);
+               wifi->autoscan = NULL;
+       }
+
+       switch (wifi->scanning_type) {
+       case WIFI_SCANNING_PASSIVE:
+               /* Do not setup autoscan. */
+               break;
+       case WIFI_SCANNING_ACTIVE:
+               /* Setup one single passive scan after active. */
+               wifi->autoscan = parse_autoscan_params(AUTOSCAN_SINGLE);
+               break;
+       case WIFI_SCANNING_UNKNOWN:
+               /* Setup autoscan in this case but we should never fall here. */
+               wifi->autoscan = parse_autoscan_params(AUTOSCAN_SINGLE);
+               break;
+       }
+#endif
 }
 
-static void scan_callback(int result, GSupplicantInterface *interface,
-                                               void *user_data)
+static void finalize_interface_creation(struct wifi_data *wifi)
 {
-       struct connman_device *device = user_data;
-       struct wifi_data *wifi = connman_device_get_data(device);
-       bool scanning;
+       DBG("interface is ready wifi %p tethering %d", wifi, wifi->tethering);
 
-       DBG("result %d wifi %p", result, wifi);
+       if (!wifi->device) {
+               connman_error("WiFi device not set");
+               return;
+       }
 
-       if (wifi) {
-               if (wifi->hidden && !wifi->postpone_hidden) {
-                       connman_network_clear_hidden(wifi->hidden->user_data);
-                       hidden_free(wifi->hidden);
-                       wifi->hidden = NULL;
-               }
+       connman_device_set_powered(wifi->device, true);
 
-               if (wifi->scan_params) {
-                       g_supplicant_free_scan_params(wifi->scan_params);
-                       wifi->scan_params = NULL;
-               }
-       }
+       if (wifi->p2p_device)
+               return;
 
-       if (result < 0)
-               connman_device_reset_scanning(device);
+       if (!wifi->autoscan)
+               setup_autoscan(wifi);
 
-       /* User is connecting to a hidden AP, let's wait for finished event */
-       if (wifi && wifi->hidden && wifi->postpone_hidden) {
-               GSupplicantScanParams *scan_params;
-               int ret;
+       start_autoscan(wifi->device);
+}
 
-               wifi->postpone_hidden = false;
-               scan_params = wifi->hidden->scan_params;
-               wifi->hidden->scan_params = NULL;
+static void interface_create_callback(int result,
+                                       GSupplicantInterface *interface,
+                                                       void *user_data)
+{
+       struct wifi_data *wifi = user_data;
+       char *bgscan_range_max;
+       long value;
 
-               reset_autoscan(device);
+       DBG("result %d ifname %s, wifi %p", result,
+                               g_supplicant_interface_get_ifname(interface),
+                               wifi);
 
-               ret = g_supplicant_interface_scan(wifi->interface, scan_params,
-                                                       scan_callback, device);
-               if (ret == 0)
-                       return;
+       if (result < 0 || !wifi)
+               return;
 
-               /* On error, let's recall scan_callback, which will cleanup */
-               return scan_callback(ret, interface, user_data);
+       wifi->interface = interface;
+       g_supplicant_interface_set_data(interface, wifi);
+
+       if (g_supplicant_interface_get_ready(interface)) {
+               wifi->interface_ready = true;
+               finalize_interface_creation(wifi);
        }
 
-       scanning = connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI);
+       /*
+        * Set the BSS expiration age to match the long scanning
+        * interval to avoid the loss of unconnected networks between
+        * two scans.
+        */
+       bgscan_range_max = strrchr(BGSCAN_DEFAULT, ':');
+       if (!bgscan_range_max || strlen(bgscan_range_max) < 1)
+               return;
 
-       if (scanning) {
-               connman_device_set_scanning(device,
-                               CONNMAN_SERVICE_TYPE_WIFI, false);
+       value = strtol(bgscan_range_max + 1, NULL, 10);
+       if (value <= 0 || errno == ERANGE)
+               return;
+
+       if (g_supplicant_interface_set_bss_expiration_age(interface,
+                                       value + SCAN_MAX_DURATION) < 0) {
+               connman_warn("Failed to set bss expiration age");
        }
+}
 
-       if (result != -ENOLINK)
-               start_autoscan(device);
+static int wifi_enable(struct connman_device *device)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+       int index;
+       char *interface;
+       const char *driver = connman_setting_get_string("wifi");
+       int ret;
 
-       /*
-        * If we are here then we were scanning; however, if we are
-        * also mid-flight disabling the interface, then wifi_disable
-        * has already cleared the device scanning state and
-        * unreferenced the device, obviating the need to do it here.
-        */
+       DBG("device %p %p", device, wifi);
 
-       if (scanning)
-               connman_device_unref(device);
+       index = connman_device_get_index(device);
+       if (!wifi || index < 0)
+               return -ENODEV;
+
+       if (is_p2p_connecting())
+               return -EINPROGRESS;
+
+       interface = connman_inet_ifname(index);
+       ret = g_supplicant_interface_create(interface, driver, NULL,
+#ifdef TIZEN_EXT
+                       connman_device_get_mac_policy(device),
+                       connman_device_get_preassoc_mac_policy(device),
+                       connman_device_get_random_mac_lifetime(device),
+#endif /* TIZEN_EXT */
+                                               interface_create_callback,
+                                                       wifi);
+       g_free(interface);
+
+       if (ret < 0)
+               return ret;
+
+       return -EINPROGRESS;
 }
 
-static void scan_callback_hidden(int result,
-                       GSupplicantInterface *interface, void *user_data)
+static int wifi_disable(struct connman_device *device)
 {
-       struct connman_device *device = user_data;
        struct wifi_data *wifi = connman_device_get_data(device);
-       GSupplicantScanParams *scan_params;
        int ret;
 
-       DBG("result %d wifi %p", result, wifi);
+       DBG("device %p wifi %p", device, wifi);
 
        if (!wifi)
-               goto out;
+               return -ENODEV;
 
-       /* User is trying to connect to a hidden AP */
-       if (wifi->hidden && wifi->postpone_hidden)
-               goto out;
+       wifi->connected = false;
+       wifi->disconnecting = false;
 
-       scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
-       if (!scan_params)
-               goto out;
+       if (wifi->pending_network)
+               wifi->pending_network = NULL;
 
-       if (get_hidden_connections_params(wifi, scan_params) > 0) {
-               ret = g_supplicant_interface_scan(wifi->interface,
-                                                       scan_params,
-                                                       scan_callback_hidden,
-                                                       device);
-               if (ret == 0)
-                       return;
-       }
+#if !defined TIZEN_EXT
+       stop_autoscan(device);
+#endif
 
-       g_supplicant_free_scan_params(scan_params);
+       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_P2P)) {
+               g_source_remove(wifi->p2p_find_timeout);
+               wifi->p2p_find_timeout = 0;
+               connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_P2P, false);
+               connman_device_unref(wifi->device);
+       }
 
-out:
-       scan_callback(result, interface, user_data);
-}
+#if defined TIZEN_EXT
+       if (wifi->automaxspeed_timeout != 0) {
+               g_source_remove(wifi->automaxspeed_timeout);
+               wifi->automaxspeed_timeout = 0;
+       }
+#endif
 
-static gboolean autoscan_timeout(gpointer data)
-{
-       struct connman_device *device = data;
-       struct wifi_data *wifi = connman_device_get_data(device);
-       struct autoscan_params *autoscan;
-       int interval;
+       /* In case of a user scan, device is still referenced */
+       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI)) {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, false);
+               connman_device_unref(wifi->device);
+       }
 
-       if (!wifi)
-               return FALSE;
+#if defined TIZEN_EXT
+       stop_autoscan(device);
+#endif
 
-       autoscan = wifi->autoscan;
+       remove_networks(device, wifi);
+       remove_peers(wifi);
 
-       if (autoscan->interval <= 0) {
-               interval = autoscan->base;
-               goto set_interval;
-       } else
-               interval = autoscan->interval * autoscan->base;
+#if defined TIZEN_EXT
+       wifi->scan_pending_network = NULL;
 
-       if (interval > autoscan->limit)
-               interval = autoscan->limit;
+       if (is_wifi_notifier_registered == true) {
+               connman_notifier_unregister(&notifier);
+               is_wifi_notifier_registered = false;
+       }
+#endif
 
-       throw_wifi_scan(wifi->device, scan_callback_hidden);
+       ret = g_supplicant_interface_remove(wifi->interface, NULL, NULL);
+       if (ret < 0)
+               return ret;
 
-       /*
-        * In case BackgroundScanning is disabled, interval will reach the
-        * limit exactly after the very first passive scanning. It allows
-        * to ensure at most one passive scan is performed in such cases.
-        */
-       if (!connman_setting_get_bool("BackgroundScanning") &&
-                                       interval == autoscan->limit) {
-               g_source_remove(autoscan->timeout);
-               autoscan->timeout = 0;
+       return -EINPROGRESS;
+}
 
-               connman_device_unref(device);
+static int get_latest_connections(int max_ssids,
+                               GSupplicantScanParams *scan_data)
+{
+       GSequenceIter *iter;
+       GSequence *latest_list;
+       struct last_connected *entry;
+       GKeyFile *keyfile;
+       GTimeVal modified;
+       gchar **services;
+       gchar *str;
+       char *ssid;
+       int i, freq;
+       int num_ssids = 0;
 
-               return FALSE;
-       }
+       latest_list = g_sequence_new(free_entry);
+       if (!latest_list)
+               return -ENOMEM;
 
-set_interval:
-       DBG("interval %d", interval);
+       services = connman_storage_get_services();
+       for (i = 0; services && services[i]; i++) {
+               if (strncmp(services[i], "wifi_", 5) != 0)
+                       continue;
 
-       autoscan->interval = interval;
+               keyfile = connman_storage_load_service(services[i]);
+               if (!keyfile)
+                       continue;
 
-       autoscan->timeout = g_timeout_add_seconds(interval,
-                                               autoscan_timeout, device);
+               str = g_key_file_get_string(keyfile,
+                                       services[i], "Favorite", NULL);
+               if (!str || g_strcmp0(str, "true")) {
+                       g_free(str);
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+               g_free(str);
 
-       return FALSE;
-}
+               str = g_key_file_get_string(keyfile,
+                                       services[i], "AutoConnect", NULL);
+               if (!str || g_strcmp0(str, "true")) {
+                       g_free(str);
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+               g_free(str);
 
-static void start_autoscan(struct connman_device *device)
-{
-       struct wifi_data *wifi = connman_device_get_data(device);
-       struct autoscan_params *autoscan;
+               str = g_key_file_get_string(keyfile,
+                                       services[i], "Modified", NULL);
+               if (!str) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+               util_iso8601_to_timeval(str, &modified);
+               g_free(str);
 
-       DBG("");
+               ssid = g_key_file_get_string(keyfile,
+                                       services[i], "SSID", NULL);
 
-       if (!wifi)
-               return;
+               freq = g_key_file_get_integer(keyfile, services[i],
+                                       "Frequency", NULL);
+               if (freq) {
+                       entry = g_try_new(struct last_connected, 1);
+                       if (!entry) {
+                               g_sequence_free(latest_list);
+                               g_key_file_free(keyfile);
+                               g_free(ssid);
+#if defined TIZEN_EXT
+                               g_strfreev(services);
+#endif
+                               return -ENOMEM;
+                       }
 
-       if (wifi->p2p_device)
-               return;
+                       entry->ssid = ssid;
+                       entry->modified = modified;
+                       entry->freq = freq;
 
-       if (wifi->connected)
-               return;
+                       g_sequence_insert_sorted(latest_list, entry,
+                                               sort_entry, NULL);
+                       num_ssids++;
+               } else
+                       g_free(ssid);
 
-       autoscan = wifi->autoscan;
-       if (!autoscan)
-               return;
+               g_key_file_free(keyfile);
+       }
 
-       if (autoscan->timeout > 0 || autoscan->interval > 0)
-               return;
+       g_strfreev(services);
 
-       connman_device_ref(device);
+       num_ssids = num_ssids > max_ssids ? max_ssids : num_ssids;
 
-       autoscan_timeout(device);
-}
+       iter = g_sequence_get_begin_iter(latest_list);
 
-static struct autoscan_params *parse_autoscan_params(const char *params)
-{
-       struct autoscan_params *autoscan;
-       char **list_params;
-       int limit;
-       int base;
+       for (i = 0; i < num_ssids; i++) {
+               entry = g_sequence_get(iter);
 
-       DBG("");
+               DBG("ssid %s freq %d modified %lu", entry->ssid, entry->freq,
+                                               entry->modified.tv_sec);
 
-       list_params = g_strsplit(params, ":", 0);
-       if (list_params == 0)
-               return NULL;
+               add_scan_param(entry->ssid, NULL, 0, entry->freq, scan_data,
+                                               max_ssids, entry->ssid);
 
-       if (!g_strcmp0(list_params[0], "exponential") &&
-                               g_strv_length(list_params) == 3) {
-               base = atoi(list_params[1]);
-               limit = atoi(list_params[2]);
-       } else if (!g_strcmp0(list_params[0], "single") &&
-                               g_strv_length(list_params) == 2)
-               base = limit = atoi(list_params[1]);
-       else {
-               g_strfreev(list_params);
-               return NULL;
+               iter = g_sequence_iter_next(iter);
        }
 
-       DBG("Setup %s autoscanning", list_params[0]);
+       g_sequence_free(latest_list);
+       return num_ssids;
+}
 
-       g_strfreev(list_params);
+static void wifi_update_scanner_type(struct wifi_data *wifi,
+                                       enum wifi_scanning_type new_type)
+{
+       DBG("");
 
-       autoscan = g_try_malloc0(sizeof(struct autoscan_params));
-       if (!autoscan) {
-               DBG("Could not allocate memory for autoscan");
-               return NULL;
-       }
+       if (!wifi || wifi->scanning_type == new_type)
+               return;
 
-       DBG("base %d - limit %d", base, limit);
-       autoscan->base = base;
-       autoscan->limit = limit;
+       wifi->scanning_type = new_type;
 
-       return autoscan;
+       setup_autoscan(wifi);
 }
 
-static void setup_autoscan(struct wifi_data *wifi)
+static int wifi_scan_simple(struct connman_device *device)
 {
-       /*
-        * If BackgroundScanning is enabled, setup exponential
-        * autoscanning if it has not been previously done.
-        */
-       if (connman_setting_get_bool("BackgroundScanning")) {
-               wifi->autoscan = parse_autoscan_params(AUTOSCAN_EXPONENTIAL);
-               return;
-       }
+       struct wifi_data *wifi = connman_device_get_data(device);
 
-       /*
-        * On the contrary, if BackgroundScanning is disabled, update autoscan
-        * parameters based on the type of scanning that is being performed.
-        */
-       if (wifi->autoscan) {
-               g_free(wifi->autoscan);
-               wifi->autoscan = NULL;
-       }
+       reset_autoscan(device);
+
+       /* Distinguish between devices performing passive and active scanning */
+       if (wifi)
+               wifi_update_scanner_type(wifi, WIFI_SCANNING_PASSIVE);
 
-       switch (wifi->scanning_type) {
-       case WIFI_SCANNING_PASSIVE:
-               /* Do not setup autoscan. */
-               break;
-       case WIFI_SCANNING_ACTIVE:
-               /* Setup one single passive scan after active. */
-               wifi->autoscan = parse_autoscan_params(AUTOSCAN_SINGLE);
-               break;
-       case WIFI_SCANNING_UNKNOWN:
-               /* Setup autoscan in this case but we should never fall here. */
-               wifi->autoscan = parse_autoscan_params(AUTOSCAN_SINGLE);
-               break;
-       }
+       return throw_wifi_scan(device, scan_callback_hidden);
 }
 
-static void finalize_interface_creation(struct wifi_data *wifi)
+static gboolean p2p_find_stop(gpointer data)
 {
-       DBG("interface is ready wifi %p tethering %d", wifi, wifi->tethering);
+       struct connman_device *device = data;
+       struct wifi_data *wifi = connman_device_get_data(device);
 
-       if (!wifi->device) {
-               connman_error("WiFi device not set");
-               return;
-       }
+       DBG("");
 
-       connman_device_set_powered(wifi->device, true);
+       if (wifi) {
+               wifi->p2p_find_timeout = 0;
 
-       if (wifi->p2p_device)
-               return;
+               g_supplicant_interface_p2p_stop_find(wifi->interface);
+       }
 
-       if (!wifi->autoscan)
-               setup_autoscan(wifi);
+       connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_P2P, false);
 
-       start_autoscan(wifi->device);
+       connman_device_unref(device);
+       start_autoscan(device);
+
+       return FALSE;
 }
 
-static void interface_create_callback(int result,
-                                       GSupplicantInterface *interface,
+static void p2p_find_callback(int result, GSupplicantInterface *interface,
                                                        void *user_data)
 {
-       struct wifi_data *wifi = user_data;
-       char *bgscan_range_max;
-       long value;
-
-       DBG("result %d ifname %s, wifi %p", result,
-                               g_supplicant_interface_get_ifname(interface),
-                               wifi);
+       struct connman_device *device = user_data;
+       struct wifi_data *wifi = connman_device_get_data(device);
 
-       if (result < 0 || !wifi)
-               return;
+       DBG("result %d wifi %p", result, wifi);
 
-       wifi->interface = interface;
-       g_supplicant_interface_set_data(interface, wifi);
+       if (!wifi)
+               goto error;
 
-       if (g_supplicant_interface_get_ready(interface)) {
-               wifi->interface_ready = true;
-               finalize_interface_creation(wifi);
+       if (wifi->p2p_find_timeout) {
+               g_source_remove(wifi->p2p_find_timeout);
+               wifi->p2p_find_timeout = 0;
        }
 
-       /*
-        * Set the BSS expiration age to match the long scanning
-        * interval to avoid the loss of unconnected networks between
-        * two scans.
-        */
-       bgscan_range_max = strrchr(BGSCAN_DEFAULT, ':');
-       if (!bgscan_range_max || strlen(bgscan_range_max) < 1)
-               return;
+       if (result)
+               goto error;
 
-       value = strtol(bgscan_range_max + 1, NULL, 10);
-       if (value <= 0 || errno == ERANGE)
-               return;
+       wifi->p2p_find_timeout = g_timeout_add_seconds(P2P_FIND_TIMEOUT,
+                                                       p2p_find_stop, device);
+       if (!wifi->p2p_find_timeout)
+               goto error;
 
-       if (g_supplicant_interface_set_bss_expiration_age(interface,
-                                       value + SCAN_MAX_DURATION) < 0) {
-               connman_warn("Failed to set bss expiration age");
-       }
+       return;
+error:
+       p2p_find_stop(device);
 }
 
-static int wifi_enable(struct connman_device *device)
+static int p2p_find(struct connman_device *device)
 {
-       struct wifi_data *wifi = connman_device_get_data(device);
-       int index;
-       char *interface;
-       const char *driver = connman_setting_get_string("wifi");
+       struct wifi_data *wifi;
        int ret;
 
-       DBG("device %p %p", device, wifi);
+       DBG("");
 
-       index = connman_device_get_index(device);
-       if (!wifi || index < 0)
-               return -ENODEV;
+       if (!p2p_technology)
+               return -ENOTSUP;
 
-       if (is_p2p_connecting())
-               return -EINPROGRESS;
+       wifi = connman_device_get_data(device);
 
-       interface = connman_inet_ifname(index);
-       ret = g_supplicant_interface_create(interface, driver, NULL,
-                                               interface_create_callback,
-                                                       wifi);
-       g_free(interface);
+       if (g_supplicant_interface_is_p2p_finding(wifi->interface))
+               return -EALREADY;
 
-       if (ret < 0)
-               return ret;
+       reset_autoscan(device);
+       connman_device_ref(device);
 
-       return -EINPROGRESS;
+       ret = g_supplicant_interface_p2p_find(wifi->interface,
+                                               p2p_find_callback, device);
+       if (ret) {
+               connman_device_unref(device);
+               start_autoscan(device);
+       } else {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_P2P, true);
+       }
+
+       return ret;
 }
 
-static int wifi_disable(struct connman_device *device)
+#if defined TIZEN_EXT
+static void specific_scan_callback(int result, GSupplicantInterface *interface,
+                                               void *user_data)
 {
+       struct connman_device *device = user_data;
        struct wifi_data *wifi = connman_device_get_data(device);
-       int ret;
+       bool scanning;
 
-       DBG("device %p wifi %p", device, wifi);
+       DBG("result %d wifi %p", result, wifi);
+
+       if (wifi && wifi->scan_params) {
+               g_supplicant_free_scan_params(wifi->scan_params);
+               wifi->scan_params = NULL;
+       }
+
+       scanning = connman_device_get_scanning(device,
+                                              CONNMAN_SERVICE_TYPE_WIFI);
+       if (scanning) {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, false);
+               connman_device_unref(device);
+       }
+}
+
+static int wifi_specific_scan(enum connman_service_type type,
+                       struct connman_device *device, int scan_type,
+                       GSList *specific_scan_list, void *user_data)
+{
+       GSList *list = NULL;
+       char *ssid = NULL;
+       struct wifi_data *wifi = connman_device_get_data(device);
+       GSupplicantScanParams *scan_params = NULL;
+       struct scan_ssid *scan_ssid = NULL;
+       bool scanning;
+       int ret;
+       int freq;
+       int count = 0;
 
        if (!wifi)
                return -ENODEV;
 
-       wifi->connected = false;
-       wifi->disconnecting = false;
+       if (wifi->p2p_device)
+               return 0;
 
-       if (wifi->pending_network)
-               wifi->pending_network = NULL;
+       if (type == CONNMAN_SERVICE_TYPE_P2P)
+               return p2p_find(device);
 
-       stop_autoscan(device);
+       if (wifi->tethering)
+               return 0;
 
-       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_P2P)) {
-               g_source_remove(wifi->p2p_find_timeout);
-               wifi->p2p_find_timeout = 0;
-               connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_P2P, false);
-               connman_device_unref(wifi->device);
-       }
+       scanning =
+               connman_device_get_scanning(device,
+                                           CONNMAN_SERVICE_TYPE_WIFI);
+       if (scanning)
+               return -EALREADY;
 
-       /* In case of a user scan, device is still referenced */
-       if (connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_WIFI)) {
-               connman_device_set_scanning(device,
-                               CONNMAN_SERVICE_TYPE_WIFI, false);
-               connman_device_unref(wifi->device);
-       }
+       DBG("scan_type: %d", scan_type);
+       if (scan_type == CONNMAN_MULTI_SCAN_SSID) { /* ssid based scan */
+               scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!scan_params) {
+                       DBG("Failed to allocate memory.");
+                       return -ENOMEM;
+               }
 
-       remove_networks(device, wifi);
-       remove_peers(wifi);
+               for (list = specific_scan_list; list; list = list->next) {
+                       ssid = (char *)list->data;
+                       int ssid_len = strlen(ssid);
 
-       ret = g_supplicant_interface_remove(wifi->interface, NULL, NULL);
-       if (ret < 0)
-               return ret;
+                       scan_ssid = g_try_new0(struct scan_ssid, 1);
+                       if (!scan_ssid) {
+                               DBG("Failed to allocate memory.");
+                               g_supplicant_free_scan_params(scan_params);
+                               return -ENOMEM;
+                       }
 
-       return -EINPROGRESS;
-}
+                       memcpy(scan_ssid->ssid, ssid, (ssid_len + 1));
+                       /* DBG("scan ssid %s len: %d", scan_ssid->ssid, ssid_len); */
+                       scan_ssid->ssid_len = ssid_len;
+                       scan_params->ssids = g_slist_prepend(scan_params->ssids, scan_ssid);
+                       count++;
+               }
+               scan_params->num_ssids = count;
 
-struct last_connected {
-       struct timeval modified;
-       gchar *ssid;
-       int freq;
-};
+       } else if (scan_type == CONNMAN_MULTI_SCAN_FREQ) { /* frequency based scan */
 
-static gint sort_entry(gconstpointer a, gconstpointer b, gpointer user_data)
-{
-       struct timeval *aval = (struct timeval *)a;
-       struct timeval *bval = (struct timeval *)b;
+               scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!scan_params) {
+                       DBG("Failed to allocate memory.");
+                       return -ENOMEM;
+               }
 
-       /* Note that the sort order is descending */
-       if (aval->tv_sec < bval->tv_sec)
-               return 1;
+               guint num_freqs = g_slist_length(specific_scan_list);
+               DBG("num_freqs: %d", num_freqs);
 
-       if (aval->tv_sec > bval->tv_sec)
-               return -1;
+               scan_params->freqs = g_try_new0(uint16_t, num_freqs);
+               if (!scan_params->freqs) {
+                       DBG("Failed to allocate memory.");
+                       g_free(scan_params);
+                       return -ENOMEM;
+               }
 
-       return 0;
-}
+               count = 0;
+               for (list = specific_scan_list; list; list = list->next) {
+                       freq = (int)list->data;
 
-static void free_entry(gpointer data)
-{
-       struct last_connected *entry = data;
+                       scan_params->freqs[count] = freq;
+                       DBG("scan_params->freqs[%d]: %d", count, scan_params->freqs[count]);
+                       count++;
+               }
+               scan_params->num_freqs = count;
 
-       g_free(entry->ssid);
-       g_free(entry);
+       } else if (scan_type == CONNMAN_MULTI_SCAN_SSID_FREQ) { /* SSID & Frequency mixed scan */
+               int freq_count, ap_count;
+               scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!scan_params) {
+                       DBG("Failed to allocate memory.");
+                       return -ENOMEM;
+               }
+
+               guint size = g_slist_length(specific_scan_list);
+
+               scan_params->freqs = g_try_new0(uint16_t, size/2);
+               if (!scan_params->freqs) {
+                       DBG("Failed to allocate memory.");
+                       g_free(scan_params);
+                       return -ENOMEM;
+               }
+
+               ap_count = freq_count = 0;
+               for (list = specific_scan_list; list; list = list->next) {
+                       if (((connman_multi_scan_ap_s *)list->data)->flag == true) { /** ssid */
+                               ssid = ((connman_multi_scan_ap_s *)list->data)->str;
+                               int ssid_len = strlen(ssid);
+
+                               scan_ssid = g_try_new0(struct scan_ssid, 1);
+                               if (!scan_ssid) {
+                                       DBG("Failed to allocate memory.");
+                                       g_supplicant_free_scan_params(scan_params);
+                                       return -ENOMEM;
+                               }
+
+                               memcpy(scan_ssid->ssid, ssid, (ssid_len + 1));
+                               /* DBG("scan ssid %s len: %d", scan_ssid->ssid, ssid_len); */
+                               scan_ssid->ssid_len = ssid_len;
+                               scan_params->ssids = g_slist_prepend(scan_params->ssids, scan_ssid);
+                               ap_count++;
+
+                       } else { /* freq */
+                               freq = atoi(((connman_multi_scan_ap_s *)list->data)->str);
+                               scan_params->freqs[freq_count] = freq;
+                               DBG("scan_params->freqs[%d]: %d", freq_count, scan_params->freqs[freq_count]);
+                               freq_count++;
+                       }
+               }
+               scan_params->num_ssids = ap_count;
+               scan_params->num_freqs = freq_count;
+       } else {
+               DBG("Invalid scan");
+               return -EINVAL;
+       }
+
+       reset_autoscan(device);
+       connman_device_ref(device);
+
+       ret = g_supplicant_interface_scan(wifi->interface, scan_params,
+                                               specific_scan_callback, device);
+
+       if (ret == 0) {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, true);
+       } else {
+               g_supplicant_free_scan_params(scan_params);
+               connman_device_unref(device);
+       }
+
+       return ret;
 }
 
-static int get_latest_connections(int max_ssids,
-                               GSupplicantScanParams *scan_data)
+static void wifi_mac_policy_callback(int result,
+                                       unsigned int policy,
+                                               void *user_data)
 {
-       GSequenceIter *iter;
-       GSequence *latest_list;
-       struct last_connected *entry;
-       GKeyFile *keyfile;
-       struct timeval modified;
-       gchar **services;
-       gchar *str;
-       char *ssid;
-       int i, freq;
-       int num_ssids = 0;
-
-       latest_list = g_sequence_new(free_entry);
-       if (!latest_list)
-               return -ENOMEM;
+       struct connman_device *device = user_data;
 
-       services = connman_storage_get_services();
-       for (i = 0; services && services[i]; i++) {
-               if (strncmp(services[i], "wifi_", 5) != 0)
-                       continue;
+       if (result == 0)
+               connman_device_mac_policy_notify(device, result, policy);
 
-               keyfile = connman_storage_load_service(services[i]);
-               if (!keyfile)
-                       continue;
+       connman_device_unref(device);
+}
 
-               str = g_key_file_get_string(keyfile,
-                                       services[i], "Favorite", NULL);
-               if (!str || g_strcmp0(str, "true")) {
-                       g_free(str);
-                       g_key_file_free(keyfile);
-                       continue;
-               }
-               g_free(str);
+int wifi_set_mac_policy(struct connman_device *device, unsigned int policy)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+       int ret;
 
-               str = g_key_file_get_string(keyfile,
-                                       services[i], "AutoConnect", NULL);
-               if (!str || g_strcmp0(str, "true")) {
-                       g_free(str);
-                       g_key_file_free(keyfile);
-                       continue;
-               }
-               g_free(str);
+       if (!wifi)
+               return -EINVAL;
 
-               str = g_key_file_get_string(keyfile,
-                                       services[i], "Modified", NULL);
-               if (!str) {
-                       g_key_file_free(keyfile);
-                       continue;
-               }
-               util_iso8601_to_timeval(str, &modified);
-               g_free(str);
+       connman_device_ref(device);
 
-               ssid = g_key_file_get_string(keyfile,
-                                       services[i], "SSID", NULL);
+       ret = g_supplicant_interface_set_mac_policy(wifi->interface,
+                                       wifi_mac_policy_callback,
+                                       policy, device);
+       if (ret != 0)
+               connman_device_unref(device);
 
-               freq = g_key_file_get_integer(keyfile, services[i],
-                                       "Frequency", NULL);
-               if (freq) {
-                       entry = g_try_new(struct last_connected, 1);
-                       if (!entry) {
-                               g_sequence_free(latest_list);
-                               g_key_file_free(keyfile);
-                               g_free(ssid);
-                               return -ENOMEM;
-                       }
+       return ret;
+}
 
-                       entry->ssid = ssid;
-                       entry->modified = modified;
-                       entry->freq = freq;
+static void wifi_preassoc_mac_policy_callback(int result,
+                                       unsigned int policy,
+                                               void *user_data)
+{
+       struct connman_device *device = user_data;
 
-                       g_sequence_insert_sorted(latest_list, entry,
-                                               sort_entry, NULL);
-                       num_ssids++;
-               } else
-                       g_free(ssid);
+       if (result == 0)
+               connman_device_preassoc_mac_policy_notify(device, result, policy);
 
-               g_key_file_free(keyfile);
-       }
+       connman_device_unref(device);
+}
 
-       g_strfreev(services);
+int wifi_set_preassoc_mac_policy(struct connman_device *device, unsigned int policy)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+       int ret;
 
-       num_ssids = num_ssids > max_ssids ? max_ssids : num_ssids;
+       if (!wifi)
+               return -EINVAL;
 
-       iter = g_sequence_get_begin_iter(latest_list);
+       connman_device_ref(device);
 
-       for (i = 0; i < num_ssids; i++) {
-               entry = g_sequence_get(iter);
+       ret = g_supplicant_interface_set_preassoc_mac_policy(wifi->interface,
+                                       wifi_preassoc_mac_policy_callback,
+                                       policy, device);
+       if (ret != 0)
+               connman_device_unref(device);
 
-               DBG("ssid %s freq %d modified %lu", entry->ssid, entry->freq,
-                                               entry->modified.tv_sec);
+       return ret;
+}
 
-               add_scan_param(entry->ssid, NULL, 0, entry->freq, scan_data,
-                                               max_ssids, entry->ssid);
+static void wifi_random_mac_lifetime_callback(int result,
+                                       unsigned int lifetime,
+                                               void *user_data)
+{
+       struct connman_device *device = user_data;
 
-               iter = g_sequence_iter_next(iter);
-       }
+       if (result == 0)
+               connman_device_random_mac_lifetime_notify(device, result, lifetime);
 
-       g_sequence_free(latest_list);
-       return num_ssids;
+       connman_device_unref(device);
 }
 
-static void wifi_update_scanner_type(struct wifi_data *wifi,
-                                       enum wifi_scanning_type new_type)
+int wifi_set_random_mac_lifetime(struct connman_device *device, unsigned int lifetime)
 {
-       DBG("");
+       struct wifi_data *wifi = connman_device_get_data(device);
+       int ret;
 
-       if (!wifi || wifi->scanning_type == new_type)
-               return;
+       if (!wifi)
+               return -EINVAL;
 
-       wifi->scanning_type = new_type;
+       connman_device_ref(device);
 
-       setup_autoscan(wifi);
+       ret = g_supplicant_interface_set_random_mac_lifetime(wifi->interface,
+                                       wifi_random_mac_lifetime_callback,
+                                       lifetime, device);
+       if (ret != 0)
+               connman_device_unref(device);
+
+       return ret;
 }
+#endif
 
-static int wifi_scan_simple(struct connman_device *device)
+#if defined TIZEN_EXT_WIFI_MESH
+static void mesh_scan_callback(int result, GSupplicantInterface *interface,
+                                               void *user_data)
 {
+       struct connman_device *device = user_data;
        struct wifi_data *wifi = connman_device_get_data(device);
+       bool scanning;
 
-       reset_autoscan(device);
+       DBG("result %d wifi %p", result, wifi);
 
-       /* Distinguish between devices performing passive and active scanning */
-       if (wifi)
-               wifi_update_scanner_type(wifi, WIFI_SCANNING_PASSIVE);
+       scanning = connman_device_get_scanning(device,
+                                              CONNMAN_SERVICE_TYPE_MESH);
+       if (scanning)
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_MESH, false);
 
-       return throw_wifi_scan(device, scan_callback_hidden);
+       if (scanning)
+               connman_device_unref(device);
 }
 
-static gboolean p2p_find_stop(gpointer data)
+static int mesh_scan(struct connman_device *device)
 {
-       struct connman_device *device = data;
-       struct wifi_data *wifi = connman_device_get_data(device);
+       struct wifi_data *wifi;
+       struct wifi_mesh_info *mesh_info;
+       int ret;
 
        DBG("");
 
-       if (wifi) {
-               wifi->p2p_find_timeout = 0;
+       wifi = connman_device_get_data(device);
 
-               g_supplicant_interface_p2p_stop_find(wifi->interface);
-       }
+       if (!wifi || !wifi->mesh_interface)
+               return -ENOTSUP;
 
-       connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_P2P, false);
+       mesh_info = wifi->mesh_info;
+       reset_autoscan(device);
+       connman_device_ref(device);
 
-       connman_device_unref(device);
-       start_autoscan(device);
+       ret = g_supplicant_interface_scan(mesh_info->interface, NULL,
+                                               mesh_scan_callback, device);
+       if (ret)
+               connman_device_unref(device);
+       else
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_MESH, true);
 
-       return FALSE;
+       return ret;
 }
 
-static void p2p_find_callback(int result, GSupplicantInterface *interface,
-                                                       void *user_data)
+static void abort_scan_callback(int result, GSupplicantInterface *interface,
+                                               void *user_data)
 {
        struct connman_device *device = user_data;
        struct wifi_data *wifi = connman_device_get_data(device);
 
        DBG("result %d wifi %p", result, wifi);
 
-       if (!wifi)
-               goto error;
+       __connman_technology_notify_abort_scan(CONNMAN_SERVICE_TYPE_MESH, result);
+}
 
-       if (wifi->p2p_find_timeout) {
-               g_source_remove(wifi->p2p_find_timeout);
-               wifi->p2p_find_timeout = 0;
-       }
+static int mesh_abort_scan(enum connman_service_type type,
+                                               struct connman_device *device)
+{
+       struct wifi_data *wifi = connman_device_get_data(device);
+       struct wifi_mesh_info *mesh_info;
+       bool scanning;
+       int ret;
 
-       if (result)
-               goto error;
+       if (!wifi || !wifi->mesh_interface)
+               return -ENODEV;
 
-       wifi->p2p_find_timeout = g_timeout_add_seconds(P2P_FIND_TIMEOUT,
-                                                       p2p_find_stop, device);
-       if (!wifi->p2p_find_timeout)
-               goto error;
+       if (type != CONNMAN_SERVICE_TYPE_MESH)
+               return -EINVAL;
 
-       return;
-error:
-       p2p_find_stop(device);
+       mesh_info = wifi->mesh_info;
+
+       scanning = connman_device_get_scanning(device,
+                                              CONNMAN_SERVICE_TYPE_MESH);
+       if (!scanning)
+               return -EEXIST;
+
+       ret = g_supplicant_interface_abort_scan(mesh_info->interface,
+                                               abort_scan_callback, device);
+
+       return ret;
 }
 
-static int p2p_find(struct connman_device *device)
+static int mesh_specific_scan(enum connman_service_type type,
+                             struct connman_device *device, const char *ssid,
+                             unsigned int freq, void *user_data)
 {
-       struct wifi_data *wifi;
+       struct wifi_data *wifi = connman_device_get_data(device);
+       GSupplicantScanParams *scan_params = NULL;
+       struct wifi_mesh_info *mesh_info;
+       struct scan_ssid *scan_ssid;
+       bool scanning;
        int ret;
 
-       DBG("");
+       if (!wifi || !wifi->mesh_interface)
+               return -ENODEV;
 
-       if (!p2p_technology)
-               return -ENOTSUP;
+       if (type != CONNMAN_SERVICE_TYPE_MESH)
+               return -EINVAL;
 
-       wifi = connman_device_get_data(device);
+       if (wifi->p2p_device)
+               return 0;
 
-       if (g_supplicant_interface_is_p2p_finding(wifi->interface))
+       mesh_info = wifi->mesh_info;
+
+       scanning = connman_device_get_scanning(device,
+                                              CONNMAN_SERVICE_TYPE_MESH);
+       if (scanning)
                return -EALREADY;
 
+       scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+       if (!scan_params)
+               return -ENOMEM;
+
+       scan_ssid = g_try_new(struct scan_ssid, 1);
+       if (!scan_ssid) {
+               g_free(scan_params);
+               return -ENOMEM;
+       }
+
+       scan_ssid->ssid_len = strlen(ssid);
+       memcpy(scan_ssid->ssid, ssid, scan_ssid->ssid_len);
+       scan_params->ssids = g_slist_prepend(scan_params->ssids, scan_ssid);
+       scan_params->num_ssids = 1;
+
+       scan_params->freqs = g_try_new(uint16_t, 1);
+       if (!scan_params->freqs) {
+               g_slist_free_full(scan_params->ssids, g_free);
+               g_free(scan_params);
+               return -ENOMEM;
+       }
+
+       scan_params->freqs[0] = freq;
+       scan_params->num_freqs = 1;
+
        reset_autoscan(device);
        connman_device_ref(device);
 
-       ret = g_supplicant_interface_p2p_find(wifi->interface,
-                                               p2p_find_callback, device);
-       if (ret) {
-               connman_device_unref(device);
-               start_autoscan(device);
-       } else {
+       ret = g_supplicant_interface_scan(mesh_info->interface, scan_params,
+                                               mesh_scan_callback, device);
+
+       if (ret == 0) {
                connman_device_set_scanning(device,
-                               CONNMAN_SERVICE_TYPE_P2P, true);
+                               CONNMAN_SERVICE_TYPE_MESH, true);
+       } else {
+               g_supplicant_free_scan_params(scan_params);
+               connman_device_unref(device);
        }
 
        return ret;
 }
+#endif
 
 /*
  * Note that the hidden scan is only used when connecting to this specific
@@ -1917,6 +3405,11 @@ static int wifi_scan(struct connman_device *device,
        if (params->type == CONNMAN_SERVICE_TYPE_P2P)
                return p2p_find(device);
 
+#if defined TIZEN_EXT_WIFI_MESH
+       if (params->type == CONNMAN_SERVICE_TYPE_MESH)
+               return mesh_scan(device);
+#endif
+
        DBG("device %p wifi %p hidden ssid %s", device, wifi->interface,
                params->ssid);
 
@@ -2001,12 +3494,32 @@ static int wifi_scan(struct connman_device *device,
        connman_device_ref(device);
 
        reset_autoscan(device);
-
+#if defined TIZEN_EXT
+       /*
+        * When doing a full scan, stored hidden networks also need to be scanned
+        * so that we can autoconnect to them.
+        */
+       if (params->force_full_scan)
+               ret = g_supplicant_interface_scan(wifi->interface, scan_params,
+                                                       scan_callback_hidden, device);
+       else
+#endif
        ret = g_supplicant_interface_scan(wifi->interface, scan_params,
                                                scan_callback, device);
        if (ret == 0) {
                connman_device_set_scanning(device,
                                CONNMAN_SERVICE_TYPE_WIFI, true);
+#if defined TIZEN_EXT
+               /*
+                * To allow the Full Scan after ssid based scan, set the flag here
+                * It is required because Tizen does not use the ConnMan specific
+                * backgroung Scan feature.Tizen has added the BG Scan feature in
+                * net-config. To sync with up ConnMan, we need to issue the Full Scan
+                * after SSID specific scan.
+                */
+               if (!params->force_full_scan && !do_hidden)
+                       wifi->allow_full_scan = TRUE;
+#endif
        } else {
                g_supplicant_free_scan_params(scan_params);
                connman_device_unref(device);
@@ -2079,6 +3592,16 @@ static struct connman_device_driver wifi_ng_driver = {
        .scan           = wifi_scan,
        .stop_scan      = wifi_stop_scan,
        .set_regdom     = wifi_set_regdom,
+#if defined TIZEN_EXT
+       .specific_scan  = wifi_specific_scan,
+       .set_mac_policy           = wifi_set_mac_policy,
+       .set_preassoc_mac_policy  = wifi_set_preassoc_mac_policy,
+       .set_random_mac_lifetime  = wifi_set_random_mac_lifetime,
+#endif
+#if defined TIZEN_EXT_WIFI_MESH
+       .abort_scan     = mesh_abort_scan,
+       .mesh_specific_scan     = mesh_specific_scan,
+#endif
 };
 
 static void system_ready(void)
@@ -2098,6 +3621,9 @@ static void system_killed(void)
 
 static int network_probe(struct connman_network *network)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p", network);
 
        return 0;
@@ -2118,15 +3644,77 @@ static void network_remove(struct connman_network *network)
                return;
 
        wifi->network = NULL;
+
+#if defined TIZEN_EXT
+       wifi->disconnecting = false;
+
+       if (wifi->pending_network == network)
+               wifi->pending_network = NULL;
+
+       if (wifi->scan_pending_network == network)
+               wifi->scan_pending_network = NULL;
+#endif
 }
 
 static void connect_callback(int result, GSupplicantInterface *interface,
                                                        void *user_data)
 {
+#if defined TIZEN_EXT
+       GList *list;
+       struct wifi_data *wifi;
+#endif
        struct connman_network *network = user_data;
 
        DBG("network %p result %d", network, result);
 
+#if defined TIZEN_EXT
+       const char *ifname = g_supplicant_interface_get_ifname(interface);
+       set_connman_bssid(RESET_BSSID, NULL, ifname);
+
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
+
+               if (wifi && wifi->network == network)
+                       goto found;
+       }
+
+       /* wifi_data may be invalid because wifi is already disabled */
+       return;
+
+found:
+       if (connman_network_get_bool(network, "WiFi.Roaming")) {
+               if (result < 0 ) {
+                       connman_network_set_bool(network, "WiFi.Roaming", false);
+                       connman_network_set_string(network,
+                                       "WiFi.RoamingCurBSSID", NULL);
+               } else {
+                       char bssid_buff[WIFI_BSSID_STR_LEN] = {0,};
+                       char *bssid_str = bssid_buff;
+                       unsigned char *bssid;
+                       const char *cur_bssid;
+
+                       bssid = g_supplicant_interface_get_add_network_bssid(interface);
+                       if (!bssid) {
+                               connman_network_set_bool(network, "WiFi.Roaming", false);
+                               connman_network_set_string(network,
+                                               "WiFi.RoamingCurBSSID", NULL);
+                       } else {
+                               snprintf(bssid_str,
+                                               WIFI_BSSID_STR_LEN,
+                                               MACSTR, MAC2STR(bssid));
+
+                               connman_network_set_string(network,
+                                               "WiFi.RoamingDstBSSID", bssid_str);
+
+                               cur_bssid = connman_network_get_string(network,
+                                               "WiFi.RoamingCurBSSID");
+
+                               __connman_technology_notify_roaming_state(ifname,
+                                               "started", cur_bssid, bssid_str);
+                       }
+               }
+       }
+#endif
        if (result == -ENOKEY) {
                connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_INVALID_KEY);
@@ -2152,21 +3740,65 @@ static GSupplicantSecurity network_security(const char *security)
                return G_SUPPLICANT_SECURITY_PSK;
        else if (g_str_equal(security, "ieee8021x"))
                return G_SUPPLICANT_SECURITY_IEEE8021X;
+#if defined TIZEN_EXT
+       else if (g_str_equal(security, "ft_psk") == TRUE)
+               return G_SUPPLICANT_SECURITY_FT_PSK;
+       else if (g_str_equal(security, "ft_ieee8021x") == TRUE)
+               return G_SUPPLICANT_SECURITY_FT_IEEE8021X;
+       else if (g_str_equal(security, "sae"))
+               return G_SUPPLICANT_SECURITY_SAE;
+       else if (g_str_equal(security, "owe"))
+               return G_SUPPLICANT_SECURITY_OWE;
+       else if (g_str_equal(security, "dpp"))
+               return G_SUPPLICANT_SECURITY_DPP;
+#endif
 
        return G_SUPPLICANT_SECURITY_UNKNOWN;
 }
 
+#if defined TIZEN_EXT
+static GSupplicantEapKeymgmt network_eap_keymgmt(const char *security)
+{
+       if (security == NULL)
+               return G_SUPPLICANT_EAP_KEYMGMT_NONE;
+
+       if (g_str_equal(security, "FT") == TRUE)
+               return G_SUPPLICANT_EAP_KEYMGMT_FT;
+       else if (g_str_equal(security, "CCKM") == TRUE)
+               return G_SUPPLICANT_EAP_KEYMGMT_CCKM;
+
+       return G_SUPPLICANT_EAP_KEYMGMT_NONE;
+}
+#endif
+
 static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
 {
        const char *security;
+#if defined TIZEN_EXT
+       const void *ssid_data;
+#endif
 
        memset(ssid, 0, sizeof(*ssid));
        ssid->mode = G_SUPPLICANT_MODE_INFRA;
+#if defined TIZEN_EXT
+       ssid_data = connman_network_get_blob(network, "WiFi.SSID",
+                                               &ssid->ssid_len);
+       ssid->ssid = g_try_malloc0(ssid->ssid_len);
+
+       if (!ssid->ssid)
+               ssid->ssid_len = 0;
+       else
+               memcpy(ssid->ssid, ssid_data, ssid->ssid_len);
+#else
        ssid->ssid = connman_network_get_blob(network, "WiFi.SSID",
                                                &ssid->ssid_len);
+#endif
        ssid->scan_ssid = 1;
        security = connman_network_get_string(network, "WiFi.Security");
        ssid->security = network_security(security);
+#if defined TIZEN_EXT
+       ssid->ieee80211w = 1;
+#endif
        ssid->passphrase = connman_network_get_string(network,
                                                "WiFi.Passphrase");
 
@@ -2212,6 +3844,84 @@ static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
 
        ssid->use_wps = connman_network_get_bool(network, "WiFi.UseWPS");
        ssid->pin_wps = connman_network_get_string(network, "WiFi.PinWPS");
+#if defined TIZEN_EXT
+       ssid->connector = connman_network_get_string(network,
+                                                       "WiFi.Connector");
+       ssid->c_sign_key = connman_network_get_string(network,
+                                                       "WiFi.CSignKey");
+       ssid->net_access_key = connman_network_get_string(network,
+                                               "WiFi.NetAccessKey");
+#endif
+
+#if defined TIZEN_EXT
+       const char *ifname = connman_device_get_string(
+                       connman_network_get_device(network), "Interface");
+       if (set_connman_bssid(CHECK_BSSID, NULL, ifname) == 6) {
+               ssid->bssid_for_connect_len = 6;
+               set_connman_bssid(GET_BSSID, (char *)ssid->bssid_for_connect, ifname);
+               DBG("BSSID : %02x:%02x:%02x:%02x:%02x:%02x",
+                       ssid->bssid_for_connect[0], ssid->bssid_for_connect[1],
+                       ssid->bssid_for_connect[2], ssid->bssid_for_connect[3],
+                       ssid->bssid_for_connect[4], ssid->bssid_for_connect[5]);
+       } else {
+               ssid->freq = connman_network_get_frequency(network);
+       }
+
+       GSList *bssid_list = (GSList *)connman_network_get_bssid_list(network);
+       if (bssid_list && g_slist_length(bssid_list) > 1) {
+
+               /* If there are more than one bssid,
+                * the user-specified bssid is tried only once at the beginning.
+                * After that, the bssids in the list are tried in order.
+                */
+               if (set_connman_bssid(CHECK_BSSID, NULL, ifname) == 6) {
+                       set_connman_bssid(RESET_BSSID, NULL, ifname);
+                       goto done;
+               }
+
+               GSList *list;
+               char buff[MAC_ADDRESS_LENGTH];
+               for (list = bssid_list; list; list = list->next) {
+                       struct connman_bssids * bssids = (struct connman_bssids *)list->data;
+
+                       g_snprintf(buff, MAC_ADDRESS_LENGTH, "%02x:%02x:%02x:%02x:%02x:%02x",
+                                       bssids->bssid[0], bssids->bssid[1], bssids->bssid[2],
+                                       bssids->bssid[3], bssids->bssid[4], bssids->bssid[5]);
+                       buff[MAC_ADDRESS_LENGTH - 1] = '\0';
+
+                       gchar *curr_bssid = g_strdup((const gchar *)buff);
+
+                       if (g_hash_table_contains(failed_bssids, curr_bssid)) {
+                               DBG("bssid match, try next bssid");
+                               g_free(curr_bssid);
+                               continue;
+                       } else {
+                               g_hash_table_add(failed_bssids, curr_bssid);
+
+                               memcpy(buff_bssid, bssids->bssid, WIFI_BSSID_LEN_MAX);
+                               ssid->bssid = buff_bssid;
+                               ssid->freq = (unsigned int)bssids->frequency;
+                               break;
+                       }
+               }
+
+               if (!list) {
+                       ssid->bssid = connman_network_get_bssid(network);
+                       g_hash_table_remove_all(failed_bssids);
+               }
+       } else
+               ssid->bssid = connman_network_get_bssid(network);
+
+done:
+       ssid->eap_keymgmt = network_eap_keymgmt(
+                       connman_network_get_string(network, "WiFi.KeymgmtType"));
+       ssid->phase1 = connman_network_get_string(network, "WiFi.Phase1");
+
+       if(g_strcmp0(ssid->eap, "fast") == 0)
+               ssid->pac_file = g_strdup(WIFI_EAP_FAST_PAC_FILE);
+
+       ssid->keymgmt = connman_network_get_keymgmt(network);
+#endif
 
        if (connman_setting_get_bool("BackgroundScanning"))
                ssid->bgscan = BGSCAN_DEFAULT;
@@ -2243,10 +3953,16 @@ static int network_connect(struct connman_network *network)
 
        if (wifi->disconnecting) {
                wifi->pending_network = network;
+#if defined TIZEN_EXT
+               g_free(ssid->ssid);
+#endif
                g_free(ssid);
        } else {
                wifi->network = connman_network_ref(network);
                wifi->retries = 0;
+#if defined TIZEN_EXT
+               wifi->scan_pending_network = NULL;
+#endif
 
                return g_supplicant_interface_connect(interface, ssid,
                                                connect_callback, network);
@@ -2260,9 +3976,31 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
 {
        struct disconnect_data *dd = user_data;
        struct connman_network *network = dd->network;
-       struct wifi_data *wifi = dd->wifi;
+#if defined TIZEN_EXT
+       GList *list;
+       struct wifi_data *wifi;
+
+       g_free(dd);
+       DBG("network %p result %d", network, result);
+
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
+
+               if (wifi->network == NULL && wifi->disconnecting == true)
+                       wifi->disconnecting = false;
+
+               if (wifi->network == network)
+                       goto found;
+       }
+
+       /* wifi_data may be invalid because wifi is already disabled */
+       return;
 
+found:
+#else
+       struct wifi_data *wifi = dd->wifi;
        g_free(dd);
+#endif
 
        DBG("result %d supplicant interface %p wifi %p networks: current %p "
                "pending %p disconnected %p", result, interface, wifi,
@@ -2273,7 +4011,13 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
                return;
        }
 
+#if defined TIZEN_EXT
+       if (wifi->network &&
+                       (wifi->network != wifi->pending_network ||
+                       connman_network_get_bool(wifi->network, "WiFi.Roaming")))
+#else
        if (g_slist_find(wifi->networks, network))
+#endif
                connman_network_set_connected(network, false);
 
        wifi->disconnecting = false;
@@ -2303,6 +4047,9 @@ static int network_disconnect(struct connman_network *network)
        struct disconnect_data *dd;
        struct wifi_data *wifi;
        int err;
+#if defined TIZEN_EXT
+       struct connman_service *service;
+#endif
 
        DBG("network %p", network);
 
@@ -2310,6 +4057,29 @@ static int network_disconnect(struct connman_network *network)
        if (!wifi || !wifi->interface)
                return -ENODEV;
 
+#if defined TIZEN_EXT
+       if (connman_network_get_associating(network) == true) {
+               connman_network_clear_associating(network);
+               connman_network_set_bool(network, "WiFi.UseWPS", false);
+       } else {
+               service = connman_service_lookup_from_network(network);
+
+               if (service != NULL &&
+                       (__connman_service_is_connected_state(service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4) == false &&
+                       __connman_service_is_connected_state(service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6) == false) &&
+                       (connman_service_get_favorite(service) == false))
+                                       __connman_service_set_passphrase(service, NULL);
+       }
+
+       if (wifi->pending_network == network)
+               wifi->pending_network = NULL;
+
+       if (wifi->scan_pending_network == network)
+               wifi->scan_pending_network = NULL;
+
+#endif
        connman_network_set_associating(network, false);
 
        if (wifi->disconnecting)
@@ -2331,6 +4101,176 @@ static int network_disconnect(struct connman_network *network)
        return err;
 }
 
+#if defined TIZEN_EXT
+static void set_connection_mode(struct connman_network *network,
+               int linkspeed)
+{
+       ieee80211_modes_e phy_mode;
+       connection_mode_e conn_mode;
+
+       phy_mode = connman_network_get_phy_mode(network);
+       switch (phy_mode) {
+       case IEEE80211_MODE_B:
+               if (linkspeed > 0 && linkspeed <= 11)
+                       conn_mode = CONNECTION_MODE_IEEE80211B;
+               else
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+
+               break;
+       case IEEE80211_MODE_BG:
+               if (linkspeed > 0 && linkspeed <= 11)
+                       conn_mode = CONNECTION_MODE_IEEE80211B;
+               else if (linkspeed > 11 && linkspeed <= 54)
+                       conn_mode = CONNECTION_MODE_IEEE80211G;
+               else
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+
+               break;
+       case IEEE80211_MODE_BGN:
+               if (linkspeed > 0 && linkspeed <= 11)
+                       conn_mode = CONNECTION_MODE_IEEE80211B;
+               else if (linkspeed > 11 && linkspeed <= 54)
+                       conn_mode = CONNECTION_MODE_IEEE80211G;
+               else if (linkspeed > 54 && linkspeed <= 450)
+                       conn_mode = CONNECTION_MODE_IEEE80211N;
+               else
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+
+               break;
+       case IEEE80211_MODE_A:
+               if (linkspeed > 0 && linkspeed <= 54)
+                       conn_mode = CONNECTION_MODE_IEEE80211A;
+               else
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+
+               break;
+       case IEEE80211_MODE_AN:
+               if (linkspeed > 0 && linkspeed <= 54)
+                       conn_mode = CONNECTION_MODE_IEEE80211A;
+               else if (linkspeed > 54 && linkspeed <= 450)
+                       conn_mode = CONNECTION_MODE_IEEE80211N;
+               else
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+
+               break;
+       case IEEE80211_MODE_ANAC:
+               if (linkspeed > 0 && linkspeed <= 54)
+                       conn_mode = CONNECTION_MODE_IEEE80211A;
+               else if (linkspeed > 54 && linkspeed <= 450)
+                       conn_mode = CONNECTION_MODE_IEEE80211N;
+               else if (linkspeed > 450 && linkspeed <= 1300)
+                       conn_mode = CONNECTION_MODE_IEEE80211AC;
+               else
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+
+               break;
+       default:
+                       conn_mode = CONNECTION_MODE_IEEE80211_UNKNOWN;
+               break;
+       }
+
+       DBG("connection mode(%d)", conn_mode);
+       connman_network_set_connection_mode(network, conn_mode);
+}
+
+static void signalpoll_callback(int result, int maxspeed, int strength,
+                               int snr, void *user_data)
+{
+       char bssid_buff[WIFI_BSSID_STR_LEN] = {0,};
+       char *bssid_str = bssid_buff;
+       unsigned char *bssid;
+       struct timespec curr_time = {0};
+       __time_t roam_scan_time;
+       const char *interface = NULL;
+       struct connman_device *device;
+       struct connman_network *network = user_data;
+       uint16_t freq = connman_network_get_frequency(network);
+
+       if (result != 0) {
+               DBG("Failed to get maxspeed from signalpoll !");
+               connman_network_unref(network);
+               return;
+       }
+
+       strength += 120;
+       if (strength > 100)
+               strength = 100;
+
+       DBG("freq = %u, maxspeed = %d, strength = %d, snr = %d", freq, maxspeed, strength, snr);
+
+       connman_network_set_strength(network, (uint8_t)strength);
+       connman_network_set_snr(network, snr);
+       connman_network_set_maxspeed(network, maxspeed);
+       set_connection_mode(network, maxspeed);
+
+       clock_gettime(CLOCK_MONOTONIC, &curr_time);
+       roam_scan_time = connman_network_get_roam_scan_time(network);
+       if (curr_time.tv_sec <= roam_scan_time + ROAM_SCAN_INTERVAL)
+               goto done;
+
+       if (need_bss_transition(freq, snr, strength)) {
+               device = connman_network_get_device(network);
+               if (!device)
+                       goto done;
+
+               interface = connman_device_get_string(device, "Interface");
+               bssid = connman_network_get_bssid(network);
+               snprintf(bssid_str, WIFI_BSSID_STR_LEN, MACSTR, MAC2STR(bssid));
+               __connman_technology_notify_roaming_state(interface, "required", bssid_str, NULL);
+
+               if (connman_setting_get_bool("WifiRoamingScan") == false)
+                       goto done;
+
+               throw_wifi_scan(device, scan_callback);
+               connman_network_set_roam_scan_time(network, curr_time.tv_sec);
+       }
+
+done:
+       connman_network_unref(network);
+}
+
+static int network_signalpoll(struct wifi_data *wifi)
+{
+       GSupplicantInterface *interface;
+       struct connman_network *network;
+
+       if (!wifi || !wifi->network)
+               return -ENODEV;
+
+       wifi->network = connman_network_ref(wifi->network);
+
+       interface = wifi->interface;
+       network = wifi->network;
+
+       DBG("network %p", network);
+
+       return g_supplicant_interface_signalpoll(interface, signalpoll_callback, network);
+}
+
+static gboolean autosignalpoll_timeout(gpointer data)
+{
+       struct wifi_data *wifi = data;
+
+       if (!wifi || !wifi->automaxspeed_timeout) {
+               DBG("automaxspeed_timeout is found to be zero. i.e. currently in disconnected state. !!");
+               return FALSE;
+       }
+
+       int ret = network_signalpoll(wifi);
+       if (ret < 0) {
+               DBG("Fail to get max speed !!");
+               wifi->automaxspeed_timeout = 0;
+
+               if (wifi->network)
+                       connman_network_unref(wifi->network);
+
+               return FALSE;
+       }
+
+       return TRUE;
+}
+#endif
+
 static struct connman_network_driver network_driver = {
        .name           = "wifi",
        .type           = CONNMAN_NETWORK_TYPE_WIFI,
@@ -2345,6 +4285,19 @@ static void interface_added(GSupplicantInterface *interface)
 {
        const char *ifname = g_supplicant_interface_get_ifname(interface);
        const char *driver = g_supplicant_interface_get_driver(interface);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+#if defined TIZEN_EXT
+       bool is_5_0_ghz_supported = g_supplicant_interface_get_is_5_0_ghz_supported(interface);
+#endif
+
        struct wifi_data *wifi;
 
        wifi = g_supplicant_interface_get_data(interface);
@@ -2368,6 +4321,12 @@ static void interface_added(GSupplicantInterface *interface)
        }
 
        connman_device_set_powered(wifi->device, true);
+#if defined TIZEN_EXT
+       connman_device_set_wifi_5ghz_supported(wifi->device, is_5_0_ghz_supported);
+       /* Max number of SSIDs supported by wlan chipset that can be scanned */
+       int max_scan_ssids = g_supplicant_interface_get_max_scan_ssids(interface);
+       connman_device_set_max_scan_ssids(wifi->device, max_scan_ssids);
+#endif
 }
 
 static bool is_idle(struct wifi_data *wifi)
@@ -2454,14 +4413,43 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
                        connman_network_set_associating(network, false);
                        g_supplicant_interface_disconnect(wifi->interface,
                                                disconnect_callback, dd);
+#if defined TIZEN_EXT
+                       connman_network_set_bool(network, "WiFi.UseWPS", false);
+                       connman_network_set_string(network, "WiFi.PinWPS", NULL);
+#endif
                        return false;
                }
 
                wps_key = g_supplicant_interface_get_wps_key(interface);
+#if defined TIZEN_EXT
+               /* Check the passphrase and encrypt it
+                */
+                int ret;
+                gchar *passphrase = g_strdup(wps_key);
+
+                connman_network_set_string(network, "WiFi.PinWPS", NULL);
+
+                if (check_passphrase_ext(network, passphrase) < 0) {
+                        DBG("[WPS] Invalid passphrase");
+                        g_free(passphrase);
+                        return true;
+                }
+
+                ret = send_encryption_request(passphrase, network);
+
+                g_free(passphrase);
+
+                if (!ret)
+                        DBG("[WPS] Encryption request succeeded");
+                else
+                        DBG("[WPS] Encryption request failed %d", ret);
+
+#else
                connman_network_set_string(network, "WiFi.Passphrase",
                                        wps_key);
 
                connman_network_set_string(network, "WiFi.PinWPS", NULL);
+#endif
        }
 
        return true;
@@ -2471,7 +4459,11 @@ static bool handle_assoc_status_code(GSupplicantInterface *interface,
                                      struct wifi_data *wifi)
 {
        if (wifi->state == G_SUPPLICANT_STATE_ASSOCIATING &&
+#if defined TIZEN_EXT
+                       wifi->assoc_code > 0 &&
+#else
                        wifi->assoc_code == ASSOC_STATUS_NO_CLIENT &&
+#endif
                        wifi->load_shaping_retries < LOAD_SHAPING_MAX_RETRIES) {
                wifi->load_shaping_retries ++;
                return TRUE;
@@ -2486,6 +4478,24 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
 {
        struct connman_service *service;
 
+#if defined TIZEN_EXT
+       const char *security;
+       if (wifi->connected)
+               return false;
+
+       security = connman_network_get_string(network, "WiFi.Security");
+
+       if (security && g_str_equal(security, "ieee8021x") == true &&
+                       wifi->state == G_SUPPLICANT_STATE_ASSOCIATED) {
+               wifi->retries = 0;
+               connman_network_set_error(network, CONNMAN_NETWORK_ERROR_INVALID_KEY);
+
+               return false;
+       }
+
+       if (wifi->state != G_SUPPLICANT_STATE_4WAY_HANDSHAKE)
+               return false;
+#else
        if ((wifi->state != G_SUPPLICANT_STATE_4WAY_HANDSHAKE) &&
                        !((wifi->state == G_SUPPLICANT_STATE_ASSOCIATING) &&
                                (wifi->assoc_code == ASSOC_STATUS_AUTH_TIMEOUT)))
@@ -2493,6 +4503,7 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
 
        if (wifi->connected)
                return false;
+#endif
 
        service = connman_service_lookup_from_network(network);
        if (!service)
@@ -2511,12 +4522,73 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
        return false;
 }
 
+#if defined TIZEN_EXT
+static bool handle_wifi_assoc_retry(struct connman_network *network,
+                                       struct wifi_data *wifi)
+{
+       const char *security;
+
+       if (!wifi->network || wifi->connected || wifi->disconnecting ||
+                       connman_network_get_connecting(network) != true) {
+               wifi->assoc_retry_count = 0;
+               return false;
+       }
+
+       if (wifi->state != G_SUPPLICANT_STATE_AUTHENTICATING &&
+                       wifi->state != G_SUPPLICANT_STATE_ASSOCIATING &&
+                       wifi->state != G_SUPPLICANT_STATE_ASSOCIATED) {
+               wifi->assoc_retry_count = 0;
+               return false;
+       }
+
+       security = connman_network_get_string(network, "WiFi.Security");
+       if (security && g_str_equal(security, "ieee8021x") == true &&
+                       wifi->state == G_SUPPLICANT_STATE_ASSOCIATED) {
+               wifi->assoc_retry_count = 0;
+               return false;
+       }
+
+       if (++wifi->assoc_retry_count >= TIZEN_ASSOC_RETRY_COUNT) {
+               wifi->assoc_retry_count = 0;
+
+               /* Honestly it's not an invalid-key error,
+                * however QA team recommends that the invalid-key error
+                * might be better to display for user experience.
+                */
+               switch (wifi->state) {
+               case G_SUPPLICANT_STATE_AUTHENTICATING:
+                       connman_network_set_error(network, CONNMAN_NETWORK_ERROR_AUTHENTICATE_FAIL);
+                       break;
+               case G_SUPPLICANT_STATE_ASSOCIATED:
+                       connman_network_set_error(network, CONNMAN_NETWORK_ERROR_INVALID_KEY);
+                       break;
+               default:
+                       connman_network_set_error(network, CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
+                       break;
+               }
+
+               return false;
+       }
+
+       return true;
+}
+#endif
+
 static void interface_state(GSupplicantInterface *interface)
 {
        struct connman_network *network;
        struct connman_device *device;
        struct wifi_data *wifi;
        GSupplicantState state = g_supplicant_interface_get_state(interface);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        bool wps;
        bool old_connected;
 
@@ -2554,6 +4626,13 @@ static void interface_state(GSupplicantInterface *interface)
 
        switch (state) {
        case G_SUPPLICANT_STATE_SCANNING:
+#if defined TIZEN_EXT
+               if (wifi->automaxspeed_timeout != 0) {
+                       g_source_remove(wifi->automaxspeed_timeout);
+                       wifi->automaxspeed_timeout = 0;
+                       DBG("Remove signalpoll timer!!");
+               }
+#endif
                if (wifi->connected)
                        connman_network_set_connected(network, false);
 
@@ -2561,7 +4640,11 @@ static void interface_state(GSupplicantInterface *interface)
 
        case G_SUPPLICANT_STATE_AUTHENTICATING:
        case G_SUPPLICANT_STATE_ASSOCIATING:
+#if defined TIZEN_EXT
+               reset_autoscan(device);
+#else
                stop_autoscan(device);
+#endif
 
                if (!wifi->connected)
                        connman_network_set_associating(network, true);
@@ -2569,8 +4652,37 @@ static void interface_state(GSupplicantInterface *interface)
                break;
 
        case G_SUPPLICANT_STATE_COMPLETED:
+#if defined TIZEN_EXT
+               /* though it should be already reset: */
+               reset_autoscan(device);
+
+               wifi->assoc_retry_count = 0;
+
+               wifi->scan_pending_network = NULL;
+
+               /* should be cleared scanning flag */
+               bool scanning = connman_device_get_scanning(device,
+                                              CONNMAN_SERVICE_TYPE_WIFI);
+               if (scanning){
+                       connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, false);
+                       connman_device_unref(device);
+               }
+
+               if (!wifi->automaxspeed_timeout) {
+                       DBG("Going to start signalpoll timer!!");
+                       int ret = network_signalpoll(wifi);
+                       if (ret < 0)
+                               DBG("Fail to get max speed !!");
+                       else
+                               wifi->automaxspeed_timeout = g_timeout_add_seconds(10, autosignalpoll_timeout, wifi);
+               }
+
+               g_hash_table_remove_all(failed_bssids);
+#else
                /* though it should be already stopped: */
                stop_autoscan(device);
+#endif
 
                if (!handle_wps_completion(interface, network, device, wifi))
                        break;
@@ -2583,6 +4695,16 @@ static void interface_state(GSupplicantInterface *interface)
                break;
 
        case G_SUPPLICANT_STATE_DISCONNECTED:
+#if defined TIZEN_EXT
+               connman_network_set_strength(network, 0);
+               connman_network_set_maxspeed(network, 0);
+
+               if (wifi->automaxspeed_timeout != 0) {
+                       g_source_remove(wifi->automaxspeed_timeout);
+                       wifi->automaxspeed_timeout = 0;
+                       DBG("Remove signalpoll timer!!");
+               }
+#endif
                /*
                 * If we're in one of the idle modes, we have
                 * not started association yet and thus setting
@@ -2597,8 +4719,39 @@ static void interface_state(GSupplicantInterface *interface)
                if (is_idle(wifi))
                        break;
 
+#if defined TIZEN_EXT
+               if (handle_assoc_status_code(interface, wifi)) {
+                       const char *group = connman_network_get_group(network);
+                       GSupplicantNetwork *supplicant_network;
+                       GSList *bssid_list = NULL;
+                       guint bssid_length = 0;
+
+                       if (group) {
+                               supplicant_network = g_supplicant_interface_get_network(interface, group);
+
+                               connman_network_set_assoc_reject_table(network,
+                                       g_supplicant_network_get_assoc_reject_table(supplicant_network));
+
+                               g_supplicant_network_update_assoc_reject(interface, supplicant_network);
+                       }
+
+                       bssid_list = (GSList *)connman_network_get_bssid_list(network);
+                       if (bssid_list)
+                               bssid_length = g_slist_length(bssid_list);
+
+                       if (bssid_length > 1 && bssid_length > g_hash_table_size(failed_bssids)) {
+                               network_connect(network);
+                               break;
+                       }
+
+                       wifi->load_shaping_retries = 0;
+               }
+
+               g_hash_table_remove_all(failed_bssids);
+#else
                if (handle_assoc_status_code(interface, wifi))
                        break;
+#endif
 
                /* If previous state was 4way-handshake, then
                 * it's either: psk was incorrect and thus we retry
@@ -2610,6 +4763,10 @@ static void interface_state(GSupplicantInterface *interface)
 
                /* See table 8-36 Reason codes in IEEE Std 802.11 */
                switch (wifi->disconnect_code) {
+#if defined TIZEN_EXT
+               case 1: /* Unspecified reason */
+                       /* Let's assume it's because we got blocked */
+#endif
                case 6: /* Class 2 frame received from nonauthenticated STA */
                        connman_network_set_error(network,
                                                CONNMAN_NETWORK_ERROR_BLOCKED);
@@ -2619,6 +4776,21 @@ static void interface_state(GSupplicantInterface *interface)
                        break;
                }
 
+#if defined TIZEN_EXT
+               /* Some of Wi-Fi networks are not comply Wi-Fi specification.
+                * Retry association until its retry count is expired */
+               if (handle_wifi_assoc_retry(network, wifi) == true) {
+                       throw_wifi_scan(wifi->device, scan_callback);
+                       wifi->scan_pending_network = wifi->network;
+                       break;
+               }
+
+               if(wifi->disconnect_code > 0){
+                       DBG("Set disconnect reason code(%d)", wifi->disconnect_code);
+                       connman_network_set_disconnect_reason(network, wifi->disconnect_code);
+               }
+#endif
+
                if (network != wifi->pending_network) {
                        connman_network_set_connected(network, false);
                        connman_network_set_associating(network, false);
@@ -2630,6 +4802,10 @@ static void interface_state(GSupplicantInterface *interface)
                break;
 
        case G_SUPPLICANT_STATE_INACTIVE:
+#if defined TIZEN_EXT
+               if (handle_wps_completion(interface, network, device, wifi) == false)
+                       break;
+#endif
                connman_network_set_associating(network, false);
                start_autoscan(device);
 
@@ -2685,11 +4861,35 @@ static void interface_removed(GSupplicantInterface *interface)
 {
        const char *ifname = g_supplicant_interface_get_ifname(interface);
        struct wifi_data *wifi;
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 
        DBG("ifname %s", ifname);
 
        wifi = g_supplicant_interface_get_data(interface);
 
+#if defined TIZEN_EXT_WIFI_MESH
+       if (wifi && wifi->mesh_interface) {
+               DBG("Notify mesh interface remove");
+               connman_mesh_notify_interface_remove(true);
+               struct wifi_mesh_info *mesh_info = wifi->mesh_info;
+               g_free(mesh_info->parent_ifname);
+               g_free(mesh_info->ifname);
+               g_free(mesh_info->identifier);
+               g_free(mesh_info);
+               wifi->mesh_interface = false;
+               wifi->mesh_info = NULL;
+               return;
+       }
+#endif
+
        if (wifi)
                wifi->interface = NULL;
 
@@ -2704,6 +4904,9 @@ static void interface_removed(GSupplicantInterface *interface)
        connman_device_set_powered(wifi->device, false);
 
        check_p2p_technology();
+#if defined TIZEN_EXT_WIFI_MESH
+       check_mesh_technology();
+#endif
 }
 
 static void set_device_type(const char *type, char dev_type[17])
@@ -2735,6 +4938,15 @@ static void p2p_support(GSupplicantInterface *interface)
 {
        char dev_type[17] = {};
        const char *hostname;
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 
        DBG("");
 
@@ -2761,16 +4973,74 @@ static void p2p_support(GSupplicantInterface *interface)
 
 static void scan_started(GSupplicantInterface *interface)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        DBG("");
 }
 
 static void scan_finished(GSupplicantInterface *interface)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+#if defined TIZEN_EXT
+       struct wifi_data *wifi;
+       bool is_associating = false;
+       static bool is_scanning = true;
+#endif
+
        DBG("");
+
+#if defined TIZEN_EXT
+       wifi = g_supplicant_interface_get_data(interface);
+       if (wifi && wifi->scan_pending_network) {
+               network_connect(wifi->scan_pending_network);
+               wifi->scan_pending_network = NULL;
+       }
+
+       //service state - associating
+       if(!wifi || !wifi->network)
+               return;
+
+       is_associating = connman_network_get_associating(wifi->network);
+       if(is_associating && is_scanning){
+               is_scanning = false;
+               DBG("send scan for connecting");
+               throw_wifi_scan(wifi->device, scan_callback);
+
+               return;
+       }
+       is_scanning = true;
+
+       //go scan
+
+#endif
 }
 
 static void ap_create_fail(GSupplicantInterface *interface)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
        int ret;
 
@@ -2802,12 +5072,158 @@ static unsigned char calculate_strength(GSupplicantNetwork *supplicant_network)
        unsigned char strength;
 
        strength = 120 + g_supplicant_network_get_signal(supplicant_network);
+#if !defined TIZEN_EXT
        if (strength > 100)
                strength = 100;
+#endif
 
        return strength;
 }
 
+#if defined TIZEN_EXT_WIFI_MESH
+static void mesh_peer_added(GSupplicantNetwork *supplicant_network)
+{
+       GSupplicantInterface *interface;
+       struct wifi_data *wifi;
+       const char *name, *security;
+       struct connman_mesh *connman_mesh;
+       struct wifi_mesh_info *mesh_info;
+       const unsigned char *bssid;
+       const char *identifier;
+       char *address;
+       uint16_t frequency;
+       int ret;
+
+       interface = g_supplicant_network_get_interface(supplicant_network);
+       wifi = g_supplicant_interface_get_data(interface);
+       if (!wifi || !wifi->mesh_interface) {
+               DBG("Virtual Mesh interface not created");
+               return;
+       }
+
+       bssid = g_supplicant_network_get_bssid(supplicant_network);
+       address = g_malloc0(19);
+       snprintf(address, 19, "%02x:%02x:%02x:%02x:%02x:%02x", bssid[0], bssid[1],
+                                                                bssid[2], bssid[3], bssid[4], bssid[5]);
+
+       identifier = g_supplicant_network_get_identifier(supplicant_network);
+       name = g_supplicant_network_get_name(supplicant_network);
+       security = g_supplicant_network_get_security(supplicant_network);
+       frequency = g_supplicant_network_get_frequency(supplicant_network);
+
+       mesh_info = wifi->mesh_info;
+       connman_mesh = connman_mesh_get(mesh_info->identifier, identifier);
+       if (connman_mesh)
+               goto done;
+
+       DBG("Mesh Peer name %s identifier %s security %s added", name, identifier,
+                                       security);
+       connman_mesh = connman_mesh_create(mesh_info->identifier, identifier);
+       connman_mesh_set_name(connman_mesh, name);
+       connman_mesh_set_security(connman_mesh, security);
+       connman_mesh_set_frequency(connman_mesh, frequency);
+       connman_mesh_set_address(connman_mesh, address);
+       connman_mesh_set_index(connman_mesh, mesh_info->index);
+       connman_mesh_set_strength(connman_mesh,
+                                               calculate_strength(supplicant_network));
+       connman_mesh_set_peer_type(connman_mesh, CONNMAN_MESH_PEER_TYPE_DISCOVERED);
+
+       ret = connman_mesh_register(connman_mesh);
+       if (ret == -EALREADY)
+               DBG("Mesh Peer is already registered");
+
+done:
+       g_free(address);
+}
+
+static void mesh_peer_removed(GSupplicantNetwork *supplicant_network)
+{
+       GSupplicantInterface *interface;
+       struct wifi_data *wifi;
+       struct connman_mesh *connman_mesh;
+       struct wifi_mesh_info *mesh_info;
+       const char *identifier;
+
+       interface = g_supplicant_network_get_interface(supplicant_network);
+       wifi = g_supplicant_interface_get_data(interface);
+       if (!wifi || !wifi->mesh_interface) {
+               DBG("Virtual Mesh interface not created");
+               return;
+       }
+
+       identifier = g_supplicant_network_get_identifier(supplicant_network);
+       if (!identifier) {
+               DBG("Failed to get Mesh Peer identifier");
+               return;
+       }
+
+       mesh_info = wifi->mesh_info;
+       connman_mesh = connman_mesh_get(mesh_info->identifier, identifier);
+       if (connman_mesh) {
+               /* Do not unregister connected mesh peer */
+               if (connman_mesh_peer_is_connected_state(connman_mesh)) {
+                       DBG("Mesh Peer %s is connected", identifier);
+                       return;
+               }
+               DBG("Mesh Peer identifier %s removed", identifier);
+               connman_mesh_unregister(connman_mesh);
+       }
+}
+#endif
+
+
+#if defined TIZEN_EXT
+static GSList *get_supported_security_list(unsigned int keymgmt,
+                                       bool owe_transition_mode,
+                                       GSupplicantNetwork *supplicant_network)
+{
+       GSList *sec_list = NULL;
+       dbus_bool_t privacy = g_supplicant_network_get_privacy(supplicant_network);
+       const char *enc_mode = g_supplicant_network_get_enc_mode(supplicant_network);
+
+       if (keymgmt &
+                       (G_SUPPLICANT_KEYMGMT_WPA_EAP |
+                                       G_SUPPLICANT_KEYMGMT_WPA_EAP_256))
+               sec_list = g_slist_prepend (sec_list, "ieee8021x");
+       else if (keymgmt & G_SUPPLICANT_KEYMGMT_WPA_FT_EAP)
+               sec_list = g_slist_prepend (sec_list, "ft_ieee8021x");
+
+       if (sec_list)
+               return sec_list;
+
+       if (keymgmt &
+                       (G_SUPPLICANT_KEYMGMT_WPA_PSK |
+                                       G_SUPPLICANT_KEYMGMT_WPA_PSK_256)) {
+               if (!g_strcmp0(enc_mode, "aes"))
+                       sec_list = g_slist_prepend (sec_list, "rsn");
+               else if (!g_strcmp0(enc_mode, "tkip"))
+                       sec_list = g_slist_prepend (sec_list, "psk");
+               else if (!g_strcmp0(enc_mode, "mixed")) {
+                       sec_list = g_slist_prepend (sec_list, "psk");
+                       sec_list = g_slist_prepend (sec_list, "rsn");
+               }
+       } else if (keymgmt & G_SUPPLICANT_KEYMGMT_WPA_FT_PSK)
+               sec_list = g_slist_prepend (sec_list, "ft_psk");
+
+       if (keymgmt & G_SUPPLICANT_KEYMGMT_SAE)
+               sec_list = g_slist_prepend (sec_list, "sae");
+       if (keymgmt & G_SUPPLICANT_KEYMGMT_OWE || owe_transition_mode)
+               sec_list = g_slist_prepend (sec_list, "owe");
+       if (keymgmt & G_SUPPLICANT_KEYMGMT_DPP)
+               sec_list = g_slist_prepend (sec_list, "dpp");
+
+       if (sec_list)
+               return sec_list;
+
+       if (privacy)
+               sec_list = g_slist_prepend (sec_list, "wep");
+       else
+               sec_list = g_slist_prepend (sec_list, "none");
+
+       return sec_list;
+}
+#endif
+
 static void network_added(GSupplicantNetwork *supplicant_network)
 {
        struct connman_network *network;
@@ -2821,15 +5237,45 @@ static void network_added(GSupplicantNetwork *supplicant_network)
        bool wps_ready;
        bool wps_advertizing;
 
+#if defined TIZEN_EXT
+       bool owe_transition_mode;
+       const unsigned char *transition_mode_ssid;
+       const unsigned char *transition_mode_bssid;
+       unsigned int transition_mode_ssid_len;
+       unsigned int keymgmt;
+       GSList *vsie_list = NULL;
+       GSList *sec_list = NULL;
+       const unsigned char *country_code;
+       ieee80211_modes_e phy_mode;
+#endif
+
        mode = g_supplicant_network_get_mode(supplicant_network);
        identifier = g_supplicant_network_get_identifier(supplicant_network);
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("%s", identifier);
 
        if (!g_strcmp0(mode, "adhoc"))
                return;
 
+#if defined TIZEN_EXT_WIFI_MESH
+       if (!g_strcmp0(mode, "mesh")) {
+               mesh_peer_added(supplicant_network);
+               return;
+       }
+#endif
+
        interface = g_supplicant_network_get_interface(supplicant_network);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        wifi = g_supplicant_interface_get_data(interface);
        name = g_supplicant_network_get_name(supplicant_network);
        security = g_supplicant_network_get_security(supplicant_network);
@@ -2868,6 +5314,17 @@ static void network_added(GSupplicantNetwork *supplicant_network)
 
        connman_network_set_blob(network, "WiFi.SSID",
                                                ssid, ssid_len);
+#if defined TIZEN_EXT
+       vsie_list = (GSList *)g_supplicant_network_get_wifi_vsie(supplicant_network);
+       if (vsie_list)
+               connman_network_set_vsie_list(network, vsie_list);
+       else
+               DBG("vsie_list is NULL");
+       country_code = g_supplicant_network_get_countrycode(supplicant_network);
+       connman_network_set_countrycode(network, country_code);
+       phy_mode = g_supplicant_network_get_phy_mode(supplicant_network);
+       connman_network_set_phy_mode(network, phy_mode);
+#endif
        connman_network_set_string(network, "WiFi.Security", security);
        connman_network_set_strength(network,
                                calculate_strength(supplicant_network));
@@ -2880,20 +5337,79 @@ static void network_added(GSupplicantNetwork *supplicant_network)
                 * If so, we decide to use WPS by default */
                if (wps_ready && wps_pbc &&
                                                wps_advertizing)
+#if !defined TIZEN_EXT
                        connman_network_set_bool(network, "WiFi.UseWPS", true);
+#else
+                       DBG("wps is activating by ap but ignore it.");
+#endif
        }
 
        connman_network_set_frequency(network,
                        g_supplicant_network_get_frequency(supplicant_network));
 
+#if defined TIZEN_EXT
+       keymgmt = g_supplicant_network_get_keymgmt(supplicant_network);
+       connman_network_set_bssid(network,
+                       g_supplicant_network_get_bssid(supplicant_network));
+       owe_transition_mode = (bool)g_supplicant_network_get_transition_mode(supplicant_network);
+       connman_network_set_bool(network, "WiFi.TRANSITION_MODE", owe_transition_mode);
+       if (owe_transition_mode) {
+               transition_mode_ssid = (unsigned char *)g_supplicant_network_get_transition_mode_ssid(supplicant_network, &transition_mode_ssid_len);
+               connman_network_set_blob(network, "WiFi.TRANSITION_MODE_SSID",
+                                                       transition_mode_ssid, transition_mode_ssid_len);
+               transition_mode_bssid = g_supplicant_network_get_transition_mode_bssid(supplicant_network);
+               connman_network_set_transition_mode_bssid(network, transition_mode_bssid);
+       }
+
+       sec_list = get_supported_security_list(keymgmt,
+                       owe_transition_mode, supplicant_network);
+
+       connman_network_set_sec_list(network, sec_list);
+       connman_network_set_maxrate(network,
+                       g_supplicant_network_get_maxrate(supplicant_network));
+       connman_network_set_enc_mode(network,
+                       g_supplicant_network_get_enc_mode(supplicant_network));
+       connman_network_set_rsn_mode(network,
+                       g_supplicant_network_get_rsn_mode(supplicant_network));
+       connman_network_set_bool(network, "WiFi.PMFRequired",
+                       (bool)g_supplicant_network_is_pmf_required(supplicant_network));
+       connman_network_set_keymgmt(network, keymgmt);
+       connman_network_set_bool(network, "WiFi.HS20AP",
+                       g_supplicant_network_is_hs20AP(supplicant_network));
+       connman_network_set_bssid_list(network,
+                       (GSList *)g_supplicant_network_get_bssid_list(supplicant_network));
+       connman_network_set_last_connected_bssid(network,
+                       g_supplicant_network_get_last_connected_bssid(supplicant_network));
+       connman_network_set_assoc_reject_table(network,
+                       g_supplicant_network_get_assoc_reject_table(supplicant_network));
+#endif
        connman_network_set_available(network, true);
        connman_network_set_string(network, "WiFi.Mode", mode);
 
+#if defined TIZEN_EXT
+       if (group)
+#else
        if (ssid)
+#endif
                connman_network_set_group(network, group);
 
+#if defined TIZEN_EXT
+       g_supplicant_network_set_last_connected_bssid(supplicant_network,
+                       connman_network_get_last_connected_bssid(network));
+#endif
+
+#if defined TIZEN_EXT
+       if (wifi_first_scan == true)
+               found_with_first_scan = true;
+#endif
+
        if (wifi->hidden && ssid) {
+#if defined TIZEN_EXT
+               if (network_security(wifi->hidden->security) ==
+                       network_security(security) &&
+#else
                if (!g_strcmp0(wifi->hidden->security, security) &&
+#endif
                                wifi->hidden->ssid_len == ssid_len &&
                                !memcmp(wifi->hidden->ssid, ssid, ssid_len)) {
                        connman_network_connect_hidden(network,
@@ -2914,7 +5430,25 @@ static void network_removed(GSupplicantNetwork *network)
        const char *name, *identifier;
        struct connman_network *connman_network;
 
+#if defined TIZEN_EXT_WIFI_MESH
+       const char *mode;
+       mode = g_supplicant_network_get_mode(network);
+       if (!g_strcmp0(mode, "mesh")) {
+               mesh_peer_removed(network);
+               return;
+       }
+#endif
+
        interface = g_supplicant_network_get_interface(network);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        wifi = g_supplicant_interface_get_data(interface);
        identifier = g_supplicant_network_get_identifier(network);
        name = g_supplicant_network_get_name(network);
@@ -2928,6 +5462,18 @@ static void network_removed(GSupplicantNetwork *network)
        if (!connman_network)
                return;
 
+#if defined TIZEN_EXT
+       if (connman_network == wifi->scan_pending_network)
+               wifi->scan_pending_network = NULL;
+
+       if (connman_network == wifi->pending_network)
+               wifi->pending_network = NULL;
+
+       if(connman_network_get_connecting(connman_network) == true){
+               connman_network_set_connected(connman_network, false);
+       }
+#endif
+
        wifi->networks = g_slist_remove(wifi->networks, connman_network);
 
        connman_device_remove_network(wifi->device, connman_network);
@@ -2942,12 +5488,36 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
        struct connman_network *connman_network;
        bool update_needed;
 
+#if defined TIZEN_EXT
+       const unsigned char *bssid;
+       unsigned int maxrate;
+       uint16_t frequency;
+       bool wps;
+       const unsigned char *country_code;
+       ieee80211_modes_e phy_mode;
+       GSList *bssid_list;
+#endif
+
        interface = g_supplicant_network_get_interface(network);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        wifi = g_supplicant_interface_get_data(interface);
        identifier = g_supplicant_network_get_identifier(network);
        name = g_supplicant_network_get_name(network);
 
+#if defined TIZEN_EXT
+       if (!simplified_log)
+               DBG("name %s property %s", name, property);
+#else
        DBG("name %s", name);
+#endif
 
        if (!wifi)
                return;
@@ -2987,11 +5557,66 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
                connman_network_set_strength(connman_network,
                                        calculate_strength(network));
                update_needed = true;
-       } else
+       }
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+       else if (g_str_equal(property, "LastConnectedBSSID")) {
+               const char *ident, *group;
+               char *service_ident;
+               bool need_save;
+
+               ident = connman_device_get_ident(wifi->device);
+               group = connman_network_get_group(connman_network);
+               if (ident && group) {
+                       service_ident = g_strdup_printf("%s_%s_%s",
+                               __connman_network_get_type(connman_network), ident, group);
+
+                       need_save = connman_device_set_last_connected_ident(wifi->device, service_ident);
+                       if (need_save)
+                               connman_device_save_last_connected(wifi->device);
+
+                       g_free(service_ident);
+               }
+
+               connman_network_set_last_connected_bssid(connman_network,
+                                       g_supplicant_network_get_last_connected_bssid(network));
+
+               update_needed = true;
+       }
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+#if defined TIZEN_EXT
+       else if (g_str_equal(property, "UpdateAssocReject")) {
+               connman_network_set_assoc_reject_table(connman_network,
+                                       g_supplicant_network_get_assoc_reject_table(network));
+               update_needed = true;
+       }
+#endif
+       else
                update_needed = false;
 
        if (update_needed)
                connman_network_update(connman_network);
+
+#if defined TIZEN_EXT
+       bssid = g_supplicant_network_get_bssid(network);
+       maxrate = g_supplicant_network_get_maxrate(network);
+       frequency = g_supplicant_network_get_frequency(network);
+       wps = g_supplicant_network_get_wps(network);
+       phy_mode = g_supplicant_network_get_phy_mode(network);
+
+       connman_network_set_bssid(connman_network, bssid);
+       connman_network_set_maxrate(connman_network, maxrate);
+       connman_network_set_frequency(connman_network, frequency);
+       connman_network_set_bool(connman_network, "WiFi.WPS", wps);
+       country_code = g_supplicant_network_get_countrycode(network);
+       connman_network_set_countrycode(connman_network, country_code);
+       bssid_list = (GSList *)g_supplicant_network_get_bssid_list(network);
+       connman_network_set_bssid_list(connman_network, bssid_list);
+       connman_network_set_phy_mode(connman_network, phy_mode);
+
+       if (g_str_equal(property, "CheckMultiBssidConnect") &&
+                       connman_network_get_associating(connman_network))
+               network_connect(connman_network);
+#endif
 }
 
 static void network_associated(GSupplicantNetwork *network)
@@ -3006,6 +5631,15 @@ static void network_associated(GSupplicantNetwork *network)
        interface = g_supplicant_network_get_interface(network);
        if (!interface)
                return;
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 
        wifi = g_supplicant_interface_get_data(interface);
        if (!wifi)
@@ -3024,7 +5658,22 @@ static void network_associated(GSupplicantNetwork *network)
        if (wifi->network) {
                if (wifi->network == connman_network)
                        return;
-
+#if TIZEN_EXT
+               unsigned int ssid_len;
+               DBG("network1 ssid[%s] , OWE[%d],ssid[%s]",
+                       (char *)connman_network_get_blob(wifi->network,"WiFi.SSID", &ssid_len),
+                       connman_network_get_bool(wifi->network,"WiFi.TRANSITION_MODE"),
+                       (char *)connman_network_get_blob(wifi->network,"WiFi.TRANSITION_MODE_SSID", &ssid_len));
+
+               DBG("network1 ssid[%s], OWE[%d], ssid[%s]",
+                       (char *)connman_network_get_blob(connman_network,"WiFi.SSID",&ssid_len),
+                       connman_network_get_bool(connman_network,"WiFi.TRANSITION_MODE"),
+                       (char *)connman_network_get_blob(connman_network,"WiFi.TRANSITION_MODE_SSID", &ssid_len));
+               if (connman_network_check_transition_mode(wifi->network, connman_network)) {//OWE trasition mode check
+                       DBG("OWE transition mode is TRUE");
+                       return;
+               }
+#endif
                /*
                 * This should never happen, we got associated with
                 * a network different than the one we were expecting.
@@ -3052,6 +5701,15 @@ static void network_associated(GSupplicantNetwork *network)
 static void sta_authorized(GSupplicantInterface *interface,
                                        const char *addr)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
 
        DBG("wifi %p station %s authorized", wifi, addr);
@@ -3065,6 +5723,15 @@ static void sta_authorized(GSupplicantInterface *interface,
 static void sta_deauthorized(GSupplicantInterface *interface,
                                        const char *addr)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
 
        DBG("wifi %p station %s deauthorized", wifi, addr);
@@ -3100,6 +5767,10 @@ static void peer_found(GSupplicantPeer *peer)
        const char *identifier, *name;
        int ret;
 
+#if defined TIZEN_EXT
+       if (!wifi)
+               return;
+#endif
        identifier = g_supplicant_peer_get_identifier(peer);
        name = g_supplicant_peer_get_name(peer);
 
@@ -3245,6 +5916,11 @@ static void peer_request(GSupplicantPeer *peer)
        struct connman_peer *connman_peer;
        const char *identifier;
 
+#if defined TIZEN_EXT
+       if (!wifi)
+               return;
+#endif
+
        identifier = g_supplicant_peer_get_identifier(peer);
 
        DBG("ident: %s", identifier);
@@ -3256,15 +5932,161 @@ static void peer_request(GSupplicantPeer *peer)
        connman_peer_request_connection(connman_peer);
 }
 
+#if defined TIZEN_EXT
+static void system_power_off(void)
+{
+       GList *list;
+       struct wifi_data *wifi;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+
+       if (connman_setting_get_bool("WiFiDHCPRelease") == true) {
+               for (list = iface_list; list; list = list->next) {
+                       wifi = list->data;
+
+                       if (wifi->network != NULL) {
+                               service = connman_service_lookup_from_network(wifi->network);
+                               ipconfig_ipv4 = __connman_service_get_ip4config(service);
+                               __connman_dhcp_stop(ipconfig_ipv4);
+                       }
+               }
+       }
+}
+
+static void network_merged(GSupplicantNetwork *network)
+{
+       GSupplicantInterface *interface;
+       GSupplicantState state;
+       struct wifi_data *wifi;
+       const char *identifier;
+       struct connman_network *connman_network;
+       bool ishs20AP = 0;
+       char *temp = NULL;
+
+       interface = g_supplicant_network_get_interface(network);
+       if (!interface)
+               return;
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+       state = g_supplicant_interface_get_state(interface);
+       if (state < G_SUPPLICANT_STATE_AUTHENTICATING)
+               return;
+
+       wifi = g_supplicant_interface_get_data(interface);
+       if (!wifi)
+               return;
+
+       identifier = g_supplicant_network_get_identifier(network);
+
+       connman_network = connman_device_get_network(wifi->device, identifier);
+       if (!connman_network)
+               return;
+
+       DBG("merged identifier %s", identifier);
+
+       if (wifi->connected == FALSE) {
+               switch (state) {
+               case G_SUPPLICANT_STATE_AUTHENTICATING:
+               case G_SUPPLICANT_STATE_ASSOCIATING:
+               case G_SUPPLICANT_STATE_ASSOCIATED:
+               case G_SUPPLICANT_STATE_4WAY_HANDSHAKE:
+               case G_SUPPLICANT_STATE_GROUP_HANDSHAKE:
+                       connman_network_set_associating(connman_network, TRUE);
+                       break;
+               case G_SUPPLICANT_STATE_COMPLETED:
+                       connman_network_set_connected(connman_network, TRUE);
+                       break;
+               default:
+                       DBG("Not handled the state : %d", state);
+                       break;
+               }
+       }
+
+       ishs20AP = g_supplicant_network_is_hs20AP(network);
+
+       if (ishs20AP &&
+               g_strcmp0(g_supplicant_network_get_security(network), "ieee8021x") == 0) {
+               temp = g_ascii_strdown(g_supplicant_network_get_eap(network), -1);
+               connman_network_set_string(connman_network, "WiFi.EAP",
+                               temp);
+               connman_network_set_string(connman_network, "WiFi.Identity",
+                               g_supplicant_network_get_identity(network));
+               connman_network_set_string(connman_network, "WiFi.Phase2",
+                               g_supplicant_network_get_phase2(network));
+
+               g_free(temp);
+       }
+
+       wifi->network = connman_network;
+}
+
+static void assoc_failed(void *user_data)
+{
+       struct connman_network *network = user_data;
+       connman_network_set_associating(network, false);
+}
+
+static void scan_done(GSupplicantInterface *interface)
+{
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+       GList *list;
+       int scan_type = CONNMAN_SCAN_TYPE_WPA_SUPPLICANT;
+       struct wifi_data *wifi;
+       bool scanning;
+
+       for (list = iface_list; list; list = list->next) {
+               wifi = list->data;
+
+               if (interface == wifi->interface) {
+                       scanning = connman_device_get_scanning(wifi->device,
+                                       CONNMAN_SERVICE_TYPE_WIFI);
+                       if (!scanning)
+                               __connman_technology_notify_scan_done(
+                                               connman_device_get_string(wifi->device, "Interface"), scan_type);
+                       break;
+               }
+       }
+}
+#endif
+
 static void debug(const char *str)
 {
+#if defined TIZEN_EXT
+       if (connman_setting_get_bool("ConnmanSupplicantDebug"))
+#else
        if (getenv("CONNMAN_SUPPLICANT_DEBUG"))
+#endif
                connman_debug("%s", str);
 }
 
 static void disconnect_reasoncode(GSupplicantInterface *interface,
                                int reasoncode)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
 
        if (wifi != NULL) {
@@ -3274,6 +6096,15 @@ static void disconnect_reasoncode(GSupplicantInterface *interface,
 
 static void assoc_status_code(GSupplicantInterface *interface, int status_code)
 {
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If supplicant interface's driver is wired then skip it,
+        * because it meanti only for ethernet not Wi-Fi.
+        */
+       if (!g_strcmp0("wired", g_supplicant_interface_get_driver(interface)))
+               return;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
        struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
 
        if (wifi != NULL) {
@@ -3281,7 +6112,11 @@ static void assoc_status_code(GSupplicantInterface *interface, int status_code)
        }
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static GSupplicantCallbacks callbacks = {
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 static const GSupplicantCallbacks callbacks = {
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
        .system_ready           = system_ready,
        .system_killed          = system_killed,
        .interface_added        = interface_added,
@@ -3301,9 +6136,22 @@ static const GSupplicantCallbacks callbacks = {
        .peer_lost              = peer_lost,
        .peer_changed           = peer_changed,
        .peer_request           = peer_request,
+#if defined TIZEN_EXT
+       .system_power_off       = system_power_off,
+       .network_merged         = network_merged,
+       .assoc_failed           = assoc_failed,
+       .scan_done              = scan_done,
+#endif
        .debug                  = debug,
        .disconnect_reasoncode  = disconnect_reasoncode,
        .assoc_status_code      = assoc_status_code,
+#if defined TIZEN_EXT_WIFI_MESH
+       .mesh_support           = mesh_support,
+       .mesh_group_started = mesh_group_started,
+       .mesh_group_removed = mesh_group_removed,
+       .mesh_peer_connected = mesh_peer_connected,
+       .mesh_peer_disconnected = mesh_peer_disconnected,
+#endif
 };
 
 
@@ -3328,7 +6176,11 @@ static GSupplicantSSID *ssid_ap_init(const char *ssid, const char *passphrase)
                return NULL;
 
        ap->mode = G_SUPPLICANT_MODE_MASTER;
+#if defined TIZEN_EXT
+       ap->ssid = (void *) ssid;
+#else
        ap->ssid = ssid;
+#endif
        ap->ssid_len = strlen(ssid);
        ap->scan_ssid = 0;
        ap->freq = 2412;
@@ -3436,6 +6288,9 @@ static void sta_remove_callback(int result,
        info->wifi->interface = NULL;
 
        g_supplicant_interface_create(info->ifname, driver, info->wifi->bridge,
+#ifdef TIZEN_EXT
+                       0, 0, 60,
+#endif /* TIZEN_EXT */
                                                ap_create_callback,
                                                        info);
 }
@@ -3602,6 +6457,33 @@ static int tech_set_regdom(struct connman_technology *technology, const char *al
        return g_supplicant_set_country(alpha2, regdom_callback, NULL);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+static void supp_ins_init(void)
+{
+       const char *string;
+       GSupplicantINSPreferredFreq preferred_freq;
+
+       string = connman_setting_get_string("INSPreferredFreqBSSID");
+       if (g_strcmp0(string, "5GHz") == 0)
+               preferred_freq = G_SUPPLICANT_INS_PREFERRED_FREQ_5GHZ;
+       else if (g_strcmp0(string, "2.4GHz") == 0)
+               preferred_freq = G_SUPPLICANT_INS_PREFERRED_FREQ_24GHZ;
+       else
+               preferred_freq = G_SUPPLICANT_INS_PREFERRED_FREQ_UNKNOWN;
+
+       g_supplicant_set_ins_settings(preferred_freq,
+               connman_setting_get_bool("INSLastConnectedBSSID"),
+               connman_setting_get_bool("INSAssocReject"),
+               connman_setting_get_bool("INSSignalBSSID"),
+               connman_setting_get_uint("INSPreferredFreqBSSIDScore"),
+               connman_setting_get_uint("INSLastConnectedBSSIDScore"),
+               connman_setting_get_uint("INSAssocRejectScore"),
+               connman_setting_get_int("INSSignalLevel3_5GHz"),
+               connman_setting_get_int("INSSignalLevel3_24GHz")
+       );
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
 static struct connman_technology_driver tech_driver = {
        .name           = "wifi",
        .type           = CONNMAN_SERVICE_TYPE_WIFI,
@@ -3632,6 +6514,13 @@ static int wifi_init(void)
                return err;
        }
 
+#if defined TIZEN_EXT
+       failed_bssids = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+#endif
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+       supp_ins_init();
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
        return 0;
 }
 
@@ -3644,6 +6533,10 @@ static void wifi_exit(void)
        g_supplicant_unregister(&callbacks);
 
        connman_network_driver_unregister(&network_driver);
+
+#if defined TIZEN_EXT
+       g_hash_table_unref(failed_bssids);
+#endif
 }
 
 CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,