Updated connman to version 1.35
[platform/upstream/connman.git] / plugins / wifi.c
old mode 100644 (file)
new mode 100755 (executable)
index ef4dd95..8bc6307
@@ -54,6 +54,8 @@
 #include <connman/storage.h>
 #include <include/setting.h>
 #include <connman/provision.h>
+#include <connman/utsname.h>
+#include <connman/machine.h>
 
 #include <gsupplicant/gsupplicant.h>
 
 #define AUTOSCAN_DEFAULT "exponential:3:300"
 
 #define P2P_FIND_TIMEOUT 30
+#define P2P_CONNECTION_TIMEOUT 100
+#define P2P_LISTEN_PERIOD 500
+#define P2P_LISTEN_INTERVAL 2000
+
+#define ASSOC_STATUS_NO_CLIENT 17
+#define LOAD_SHAPING_MAX_RETRIES 3
 
 static struct connman_technology *wifi_technology = NULL;
 static struct connman_technology *p2p_technology = NULL;
 
+enum wifi_ap_capability{
+       WIFI_AP_UNKNOWN         = 0,
+       WIFI_AP_SUPPORTED       = 1,
+       WIFI_AP_NOT_SUPPORTED   = 2,
+};
+
 struct hidden_params {
        char ssid[32];
        unsigned int ssid_len;
        char *identity;
+       char *anonymous_identity;
+       char *subject_match;
+       char *altsubject_match;
+       char *domain_suffix_match;
+       char *domain_match;
        char *passphrase;
        char *security;
        GSupplicantScanParams *scan_params;
@@ -90,6 +109,13 @@ struct autoscan_params {
        unsigned int timeout;
 };
 
+struct wifi_tethering_info {
+       struct wifi_data *wifi;
+       struct connman_technology *technology;
+       char *ifname;
+       GSupplicantSSID *ssid;
+};
+
 struct wifi_data {
        char *identifier;
        struct connman_device *device;
@@ -101,6 +127,7 @@ struct wifi_data {
        bool connected;
        bool disconnecting;
        bool tethering;
+       enum wifi_ap_capability ap_supported;
        bool bridged;
        bool interface_ready;
        const char *bridge;
@@ -108,8 +135,10 @@ struct wifi_data {
        unsigned flags;
        unsigned int watch;
        int retries;
+       int load_shaping_retries;
        struct hidden_params *hidden;
        bool postpone_hidden;
+       struct wifi_tethering_info *tethering_param;
        /**
         * autoscan "emulation".
         */
@@ -117,12 +146,162 @@ struct wifi_data {
 
        GSupplicantScanParams *scan_params;
        unsigned int p2p_find_timeout;
+       unsigned int p2p_connection_timeout;
+       struct connman_peer *pending_peer;
+       GSList *peers;
+       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;
+#endif
+       int disconnect_code;
+       int assoc_code;
 };
 
+#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;
+#endif
+
+
 static GList *iface_list = NULL;
 
+static GList *pending_wifi_device = NULL;
+static GList *p2p_iface_list = NULL;
+bool wfd_service_registered = false;
+
 static void start_autoscan(struct connman_device *device);
 
+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;
@@ -142,217 +321,778 @@ static struct connman_technology_driver p2p_tech_driver = {
        .remove         = p2p_tech_remove,
 };
 
-static void handle_tethering(struct wifi_data *wifi)
+static bool is_p2p_connecting(void)
 {
-       if (!wifi->tethering)
-               return;
+       GList *list;
 
-       if (!wifi->bridge)
-               return;
+       for (list = iface_list; list; list = list->next) {
+               struct wifi_data *wifi = list->data;
 
-       if (wifi->bridged)
-               return;
+               if (wifi->p2p_connecting)
+                       return true;
+       }
 
-       DBG("index %d bridge %s", wifi->index, wifi->bridge);
+       return false;
+}
 
-       if (connman_inet_add_to_bridge(wifi->index, wifi->bridge) < 0)
+static void add_pending_wifi_device(struct wifi_data *wifi)
+{
+       if (g_list_find(pending_wifi_device, wifi))
                return;
 
-       wifi->bridged = true;
+       pending_wifi_device = g_list_append(pending_wifi_device, wifi);
 }
 
-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;
-
-       DBG("index %d flags %d change %d", wifi->index, flags, change);
+       GList *list;
 
-       if ((wifi->flags & IFF_UP) != (flags & IFF_UP)) {
-               if (flags & IFF_UP)
-                       DBG("interface up");
-               else
-                       DBG("interface down");
-       }
+       for (list = pending_wifi_device; list; list = list->next) {
+               struct wifi_data *wifi;
+               const char *dev_name;
 
-       if ((wifi->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
-               if (flags & IFF_LOWER_UP) {
-                       DBG("carrier on");
+               wifi = list->data;
+               if (!wifi || !wifi->device)
+                       continue;
 
-                       handle_tethering(wifi);
-               } 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;
+               }
        }
 
-       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;
+       GList *link;
 
-       wifi->state = G_SUPPLICANT_STATE_INACTIVE;
+       link = g_list_find(pending_wifi_device, wifi);
 
-       connman_device_set_data(device, wifi);
-       wifi->device = connman_device_ref(device);
+       if (!link)
+               return;
 
-       wifi->index = connman_device_get_index(device);
-       wifi->flags = 0;
+       pending_wifi_device = g_list_delete_link(pending_wifi_device, link);
+}
 
-       wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
-                                                       wifi_newlink, device);
+static void peer_cancel_timeout(struct wifi_data *wifi)
+{
+       if (wifi->p2p_connection_timeout > 0)
+               g_source_remove(wifi->p2p_connection_timeout);
 
-       iface_list = g_list_append(iface_list, wifi);
+       wifi->p2p_connection_timeout = 0;
+       wifi->p2p_connecting = false;
 
-       return 0;
+       if (wifi->pending_peer) {
+               connman_peer_unref(wifi->pending_peer);
+               wifi->pending_peer = NULL;
+       }
 }
 
-static void remove_networks(struct connman_device *device,
-                               struct wifi_data *wifi)
+static gboolean peer_connect_timeout(gpointer data)
 {
-       GSList *list;
+       struct wifi_data *wifi = data;
 
-       for (list = wifi->networks; list; list = list->next) {
-               struct connman_network *network = list->data;
+       DBG("");
 
-               connman_device_remove_network(device, network);
-               connman_network_unref(network);
+       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->networks);
-       wifi->networks = 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;
-
-       if (autoscan->timeout == 0 && autoscan->interval == 0)
+       if (result < 0) {
+               peer_connect_timeout(wifi);
                return;
+       }
 
-       g_source_remove(autoscan->timeout);
-
-       autoscan->timeout = 0;
-       autoscan->interval = 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);
+
+       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;
        }
 
-       if (!p2p_exists)
-               connman_technology_driver_unregister(&p2p_tech_driver);
+       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);
+
+       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 void wifi_remove(struct connman_device *device)
+static int peer_disconnect(struct connman_peer *peer)
 {
-       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;
+       int ret;
 
-       DBG("device %p wifi %p", device, wifi);
+       DBG("peer %p", peer);
+
+       if (!device)
+               return -ENODEV;
 
+       wifi = connman_device_get_data(device);
        if (!wifi)
-               return;
+               return -ENODEV;
 
-       stop_autoscan(device);
+       gs_peer = g_supplicant_interface_peer_lookup(wifi->interface,
+                                       connman_peer_get_identifier(peer));
+       if (!gs_peer)
+               return -EINVAL;
 
-       iface_list = g_list_remove(iface_list, wifi);
+       peer_params.path = g_strdup(g_supplicant_peer_get_path(gs_peer));
 
-       check_p2p_technology();
+       ret = g_supplicant_interface_p2p_disconnect(wifi->interface,
+                                                       &peer_params);
+       g_free(peer_params.path);
 
-       if (wifi->p2p_find_timeout) {
-               g_source_remove(wifi->p2p_find_timeout);
-               connman_device_unref(wifi->device);
+       if (ret == -EINPROGRESS) {
+               peer_cancel_timeout(wifi);
+               wifi->p2p_device = false;
        }
 
-       remove_networks(device, wifi);
-
-       connman_device_set_powered(device, false);
-       connman_device_set_data(device, NULL);
-       connman_device_unref(wifi->device);
-       connman_rtnl_remove_watch(wifi->watch);
+       return ret;
+}
 
-       g_supplicant_interface_set_data(wifi->interface, NULL);
+struct peer_service_registration {
+       peer_service_registration_cb_t callback;
+       void *user_data;
+};
 
-       if (wifi->scan_params)
-               g_supplicant_free_scan_params(wifi->scan_params);
+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;
 
-       g_free(wifi->autoscan);
-       g_free(wifi->identifier);
-       g_free(wifi);
+       return true;
 }
 
-static bool is_duplicate(GSList *list, gchar *ssid, int ssid_len)
+static void apply_p2p_listen_on_iface(gpointer data, gpointer user_data)
 {
-       GSList *iter;
+       struct wifi_data *wifi = data;
 
-       for (iter = list; iter; iter = g_slist_next(iter)) {
-               struct scan_ssid *scan_ssid = iter->data;
+       if (!wifi->interface ||
+                       !g_supplicant_interface_has_p2p(wifi->interface))
+               return;
 
-               if (ssid_len == scan_ssid->ssid_len &&
-                               memcmp(ssid, scan_ssid->ssid, ssid_len) == 0)
-                       return true;
+       if (!wifi->servicing) {
+               g_supplicant_interface_p2p_listen(wifi->interface,
+                               P2P_LISTEN_PERIOD, P2P_LISTEN_INTERVAL);
        }
 
-       return false;
+       wifi->servicing++;
 }
 
-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 void register_wfd_service_cb(int result,
+                               GSupplicantInterface *iface, void *user_data)
 {
-       unsigned int i;
-       struct scan_ssid *scan_ssid;
+       struct peer_service_registration *reg_data = user_data;
 
-       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;
+       DBG("");
 
-               if (hex_ssid) {
-                       size_t hex_ssid_len = strlen(hex_ssid);
+       if (result == 0)
+               g_list_foreach(iface_list, apply_p2p_listen_on_iface, NULL);
 
-                       ssid = g_try_malloc0(hex_ssid_len / 2);
+       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;
+               params->service = g_memdup(spec, spec_length);
+       } else if (query_length > 0 && spec_length > 0) {
+               params->query = g_memdup(query, query_length);
+               params->query_length = query_length;
+
+               params->response = g_memdup(spec, spec_length);
+               params->response_length = spec_length;
+       } else {
+               params->wfd_ies = g_memdup(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) {
+                       ret = -ENOMEM;
+                       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) {
+                       ret = -ENOMEM;
+                       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");
+
+                       handle_tethering(wifi);
+               } else
+                       DBG("carrier off");
+       }
+
+       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;
+
+       if (autoscan->timeout == 0 && autoscan->interval == 0)
+               return;
+
+       g_source_remove(autoscan->timeout);
+
+       autoscan->timeout = 0;
+       autoscan->interval = 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);
+       }
+}
+
+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();
+
+       remove_pending_wifi_device(wifi);
+
+       if (wifi->p2p_find_timeout) {
+               g_source_remove(wifi->p2p_find_timeout);
+               connman_device_unref(wifi->device);
+       }
+
+       if (wifi->p2p_connection_timeout)
+               g_source_remove(wifi->p2p_connection_timeout);
+
+       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);
+
+       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;
 
@@ -442,7 +1182,7 @@ static int get_hidden_connections(GSupplicantScanParams *scan_data)
        GKeyFile *keyfile;
        gchar **services;
        char *ssid, *name;
-       int i, freq, ret;
+       int i, ret;
        bool value;
        int num_ssids = 0, add_param_failed = 0;
 
@@ -469,16 +1209,22 @@ static int get_hidden_connections(GSupplicantScanParams *scan_data)
                        continue;
                }
 
+#if defined TIZEN_EXT
+               value = g_key_file_get_boolean(keyfile,
+                                       services[i], "AutoConnect", NULL);
+               if (!value) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
+#endif
+
                ssid = g_key_file_get_string(keyfile,
                                        services[i], "SSID", NULL);
 
-               freq = g_key_file_get_integer(keyfile, services[i],
-                                       "Frequency", NULL);
-
                name = g_key_file_get_string(keyfile, services[i], "Name",
                                                                NULL);
 
-               ret = add_scan_param(ssid, NULL, 0, freq, scan_data, 0, name);
+               ret = add_scan_param(ssid, NULL, 0, 0, scan_data, 0, name);
                if (ret < 0)
                        add_param_failed++;
                else if (ret > 0)
@@ -611,8 +1357,11 @@ static int throw_wifi_scan(struct connman_device *device,
 
        if (wifi->tethering)
                return -EBUSY;
-
+#if defined TIZEN_EXT
+       if (connman_device_get_scanning(device) && !wifi->allow_full_scan)
+#else
        if (connman_device_get_scanning(device))
+#endif
                return -EALREADY;
 
        connman_device_ref(device);
@@ -641,6 +1390,45 @@ static void hidden_free(struct hidden_params *hidden)
        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;
+       }
+}
+#endif
+
 static void scan_callback(int result, GSupplicantInterface *interface,
                                                void *user_data)
 {
@@ -686,14 +1474,31 @@ static void scan_callback(int result, GSupplicantInterface *interface,
                return scan_callback(ret, interface, user_data);
        }
 
-       scanning = connman_device_get_scanning(device);
+#if defined TIZEN_EXT
+       if (wifi && wifi->allow_full_scan) {
+               int ret;
+               DBG("Trigger Full Channel Scan");
+               wifi->allow_full_scan = FALSE;
 
-       if (scanning) {
+               ret = g_supplicant_interface_scan(wifi->interface, NULL,
+                                                       scan_callback, device);
+               if (ret == 0)
+                       return;
+
+               /* On error, let's recall scan_callback, which will cleanup */
+               return scan_callback(ret, interface, user_data);
+       }
+#endif
+
+       scanning = connman_device_get_scanning(device);
+       if (scanning)
                connman_device_set_scanning(device,
                                CONNMAN_SERVICE_TYPE_WIFI, false);
-       }
 
        if (result != -ENOLINK)
+#if defined TIZEN_EXT
+       if (result != -EIO)
+#endif
                start_autoscan(device);
 
        /*
@@ -705,6 +1510,23 @@ static void scan_callback(int result, GSupplicantInterface *interface,
 
        if (scanning)
                connman_device_unref(device);
+
+#if defined TIZEN_EXT
+       if (wifi && wifi->scan_pending_network && result != -EIO) {
+               network_connect(wifi->scan_pending_network);
+               wifi->scan_pending_network = NULL;
+               connman_network_set_connecting(wifi->network);
+       }
+
+       if (is_wifi_notifier_registered != true &&
+                       wifi_first_scan == true && found_with_first_scan == true) {
+               wifi_first_scan = false;
+               found_with_first_scan = false;
+
+               connman_notifier_register(&notifier);
+               is_wifi_notifier_registered = true;
+       }
+#endif
 }
 
 static void scan_callback_hidden(int result,
@@ -761,7 +1583,11 @@ static gboolean autoscan_timeout(gpointer data)
        } else
                interval = autoscan->interval * autoscan->base;
 
+#if defined TIZEN_EXT
        if (autoscan->interval >= autoscan->limit)
+#else
+       if (interval > autoscan->limit)
+#endif
                interval = autoscan->limit;
 
        throw_wifi_scan(wifi->device, scan_callback_hidden);
@@ -787,6 +1613,12 @@ static void start_autoscan(struct connman_device *device)
        if (!wifi)
                return;
 
+       if (wifi->p2p_device)
+               return;
+
+       if (wifi->connected)
+               return;
+
        autoscan = wifi->autoscan;
        if (!autoscan)
                return;
@@ -843,22 +1675,8 @@ static void setup_autoscan(struct wifi_data *wifi)
        start_autoscan(wifi->device);
 }
 
-static void interface_autoscan_callback(int result,
-                                       GSupplicantInterface *interface,
-                                                       void *user_data)
-{
-       struct wifi_data *wifi = user_data;
-
-       if (result < 0) {
-               DBG("Could not enable Autoscan, falling back...");
-               setup_autoscan(wifi);
-       }
-}
-
 static void finalize_interface_creation(struct wifi_data *wifi)
 {
-       GSupplicantInterface *interface = wifi->interface;
-
        DBG("interface is ready wifi %p tethering %d", wifi, wifi->tethering);
 
        if (!wifi->device) {
@@ -871,12 +1689,10 @@ static void finalize_interface_creation(struct wifi_data *wifi)
        if (!connman_setting_get_bool("BackgroundScanning"))
                return;
 
-       /* Setting up automatic scanning */
-       if (g_supplicant_interface_autoscan(interface, AUTOSCAN_DEFAULT,
-                               interface_autoscan_callback, wifi) < 0) {
-               DBG("Could not enable Autoscan, falling back...");
-               setup_autoscan(wifi);
-       }
+       if (wifi->p2p_device)
+               return;
+
+       setup_autoscan(wifi);
 }
 
 static void interface_create_callback(int result,
@@ -915,6 +1731,9 @@ static int wifi_enable(struct connman_device *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,
                                                interface_create_callback,
@@ -948,6 +1767,7 @@ static int wifi_disable(struct connman_device *device)
        if (wifi->p2p_find_timeout) {
                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);
        }
 
@@ -959,6 +1779,16 @@ static int wifi_disable(struct connman_device *device)
        }
 
        remove_networks(device, wifi);
+       remove_peers(wifi);
+
+#if defined TIZEN_EXT
+       wifi->scan_pending_network = NULL;
+
+       if (is_wifi_notifier_registered == true) {
+               connman_notifier_unregister(&notifier);
+               is_wifi_notifier_registered = false;
+       }
+#endif
 
        ret = g_supplicant_interface_remove(wifi->interface, NULL, NULL);
        if (ret < 0)
@@ -1113,12 +1943,14 @@ static gboolean p2p_find_stop(gpointer data)
 
        DBG("");
 
-       wifi->p2p_find_timeout = 0;
+       if (wifi) {
+               wifi->p2p_find_timeout = 0;
+
+               g_supplicant_interface_p2p_stop_find(wifi->interface);
+       }
 
        connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_P2P, false);
 
-       g_supplicant_interface_p2p_stop_find(wifi->interface);
-
        connman_device_unref(device);
        reset_autoscan(device);
 
@@ -1133,6 +1965,9 @@ static void p2p_find_callback(int result, GSupplicantInterface *interface,
 
        DBG("result %d wifi %p", result, wifi);
 
+       if (!wifi)
+               goto error;
+
        if (wifi->p2p_find_timeout) {
                g_source_remove(wifi->p2p_find_timeout);
                wifi->p2p_find_timeout = 0;
@@ -1151,31 +1986,167 @@ error:
        p2p_find_stop(device);
 }
 
-static int p2p_find(struct connman_device *device)
-{
-       struct wifi_data *wifi = connman_device_get_data(device);
-       int ret;
+static int p2p_find(struct connman_device *device)
+{
+       struct wifi_data *wifi;
+       int ret;
+
+       DBG("");
+
+       if (!p2p_technology)
+               return -ENOTSUP;
+
+       wifi = connman_device_get_data(device);
+
+       if (g_supplicant_interface_is_p2p_finding(wifi->interface))
+               return -EALREADY;
+
+       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 {
+               connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_P2P, true);
+       }
+
+       return ret;
+}
+
+#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);
+       bool scanning;
+
+       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);
+       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;
+
+       if (wifi->p2p_device)
+               return 0;
+
+       if (type == CONNMAN_SERVICE_TYPE_P2P)
+               return p2p_find(device);
+
+       if (wifi->tethering)
+               return 0;
+
+       scanning = connman_device_get_scanning(device);
+       if (scanning)
+               return -EALREADY;
+
+       DBG("scan_type: %d", scan_type);
+       if (scan_type == 1) { /* ssid based scan */
+               scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!scan_params) {
+                       DBG("Failed to allocate memory.");
+                       return -ENOMEM;
+               }
+
+               for (list = specific_scan_list; list; list = list->next) {
+                       ssid = (char *)list->data;
+                       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);
+                       count++;
+               }
+               scan_params->num_ssids = count;
+
+       } else if (scan_type == 2) { /* frequency based scan */
+
+               scan_params = g_try_malloc0(sizeof(GSupplicantScanParams));
+               if (!scan_params) {
+                       DBG("Failed to allocate memory.");
+                       return -ENOMEM;
+               }
+
+               guint num_freqs = g_slist_length(specific_scan_list);
+               DBG("num_freqs: %d", num_freqs);
+
+               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;
+               }
+
+               count = 0;
+               for (list = specific_scan_list; list; list = list->next) {
+                       freq = (int)list->data;
 
-       DBG("");
+                       scan_params->freqs[count] = freq;
+                       DBG("scan_params->freqs[%d]: %d", count, scan_params->freqs[count]);
+                       count++;
+               }
+               scan_params->num_freqs = count;
 
-       if (!p2p_technology)
-               return -ENOTSUP;
+       } else {
+               DBG("Invalid scan");
+               return -EINVAL;
+       }
 
        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(wifi->interface, scan_params,
+                                               specific_scan_callback, device);
+
+       if (ret == 0) {
                connman_device_set_scanning(device,
-                               CONNMAN_SERVICE_TYPE_P2P, true);
+                               CONNMAN_SERVICE_TYPE_WIFI, 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
@@ -1199,14 +2170,17 @@ static int wifi_scan(enum connman_service_type type,
        if (!wifi)
                return -ENODEV;
 
+       if (wifi->p2p_device)
+               return -EBUSY;
+
+       if (wifi->tethering)
+               return -EBUSY;
+
        if (type == CONNMAN_SERVICE_TYPE_P2P)
                return p2p_find(device);
 
        DBG("device %p wifi %p hidden ssid %s", device, wifi->interface, ssid);
 
-       if (wifi->tethering)
-               return 0;
-
        scanning = connman_device_get_scanning(device);
 
        if (!ssid || ssid_len == 0 || ssid_len > 32) {
@@ -1271,6 +2245,9 @@ static int wifi_scan(enum connman_service_type type,
 
                        return 0;
                }
+       } else if (wifi->connected) {
+               g_supplicant_free_scan_params(scan_params);
+               return wifi_scan_simple(device);
        } else {
                ret = get_latest_connections(driver_max_ssids, scan_params);
                if (ret <= 0) {
@@ -1285,9 +2262,18 @@ static int wifi_scan(enum connman_service_type type,
 
        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.*/
+               wifi->allow_full_scan = TRUE;
+#endif
        } else {
                g_supplicant_free_scan_params(scan_params);
                connman_device_unref(device);
@@ -1341,6 +2327,9 @@ static struct connman_device_driver wifi_ng_driver = {
        .disable        = wifi_disable,
        .scan           = wifi_scan,
        .set_regdom     = wifi_set_regdom,
+#if defined TIZEN_EXT
+       .specific_scan  = wifi_specific_scan,
+#endif
 };
 
 static void system_ready(void)
@@ -1380,15 +2369,42 @@ 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
+       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:
+#endif
        if (result == -ENOKEY) {
                connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_INVALID_KEY);
@@ -1414,6 +2430,12 @@ 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;
+#endif
 
        return G_SUPPLICANT_SECURITY_UNKNOWN;
 }
@@ -1431,7 +2453,6 @@ static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
        ssid->security = network_security(security);
        ssid->passphrase = connman_network_get_string(network,
                                                "WiFi.Passphrase");
-
        ssid->eap = connman_network_get_string(network, "WiFi.EAP");
 
        /*
@@ -1452,8 +2473,18 @@ static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
                ssid->identity = connman_network_get_string(network,
                                                        "WiFi.AgentIdentity");
 
+       ssid->anonymous_identity = connman_network_get_string(network,
+                                               "WiFi.AnonymousIdentity");
        ssid->ca_cert_path = connman_network_get_string(network,
                                                        "WiFi.CACertFile");
+       ssid->subject_match = connman_network_get_string(network,
+                                                       "WiFi.SubjectMatch");
+       ssid->altsubject_match = connman_network_get_string(network,
+                                                       "WiFi.AltSubjectMatch");
+       ssid->domain_suffix_match = connman_network_get_string(network,
+                                                       "WiFi.DomainSuffixMatch");
+       ssid->domain_match = connman_network_get_string(network,
+                                                       "WiFi.DomainMatch");
        ssid->client_cert_path = connman_network_get_string(network,
                                                        "WiFi.ClientCertFile");
        ssid->private_key_path = connman_network_get_string(network,
@@ -1465,6 +2496,13 @@ 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->bssid = connman_network_get_bssid(network);
+#endif
+#if defined TIZEN_EXT
+       ssid->freq = connman_network_get_frequency(network);
+#endif
+
        if (connman_setting_get_bool("BackgroundScanning"))
                ssid->bgscan = BGSCAN_DEFAULT;
 }
@@ -1499,6 +2537,9 @@ static int network_connect(struct connman_network *network)
        } 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);
@@ -1510,7 +2551,30 @@ static int network_connect(struct connman_network *network)
 static void disconnect_callback(int result, GSupplicantInterface *interface,
                                                                void *user_data)
 {
+#if defined TIZEN_EXT
+       GList *list;
+       struct wifi_data *wifi;
+       struct connman_network *network = user_data;
+
+       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 = user_data;
+#endif
 
        DBG("result %d supplicant interface %p wifi %p",
                        result, interface, wifi);
@@ -1521,20 +2585,12 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
        }
 
        if (wifi->network) {
-               /*
-                * if result < 0 supplican return an error because
-                * the network is not current.
-                * we wont receive G_SUPPLICANT_STATE_DISCONNECTED since it
-                * failed, call connman_network_set_connected to report
-                * disconnect is completed.
-                */
-               if (result < 0)
-                       connman_network_set_connected(wifi->network, false);
+               connman_network_set_connected(wifi->network, false);
+               wifi->network = NULL;
        }
 
-       wifi->network = NULL;
-
        wifi->disconnecting = false;
+       wifi->connected = false;
 
        if (wifi->pending_network) {
                network_connect(wifi->pending_network);
@@ -1549,6 +2605,9 @@ static int network_disconnect(struct connman_network *network)
        struct connman_device *device = connman_network_get_device(network);
        struct wifi_data *wifi;
        int err;
+#if defined TIZEN_EXT
+       struct connman_service *service;
+#endif
 
        DBG("network %p", network);
 
@@ -1556,6 +2615,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)
@@ -1563,8 +2645,14 @@ static int network_disconnect(struct connman_network *network)
 
        wifi->disconnecting = true;
 
+#if defined TIZEN_EXT
+       err = g_supplicant_interface_disconnect(wifi->interface,
+                                               disconnect_callback, network);
+#else
        err = g_supplicant_interface_disconnect(wifi->interface,
                                                disconnect_callback, wifi);
+#endif
+
        if (err < 0)
                wifi->disconnecting = false;
 
@@ -1588,14 +2676,16 @@ static void interface_added(GSupplicantInterface *interface)
        struct wifi_data *wifi;
 
        wifi = g_supplicant_interface_get_data(interface);
+       if (!wifi) {
+               wifi = get_pending_wifi_data(ifname);
+               if (!wifi)
+                       return;
 
-       /*
-        * We can get here with a NULL wifi pointer when
-        * the interface added signal is sent before the
-        * interface creation callback is called.
-        */
-       if (!wifi)
-               return;
+               wifi->interface = interface;
+               g_supplicant_interface_set_data(interface, wifi);
+               p2p_iface_list = g_list_append(p2p_iface_list, wifi);
+               wifi->p2p_device = true;
+       }
 
        DBG("ifname %s driver %s wifi %p tethering %d",
                        ifname, driver, wifi, wifi->tethering);
@@ -1606,9 +2696,6 @@ static void interface_added(GSupplicantInterface *interface)
        }
 
        connman_device_set_powered(wifi->device, true);
-
-       if (wifi->tethering)
-               return;
 }
 
 static bool is_idle(struct wifi_data *wifi)
@@ -1688,30 +2775,100 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
                if (!wps_ssid || wps_ssid_len != ssid_len ||
                                memcmp(ssid, wps_ssid, ssid_len) != 0) {
                        connman_network_set_associating(network, false);
+#if defined TIZEN_EXT
+                       g_supplicant_interface_disconnect(wifi->interface,
+                                               disconnect_callback, wifi->network);
+
+                       connman_network_set_bool(network, "WiFi.UseWPS", false);
+                       connman_network_set_string(network, "WiFi.PinWPS", NULL);
+#else
                        g_supplicant_interface_disconnect(wifi->interface,
                                                disconnect_callback, wifi);
+#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, passphrase);
+
+                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;
 }
 
+static bool handle_assoc_status_code(GSupplicantInterface *interface,
+                                     struct wifi_data *wifi)
+{
+       if (wifi->state == G_SUPPLICANT_STATE_ASSOCIATING &&
+                       wifi->assoc_code == ASSOC_STATUS_NO_CLIENT &&
+                       wifi->load_shaping_retries < LOAD_SHAPING_MAX_RETRIES) {
+               wifi->load_shaping_retries ++;
+               return TRUE;
+       }
+       wifi->load_shaping_retries = 0;
+       return FALSE;
+}
+
 static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
                                        struct connman_network *network,
                                        struct wifi_data *wifi)
 {
+#if defined TIZEN_EXT
+       const char *security;
+       struct connman_service *service;
+
+       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
        struct connman_service *service;
 
        if (wifi->state != G_SUPPLICANT_STATE_4WAY_HANDSHAKE)
                return false;
 
+       if (wifi->connected)
+               return false;
+#endif
+
        service = connman_service_lookup_from_network(network);
        if (!service)
                return false;
@@ -1729,6 +2886,47 @@ 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_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.
+                */
+               connman_network_set_error(network, CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
+
+               return false;
+       }
+
+       return true;
+}
+#endif
+
 static void interface_state(GSupplicantInterface *interface)
 {
        struct connman_network *network;
@@ -1736,6 +2934,7 @@ static void interface_state(GSupplicantInterface *interface)
        struct wifi_data *wifi;
        GSupplicantState state = g_supplicant_interface_get_state(interface);
        bool wps;
+       bool old_connected;
 
        wifi = g_supplicant_interface_get_data(interface);
 
@@ -1744,6 +2943,14 @@ static void interface_state(GSupplicantInterface *interface)
        if (!wifi)
                return;
 
+       if (state == G_SUPPLICANT_STATE_COMPLETED) {
+               if (wifi->tethering_param) {
+                       g_free(wifi->tethering_param->ssid);
+                       g_free(wifi->tethering_param);
+                       wifi->tethering_param = NULL;
+               }
+       }
+
        device = wifi->device;
        if (!device)
                return;
@@ -1760,11 +2967,18 @@ static void interface_state(GSupplicantInterface *interface)
 
        switch (state) {
        case G_SUPPLICANT_STATE_SCANNING:
+               if (wifi->connected)
+                       connman_network_set_connected(network, false);
+
                break;
 
        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);
@@ -1772,13 +2986,34 @@ 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);
+               if (scanning){
+                       connman_device_set_scanning(device,
+                               CONNMAN_SERVICE_TYPE_WIFI, false);
+                       connman_device_unref(device);
+               }
+#else
                /* though it should be already stopped: */
                stop_autoscan(device);
+#endif
 
                if (!handle_wps_completion(interface, network, device, wifi))
                        break;
 
                connman_network_set_connected(network, true);
+
+               wifi->disconnect_code = 0;
+               wifi->assoc_code = 0;
+               wifi->load_shaping_retries = 0;
                break;
 
        case G_SUPPLICANT_STATE_DISCONNECTED:
@@ -1796,6 +3031,9 @@ static void interface_state(GSupplicantInterface *interface)
                if (is_idle(wifi))
                        break;
 
+               if (handle_assoc_status_code(interface, wifi))
+                       break;
+
                /* If previous state was 4way-handshake, then
                 * it's either: psk was incorrect and thus we retry
                 * or if we reach the maximum retries we declare the
@@ -1804,11 +3042,58 @@ static void interface_state(GSupplicantInterface *interface)
                                                network, wifi))
                        break;
 
-               /* We disable the selected network, if not then
-                * wpa_supplicant will loop retrying */
-               if (g_supplicant_interface_enable_selected_network(interface,
-                                               FALSE) != 0)
-                       DBG("Could not disables selected network");
+               /* See table 8-36 Reason codes in IEEE Std 802.11 */
+               switch (wifi->disconnect_code) {
+               case 1: /* Unspecified reason */
+                       /* Let's assume it's because we got blocked */
+
+               case 6: /* Class 2 frame received from nonauthenticated STA */
+                       connman_network_set_error(network,
+                                               CONNMAN_NETWORK_ERROR_BLOCKED);
+                       break;
+
+               default:
+                       break;
+               }
+
+#if defined TIZEN_EXT
+               int err;
+
+               err = g_supplicant_interface_remove_network(wifi->interface);
+               if (err < 0)
+                       DBG("Failed to remove network(%d)", err);
+
+
+               /* 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);
+               }
+
+               /* To avoid unnecessary repeated association in wpa_supplicant,
+                * "RemoveNetwork" should be made when Wi-Fi is disconnected */
+               if (wps != true && wifi->network && wifi->disconnecting == false) {
+                       wifi->disconnecting = true;
+                       err = g_supplicant_interface_disconnect(wifi->interface,
+                                                       disconnect_callback, wifi->network);
+                       if (err < 0)
+                               wifi->disconnecting = false;
+
+               connman_network_set_connected(network, false);
+               connman_network_set_associating(network, false);
+
+               start_autoscan(device);
+
+               break;
+               }
+#endif
 
                connman_network_set_connected(network, false);
                connman_network_set_associating(network, false);
@@ -1819,6 +3104,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);
 
@@ -1832,6 +3121,7 @@ static void interface_state(GSupplicantInterface *interface)
                break;
        }
 
+       old_connected = wifi->connected;
        wifi->state = state;
 
        /* Saving wpa_s state policy:
@@ -1851,8 +3141,12 @@ static void interface_state(GSupplicantInterface *interface)
                if (wifi->connected)
                        connman_warn("Probably roaming right now!"
                                                " Staying connected...");
-               else
-                       wifi->connected = false;
+               break;
+       case G_SUPPLICANT_STATE_SCANNING:
+               wifi->connected = false;
+
+               if (old_connected)
+                       start_autoscan(device);
                break;
        case G_SUPPLICANT_STATE_COMPLETED:
                wifi->connected = true;
@@ -1874,39 +3168,144 @@ static void interface_removed(GSupplicantInterface *interface)
 
        wifi = g_supplicant_interface_get_data(interface);
 
+       if (wifi)
+               wifi->interface = NULL;
+
        if (wifi && wifi->tethering)
                return;
 
-       if (!wifi || !wifi->device) {
-               DBG("wifi interface already removed");
+       if (!wifi || !wifi->device) {
+               DBG("wifi interface already removed");
+               return;
+       }
+
+       connman_device_set_powered(wifi->device, false);
+
+       check_p2p_technology();
+}
+
+static void set_device_type(const char *type, char dev_type[17])
+{
+       const char *oui = "0050F204";
+       const char *category = "0001";
+       const char *sub_category = "0000";
+
+       if (!g_strcmp0(type, "handset")) {
+               category = "000A";
+               sub_category = "0005";
+       } else if (!g_strcmp0(type, "vm") || !g_strcmp0(type, "container"))
+               sub_category = "0001";
+       else if (!g_strcmp0(type, "server"))
+               sub_category = "0002";
+       else if (!g_strcmp0(type, "laptop"))
+               sub_category = "0005";
+       else if (!g_strcmp0(type, "desktop"))
+               sub_category = "0006";
+       else if (!g_strcmp0(type, "tablet"))
+               sub_category = "0009";
+       else if (!g_strcmp0(type, "watch"))
+               category = "00FF";
+
+       snprintf(dev_type, 17, "%s%s%s", category, oui, sub_category);
+}
+
+static void p2p_support(GSupplicantInterface *interface)
+{
+       char dev_type[17] = {};
+       const char *hostname;
+
+       DBG("");
+
+       if (!interface)
+               return;
+
+       if (!g_supplicant_interface_has_p2p(interface))
+               return;
+
+       if (connman_technology_driver_register(&p2p_tech_driver) < 0) {
+               DBG("Could not register P2P technology driver");
+               return;
+       }
+
+       hostname = connman_utsname_get_hostname();
+       if (!hostname)
+               hostname = "ConnMan";
+
+       set_device_type(connman_machine_get_type(), dev_type);
+       g_supplicant_interface_set_p2p_device_config(interface,
+                                                       hostname, dev_type);
+       connman_peer_driver_register(&peer_driver);
+}
+
+static void scan_started(GSupplicantInterface *interface)
+{
+       DBG("");
+}
+
+static void scan_finished(GSupplicantInterface *interface)
+{
+#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;
 
-       wifi->interface = NULL;
-       connman_device_set_powered(wifi->device, false);
+       //go scan
 
-       check_p2p_technology();
+#endif
 }
 
-static void p2p_support(GSupplicantInterface *interface)
+static void ap_create_fail(GSupplicantInterface *interface)
 {
-       DBG("");
+       struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
+       int ret;
 
-       if (!g_supplicant_interface_has_p2p(interface))
-               return;
+       if ((wifi->tethering) && (wifi->tethering_param)) {
+               DBG("%s create AP fail \n",
+                               g_supplicant_interface_get_ifname(wifi->interface));
 
-       if (connman_technology_driver_register(&p2p_tech_driver) == 0)
-               DBG("Could not register P2P technology driver");
-}
+               connman_inet_remove_from_bridge(wifi->index, wifi->bridge);
+               wifi->ap_supported = WIFI_AP_NOT_SUPPORTED;
+               wifi->tethering = false;
 
-static void scan_started(GSupplicantInterface *interface)
-{
-       DBG("");
-}
+               ret = tech_set_tethering(wifi->tethering_param->technology,
+                               wifi->tethering_param->ssid->ssid,
+                               wifi->tethering_param->ssid->passphrase,
+                               wifi->bridge, true);
 
-static void scan_finished(GSupplicantInterface *interface)
-{
-       DBG("");
+               if ((ret == -EOPNOTSUPP) && (wifi_technology)) {
+                       connman_technology_tethering_notify(wifi_technology,false);
+               }
+
+               g_free(wifi->tethering_param->ssid);
+               g_free(wifi->tethering_param);
+               wifi->tethering_param = NULL;
+       }
+
+       return;
 }
 
 static unsigned char calculate_strength(GSupplicantNetwork *supplicant_network)
@@ -1914,9 +3313,11 @@ 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;
 }
 
@@ -1933,6 +3334,11 @@ static void network_added(GSupplicantNetwork *supplicant_network)
        bool wps_ready;
        bool wps_advertizing;
 
+#if defined TIZEN_EXT
+       const char *wifi_vsie;
+       unsigned int wifi_vsie_len;
+#endif
+
        mode = g_supplicant_network_get_mode(supplicant_network);
        identifier = g_supplicant_network_get_identifier(supplicant_network);
 
@@ -1957,6 +3363,9 @@ static void network_added(GSupplicantNetwork *supplicant_network)
 
        ssid = g_supplicant_network_get_ssid(supplicant_network, &ssid_len);
 
+#if defined TIZEN_EXT
+       wifi_vsie = g_supplicant_network_get_wifi_vsie(supplicant_network, &wifi_vsie_len);
+#endif
        network = connman_device_get_network(wifi->device, identifier);
 
        if (!network) {
@@ -1975,136 +3384,520 @@ static void network_added(GSupplicantNetwork *supplicant_network)
                wifi->networks = g_slist_prepend(wifi->networks, network);
        }
 
-       if (name && name[0] != '\0')
-               connman_network_set_name(network, name);
+       if (name && name[0] != '\0')
+               connman_network_set_name(network, name);
+
+       connman_network_set_blob(network, "WiFi.SSID",
+                                               ssid, ssid_len);
+#if defined TIZEN_EXT
+       if(wifi_vsie_len > 0 && wifi_vsie)
+               connman_network_set_blob(network, "WiFi.Vsie",
+                                                       wifi_vsie, wifi_vsie_len);
+#endif
+       connman_network_set_string(network, "WiFi.Security", security);
+       connman_network_set_strength(network,
+                               calculate_strength(supplicant_network));
+       connman_network_set_bool(network, "WiFi.WPS", wps);
+
+       if (wps) {
+               /* Is AP advertizing for WPS association?
+                * 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
+       connman_network_set_bssid(network,
+                       g_supplicant_network_get_bssid(supplicant_network));
+       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_keymgmt(network,
+                       g_supplicant_network_get_keymgmt(supplicant_network));
+       connman_network_set_bool(network, "WiFi.HS20AP",
+                       g_supplicant_network_is_hs20AP(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
+       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,
+                                       wifi->hidden->identity,
+                                       wifi->hidden->passphrase,
+                                       wifi->hidden->user_data);
+                       wifi->hidden->user_data = NULL;
+                       hidden_free(wifi->hidden);
+                       wifi->hidden = NULL;
+               }
+       }
+}
+
+static void network_removed(GSupplicantNetwork *network)
+{
+       GSupplicantInterface *interface;
+       struct wifi_data *wifi;
+       const char *name, *identifier;
+       struct connman_network *connman_network;
+
+       interface = g_supplicant_network_get_interface(network);
+       wifi = g_supplicant_interface_get_data(interface);
+       identifier = g_supplicant_network_get_identifier(network);
+       name = g_supplicant_network_get_name(network);
+
+       DBG("name %s", name);
+
+       if (!wifi)
+               return;
+
+       connman_network = connman_device_get_network(wifi->device, identifier);
+       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);
+       connman_network_unref(connman_network);
+}
+
+static void network_changed(GSupplicantNetwork *network, const char *property)
+{
+       GSupplicantInterface *interface;
+       struct wifi_data *wifi;
+       const char *name, *identifier;
+       struct connman_network *connman_network;
+
+#if defined TIZEN_EXT
+       const unsigned char *bssid;
+       unsigned int maxrate;
+       uint16_t frequency;
+       bool wps;
+#endif
+
+       interface = g_supplicant_network_get_interface(network);
+       wifi = g_supplicant_interface_get_data(interface);
+       identifier = g_supplicant_network_get_identifier(network);
+       name = g_supplicant_network_get_name(network);
+
+       DBG("name %s", name);
+
+       if (!wifi)
+               return;
+
+       connman_network = connman_device_get_network(wifi->device, identifier);
+       if (!connman_network)
+               return;
+
+       if (g_str_equal(property, "Signal")) {
+              connman_network_set_strength(connman_network,
+                                       calculate_strength(network));
+              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);
+
+       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);
+#endif
+}
+
+static void network_associated(GSupplicantNetwork *network)
+{
+       GSupplicantInterface *interface;
+       struct wifi_data *wifi;
+       struct connman_network *connman_network;
+       const char *identifier;
+
+       DBG("");
+
+       interface = g_supplicant_network_get_interface(network);
+       if (!interface)
+               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;
+
+       if (wifi->network) {
+               if (wifi->network == connman_network)
+                       return;
+
+               /*
+                * This should never happen, we got associated with
+                * a network different than the one we were expecting.
+                */
+               DBG("Associated to %p while expecting %p",
+                                       connman_network, wifi->network);
+
+               connman_network_set_associating(wifi->network, false);
+       }
+
+       DBG("Reconnecting to previous network %p from wpa_s", connman_network);
+
+       wifi->network = connman_network_ref(connman_network);
+       wifi->retries = 0;
+
+       /*
+        * Interface state changes callback (interface_state) is always
+        * called before network_associated callback thus we need to call
+        * interface_state again in order to process the new state now that
+        * we have the network properly set.
+        */
+       interface_state(interface);
+}
+
+static void apply_peer_services(GSupplicantPeer *peer,
+                               struct connman_peer *connman_peer)
+{
+       const unsigned char *data;
+       int length;
+
+       DBG("");
+
+       connman_peer_reset_services(connman_peer);
+
+       data = g_supplicant_peer_get_widi_ies(peer, &length);
+       if (data) {
+               connman_peer_add_service(connman_peer,
+                       CONNMAN_PEER_SERVICE_WIFI_DISPLAY, data, length);
+       }
+}
+
+static void add_station(const char *mac)
+{
+       connman_technology_tethering_add_station(CONNMAN_SERVICE_TYPE_WIFI,
+                                                mac);
+}
+
+static void remove_station(const char *mac)
+{
+       connman_technology_tethering_remove_station(mac);
+}
+
+static void peer_found(GSupplicantPeer *peer)
+{
+       GSupplicantInterface *iface = g_supplicant_peer_get_interface(peer);
+       struct wifi_data *wifi = g_supplicant_interface_get_data(iface);
+       struct connman_peer *connman_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);
+
+       DBG("ident: %s", identifier);
+
+       connman_peer = connman_peer_get(wifi->device, identifier);
+       if (connman_peer)
+               return;
+
+       connman_peer = connman_peer_create(identifier);
+       connman_peer_set_name(connman_peer, name);
+       connman_peer_set_device(connman_peer, wifi->device);
+       apply_peer_services(peer, connman_peer);
+
+       ret = connman_peer_register(connman_peer);
+       if (ret < 0 && ret != -EALREADY)
+               connman_peer_unref(connman_peer);
+       else
+               wifi->peers = g_slist_prepend(wifi->peers, connman_peer);
+}
+
+static void peer_lost(GSupplicantPeer *peer)
+{
+       GSupplicantInterface *iface = g_supplicant_peer_get_interface(peer);
+       struct wifi_data *wifi = g_supplicant_interface_get_data(iface);
+       struct connman_peer *connman_peer;
+       const char *identifier;
+
+       if (!wifi)
+               return;
+
+       identifier = g_supplicant_peer_get_identifier(peer);
+
+       DBG("ident: %s", identifier);
+
+       connman_peer = connman_peer_get(wifi->device, identifier);
+       if (connman_peer) {
+               if (wifi->p2p_connecting &&
+                               wifi->pending_peer == connman_peer) {
+                       peer_connect_timeout(wifi);
+               }
+               connman_peer_unregister(connman_peer);
+               connman_peer_unref(connman_peer);
+       }
+
+       wifi->peers = g_slist_remove(wifi->peers, connman_peer);
+}
+
+static void peer_changed(GSupplicantPeer *peer, GSupplicantPeerState state)
+{
+       GSupplicantInterface *iface = g_supplicant_peer_get_interface(peer);
+       struct wifi_data *wifi = g_supplicant_interface_get_data(iface);
+       enum connman_peer_state p_state = CONNMAN_PEER_STATE_UNKNOWN;
+       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);
+
+       if (!wifi)
+               return;
+
+       connman_peer = connman_peer_get(wifi->device, identifier);
+       if (!connman_peer)
+               return;
+
+       switch (state) {
+       case G_SUPPLICANT_PEER_SERVICES_CHANGED:
+               apply_peer_services(peer, connman_peer);
+               connman_peer_services_changed(connman_peer);
+               return;
+       case G_SUPPLICANT_PEER_GROUP_CHANGED:
+               if (!g_supplicant_peer_is_in_a_group(peer))
+                       p_state = CONNMAN_PEER_STATE_IDLE;
+               else
+                       p_state = CONNMAN_PEER_STATE_CONFIGURATION;
+               break;
+       case G_SUPPLICANT_PEER_GROUP_STARTED:
+               break;
+       case G_SUPPLICANT_PEER_GROUP_FINISHED:
+               p_state = CONNMAN_PEER_STATE_IDLE;
+               break;
+       case G_SUPPLICANT_PEER_GROUP_JOINED:
+               connman_peer_set_iface_address(connman_peer,
+                               g_supplicant_peer_get_iface_address(peer));
+               break;
+       case G_SUPPLICANT_PEER_GROUP_DISCONNECTED:
+               p_state = CONNMAN_PEER_STATE_IDLE;
+               break;
+       case G_SUPPLICANT_PEER_GROUP_FAILED:
+               if (g_supplicant_peer_has_requested_connection(peer))
+                       p_state = CONNMAN_PEER_STATE_IDLE;
+               else
+                       p_state = CONNMAN_PEER_STATE_FAILURE;
+               break;
+       }
+
+       if (p_state == CONNMAN_PEER_STATE_CONFIGURATION ||
+                                       p_state == CONNMAN_PEER_STATE_FAILURE) {
+               if (wifi->p2p_connecting
+                               && connman_peer == wifi->pending_peer)
+                       peer_cancel_timeout(wifi);
+               else
+                       p_state = CONNMAN_PEER_STATE_UNKNOWN;
+       }
 
-       connman_network_set_blob(network, "WiFi.SSID",
-                                               ssid, ssid_len);
-       connman_network_set_string(network, "WiFi.Security", security);
-       connman_network_set_strength(network,
-                               calculate_strength(supplicant_network));
-       connman_network_set_bool(network, "WiFi.WPS", wps);
+       if (p_state == CONNMAN_PEER_STATE_UNKNOWN)
+               return;
 
-       if (wps) {
-               /* Is AP advertizing for WPS association?
-                * If so, we decide to use WPS by default */
-               if (wps_ready && wps_pbc &&
-                                               wps_advertizing)
-                       connman_network_set_bool(network, "WiFi.UseWPS", true);
-       }
+       if (p_state == CONNMAN_PEER_STATE_CONFIGURATION) {
+               GSupplicantInterface *g_iface;
+               struct wifi_data *g_wifi;
 
-       connman_network_set_frequency(network,
-                       g_supplicant_network_get_frequency(supplicant_network));
+               g_iface = g_supplicant_peer_get_group_interface(peer);
+               if (!g_iface)
+                       return;
 
-       connman_network_set_available(network, true);
-       connman_network_set_string(network, "WiFi.Mode", mode);
+               g_wifi = g_supplicant_interface_get_data(g_iface);
+               if (!g_wifi)
+                       return;
 
-       if (ssid)
-               connman_network_set_group(network, group);
+               connman_peer_set_as_master(connman_peer,
+                                       !g_supplicant_peer_is_client(peer));
+               connman_peer_set_sub_device(connman_peer, g_wifi->device);
 
-       if (wifi->hidden && ssid) {
-               if (!g_strcmp0(wifi->hidden->security, security) &&
-                               wifi->hidden->ssid_len == ssid_len &&
-                               !memcmp(wifi->hidden->ssid, ssid, ssid_len)) {
-                       connman_network_connect_hidden(network,
-                                       wifi->hidden->identity,
-                                       wifi->hidden->passphrase,
-                                       wifi->hidden->user_data);
-                       wifi->hidden->user_data = NULL;
-                       hidden_free(wifi->hidden);
-                       wifi->hidden = NULL;
-               }
+               /*
+                * If wpa_supplicant didn't create a dedicated p2p-group
+                * interface then mark this interface as p2p_device to avoid
+                * scan and auto-scan are launched on it while P2P is connected.
+                */
+               if (!g_list_find(p2p_iface_list, g_wifi))
+                       wifi->p2p_device = true;
        }
+
+       connman_peer_set_state(connman_peer, p_state);
 }
 
-static void network_removed(GSupplicantNetwork *network)
+static void peer_request(GSupplicantPeer *peer)
 {
-       GSupplicantInterface *interface;
-       struct wifi_data *wifi;
-       const char *name, *identifier;
-       struct connman_network *connman_network;
-
-       interface = g_supplicant_network_get_interface(network);
-       wifi = g_supplicant_interface_get_data(interface);
-       identifier = g_supplicant_network_get_identifier(network);
-       name = g_supplicant_network_get_name(network);
-
-       DBG("name %s", name);
+       GSupplicantInterface *iface = g_supplicant_peer_get_interface(peer);
+       struct wifi_data *wifi = g_supplicant_interface_get_data(iface);
+       struct connman_peer *connman_peer;
+       const char *identifier;
 
+#if defined TIZEN_EXT
        if (!wifi)
                return;
+#endif
 
-       connman_network = connman_device_get_network(wifi->device, identifier);
-       if (!connman_network)
+       identifier = g_supplicant_peer_get_identifier(peer);
+
+       DBG("ident: %s", identifier);
+
+       connman_peer = connman_peer_get(wifi->device, identifier);
+       if (!connman_peer)
                return;
 
-       wifi->networks = g_slist_remove(wifi->networks, connman_network);
+       connman_peer_request_connection(connman_peer);
+}
 
-       connman_device_remove_network(wifi->device, connman_network);
-       connman_network_unref(connman_network);
+#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_changed(GSupplicantNetwork *network, const char *property)
+static void network_merged(GSupplicantNetwork *network)
 {
        GSupplicantInterface *interface;
+       GSupplicantState state;
        struct wifi_data *wifi;
-       const char *name, *identifier;
+       const char *identifier;
        struct connman_network *connman_network;
+       bool ishs20AP = 0;
+       char *temp = NULL;
 
        interface = g_supplicant_network_get_interface(network);
-       wifi = g_supplicant_interface_get_data(interface);
-       identifier = g_supplicant_network_get_identifier(network);
-       name = g_supplicant_network_get_name(network);
+       if (!interface)
+               return;
 
-       DBG("name %s", name);
+       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;
 
-       if (g_str_equal(property, "Signal")) {
-              connman_network_set_strength(connman_network,
-                                       calculate_strength(network));
-              connman_network_update(connman_network);
-       }
-}
-
-static void peer_found(GSupplicantPeer *peer)
-{
-       struct connman_peer *connman_peer;
-       const char *identifier, *name;
+       DBG("merged identifier %s", identifier);
 
-       identifier = g_supplicant_peer_get_identifier(peer);
-       name = g_supplicant_peer_get_name(peer);
+       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;
+               }
+       }
 
-       DBG("ident: %s", identifier);
+       ishs20AP = g_supplicant_network_is_hs20AP(network);
 
-       connman_peer = connman_peer_get(identifier);
-       if (connman_peer)
-               return;
+       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));
 
-       connman_peer = connman_peer_create(identifier);
-       connman_peer_set_name(connman_peer, name);
+               g_free(temp);
+       }
 
-       connman_peer_register(connman_peer);
+       wifi->network = connman_network;
 }
 
-static void peer_lost(GSupplicantPeer *peer)
+static void assoc_failed(void *user_data)
 {
-       struct connman_peer *connman_peer;
-       const char *identifier;
-
-       identifier = g_supplicant_peer_get_identifier(peer);
-
-       DBG("ident: %s", identifier);
-
-       connman_peer = connman_peer_get(identifier);
-       if (connman_peer)
-               connman_peer_unregister(connman_peer);
+       struct connman_network *network = user_data;
+       connman_network_set_associating(network, false);
 }
+#endif
 
 static void debug(const char *str)
 {
@@ -2112,6 +3905,25 @@ static void debug(const char *str)
                connman_debug("%s", str);
 }
 
+static void disconnect_reasoncode(GSupplicantInterface *interface,
+                               int reasoncode)
+{
+       struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
+
+       if (wifi != NULL) {
+               wifi->disconnect_code = reasoncode;
+       }
+}
+
+static void assoc_status_code(GSupplicantInterface *interface, int status_code)
+{
+       struct wifi_data *wifi = g_supplicant_interface_get_data(interface);
+
+       if (wifi != NULL) {
+               wifi->assoc_code = status_code;
+       }
+}
+
 static const GSupplicantCallbacks callbacks = {
        .system_ready           = system_ready,
        .system_killed          = system_killed,
@@ -2121,12 +3933,25 @@ static const GSupplicantCallbacks callbacks = {
        .p2p_support            = p2p_support,
        .scan_started           = scan_started,
        .scan_finished          = scan_finished,
+       .ap_create_fail         = ap_create_fail,
        .network_added          = network_added,
        .network_removed        = network_removed,
        .network_changed        = network_changed,
+       .network_associated     = network_associated,
+       .add_station            = add_station,
+       .remove_station         = remove_station,
        .peer_found             = peer_found,
        .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,
+#endif
        .debug                  = debug,
+       .disconnect_reasoncode  = disconnect_reasoncode,
+       .assoc_status_code      = assoc_status_code,
 };
 
 
@@ -2142,14 +3967,8 @@ static void tech_remove(struct connman_technology *technology)
        wifi_technology = NULL;
 }
 
-struct wifi_tethering_info {
-       struct wifi_data *wifi;
-       struct connman_technology *technology;
-       char *ifname;
-       GSupplicantSSID *ssid;
-};
-
-static GSupplicantSSID *ssid_ap_init(const char *ssid, const char *passphrase)
+static GSupplicantSSID *ssid_ap_init(const char *ssid,
+               const char *passphrase)
 {
        GSupplicantSSID *ap;
 
@@ -2185,10 +4004,16 @@ static void ap_start_callback(int result, GSupplicantInterface *interface,
        DBG("result %d index %d bridge %s",
                result, info->wifi->index, info->wifi->bridge);
 
-       if (result < 0) {
+       if ((result < 0) || (info->wifi->ap_supported != WIFI_AP_SUPPORTED)) {
                connman_inet_remove_from_bridge(info->wifi->index,
                                                        info->wifi->bridge);
-               connman_technology_tethering_notify(info->technology, false);
+
+               if (info->wifi->ap_supported == WIFI_AP_SUPPORTED) {
+                       connman_technology_tethering_notify(info->technology, false);
+                       g_free(info->wifi->tethering_param->ssid);
+                       g_free(info->wifi->tethering_param);
+                       info->wifi->tethering_param = NULL;
+               }
        }
 
        g_free(info->ifname);
@@ -2204,10 +4029,17 @@ static void ap_create_callback(int result,
        DBG("result %d ifname %s", result,
                                g_supplicant_interface_get_ifname(interface));
 
-       if (result < 0) {
+       if ((result < 0) || (info->wifi->ap_supported != WIFI_AP_SUPPORTED)) {
                connman_inet_remove_from_bridge(info->wifi->index,
                                                        info->wifi->bridge);
-               connman_technology_tethering_notify(info->technology, false);
+
+               if (info->wifi->ap_supported == WIFI_AP_SUPPORTED) {
+                       connman_technology_tethering_notify(info->technology, false);
+                       g_free(info->wifi->tethering_param->ssid);
+                       g_free(info->wifi->tethering_param);
+                       info->wifi->tethering_param = NULL;
+
+               }
 
                g_free(info->ifname);
                g_free(info->ssid);
@@ -2234,27 +4066,32 @@ static void sta_remove_callback(int result,
 
        DBG("ifname %s result %d ", info->ifname, result);
 
-       if (result < 0) {
-               info->wifi->tethering = true;
+       if (result < 0 || (info->wifi->ap_supported != WIFI_AP_SUPPORTED)) {
+               info->wifi->tethering = false;
+               connman_technology_tethering_notify(info->technology, false);
 
                g_free(info->ifname);
                g_free(info->ssid);
                g_free(info);
+
+               if (info->wifi->ap_supported == WIFI_AP_SUPPORTED) {
+                       g_free(info->wifi->tethering_param->ssid);
+                       g_free(info->wifi->tethering_param);
+                       info->wifi->tethering_param = NULL;
+               }
                return;
        }
 
        info->wifi->interface = NULL;
 
-       connman_technology_tethering_notify(info->technology, true);
-
        g_supplicant_interface_create(info->ifname, driver, info->wifi->bridge,
                                                ap_create_callback,
                                                        info);
 }
 
-static int tech_set_tethering(struct connman_technology *technology,
-                               const char *identifier, const char *passphrase,
-                               const char *bridge, bool enabled)
+static int enable_wifi_tethering(struct connman_technology *technology,
+                               const char *bridge, const char *identifier,
+                               const char *passphrase, bool available)
 {
        GList *list;
        GSupplicantInterface *interface;
@@ -2262,75 +4099,143 @@ static int tech_set_tethering(struct connman_technology *technology,
        struct wifi_tethering_info *info;
        const char *ifname;
        unsigned int mode;
-       int err;
-
-       DBG("");
-
-       if (!enabled) {
-               for (list = iface_list; list; list = list->next) {
-                       wifi = list->data;
-
-                       if (wifi->tethering) {
-                               wifi->tethering = false;
-
-                               connman_inet_remove_from_bridge(wifi->index,
-                                                                       bridge);
-                               wifi->bridged = false;
-                       }
-               }
-
-               connman_technology_tethering_notify(technology, false);
-
-               return 0;
-       }
+       int err, berr = 0;
 
        for (list = iface_list; list; list = list->next) {
                wifi = list->data;
 
+               DBG("wifi %p network %p pending_network %p", wifi,
+                       wifi->network, wifi->pending_network);
+
                interface = wifi->interface;
 
                if (!interface)
                        continue;
 
+               if (wifi->ap_supported == WIFI_AP_NOT_SUPPORTED)
+                       continue;
+
                ifname = g_supplicant_interface_get_ifname(wifi->interface);
 
+               if (wifi->ap_supported == WIFI_AP_NOT_SUPPORTED) {
+                       DBG("%s does not support AP mode (detected)", ifname);
+                       continue;
+               }
+
                mode = g_supplicant_interface_get_mode(interface);
                if ((mode & G_SUPPLICANT_CAPABILITY_MODE_AP) == 0) {
-                       DBG("%s does not support AP mode", ifname);
+                       wifi->ap_supported = WIFI_AP_NOT_SUPPORTED;
+                       DBG("%s does not support AP mode (capability)", ifname);
                        continue;
                }
 
+               if (wifi->network && available)
+                       continue;
+
                info = g_try_malloc0(sizeof(struct wifi_tethering_info));
                if (!info)
                        return -ENOMEM;
 
+               wifi->tethering_param = g_try_malloc0(sizeof(struct wifi_tethering_info));
+               if (!wifi->tethering_param) {
+                       g_free(info);
+                       return -ENOMEM;
+               }
+
                info->wifi = wifi;
                info->technology = technology;
                info->wifi->bridge = bridge;
                info->ssid = ssid_ap_init(identifier, passphrase);
-               if (!info->ssid) {
-                       g_free(info);
-                       continue;
-               }
+               if (!info->ssid)
+                       goto failed;
+
                info->ifname = g_strdup(ifname);
-               if (!info->ifname) {
-                       g_free(info->ssid);
-                       g_free(info);
-                       continue;
-               }
+               if (!info->ifname)
+                       goto failed;
+
+               wifi->tethering_param->technology = technology;
+               wifi->tethering_param->ssid = ssid_ap_init(identifier, passphrase);
+               if (!wifi->tethering_param->ssid)
+                       goto failed;
 
                info->wifi->tethering = true;
+               info->wifi->ap_supported = WIFI_AP_SUPPORTED;
+
+               berr = connman_technology_tethering_notify(technology, true);
+               if (berr < 0)
+                       goto failed;
 
                err = g_supplicant_interface_remove(interface,
                                                sta_remove_callback,
                                                        info);
-               if (err == 0)
-                       return err;
+               if (err >= 0) {
+                       DBG("tethering wifi %p ifname %s", wifi, ifname);
+                       return 0;
+               }
+
+       failed:
+               g_free(info->ifname);
+               g_free(info->ssid);
+               g_free(info);
+               g_free(wifi->tethering_param);
+               wifi->tethering_param = NULL;
+
+               /*
+                * Remove bridge if it was correctly created but remove
+                * operation failed. Instead, if bridge creation failed then
+                * break out and do not try again on another interface,
+                * bridge set-up does not depend on it.
+                */
+               if (berr == 0)
+                       connman_technology_tethering_notify(technology, false);
+               else
+                       break;
        }
 
        return -EOPNOTSUPP;
 }
 
+static int tech_set_tethering(struct connman_technology *technology,
+                               const char *identifier, const char *passphrase,
+                               const char *bridge, bool enabled)
+{
+       GList *list;
+       struct wifi_data *wifi;
+       int err;
+
+       DBG("");
+
+       if (!enabled) {
+               for (list = iface_list; list; list = list->next) {
+                       wifi = list->data;
+
+                       if (wifi->tethering) {
+                               wifi->tethering = false;
+
+                               connman_inet_remove_from_bridge(wifi->index,
+                                                                       bridge);
+                               wifi->bridged = false;
+                       }
+               }
+
+               connman_technology_tethering_notify(technology, false);
+
+               return 0;
+       }
+
+       DBG("trying tethering for available devices");
+       err = enable_wifi_tethering(technology, bridge, identifier, passphrase,
+                               true);
+
+       if (err < 0) {
+               DBG("trying tethering for any device");
+               err = enable_wifi_tethering(technology, bridge, identifier,
+                                       passphrase, false);
+       }
+
+       return err;
+}
+
 static void regdom_callback(int result, const char *alpha2, void *user_data)
 {
        DBG("");