Change the wpa_supplicant configuration file path

Change-Id: I7d848e1e6a6bc2fff07409199f8ef7571bfe6976
(cherry picked from commit eb31656838b0d9aa2748fe0ef0f10b2e6cce1d5b)

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 901828d..c598cca 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -2,7 +2,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.217
+Version:       1.2.218
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
index c3c3437..49ab39a 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -40,8 +40,6 @@
 #define IPSECSTR "%d..%d"
 #define OBJECT_PATH_MAX 150
 
-#define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
-
 #if defined(TIZEN_PROFILE_MOBILE) || defined(TIZEN_PROFILE_COMMON)
 #define COMMON_IFACE_NAME "wlan0"
 

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index 267c125..2431281 100755 (executable)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -67,6 +67,8 @@
 
 #define NETCONFIG_DBUS_REPLY_TIMEOUT (10 * 1000)
 
+#define CONF_FILE_PATH tzplatform_mkpath(TZ_SYS_ETC, "wpa_supplicant/wpa_supplicant.conf")
+
 #if defined TIZEN_WIFI_MODULE_BUNDLE
 #define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
 #endif
@@ -7100,7 +7102,7 @@ int ws_asp_prov_disc_req(wfd_oem_asp_prov_s *asp_params)
 
        dbus_set_method_param(&params, "ASPProvisionDiscoveryRequest", g_pd->iface_path, g_dbus);
 
-       if(asp_params->deferring == 0)
+       if (asp_params->deferring == 0)
                g_snprintf(peer_path, DBUS_OBJECT_PATH_MAX, "%s/Peers/"
                                COMPACT_MACSTR, g_pd->iface_path, MAC2STR(asp_params->service_mac));
        else

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index f279bc4..63b6be7 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -333,7 +333,7 @@ void wfd_event_prov_disc_req(wfd_oem_event_s *event)
        member = wfd_group_find_member_by_addr(group,  event->dev_addr);
        if (member) {
                /* PD request can be arrived from peer device
-                *      when connection is timeout to close connection*/
+                * when connection is timeout to close connection */
                WDS_LOGE("Unexpected Event - Member already exist");
                __WDS_LOG_FUNC_EXIT__;
                return;

diff --git a/src/wifi-direct-session.c b/src/wifi-direct-session.c
index 5407ab4..dd60d99 100644 (file)
--- a/src/wifi-direct-session.c
+++ b/src/wifi-direct-session.c
@@ -1069,7 +1069,7 @@ int wfd_session_process_event(wfd_manager_s *manager, wfd_oem_event_s *event)
                        /* Sometimes, Provision Discovery response is not received.
                         * At this time, connection should be triggered by GO Negotiation request event */
                        if (session->direction == SESSION_DIRECTION_OUTGOING) {
-                               if(session->wps_mode == WFD_WPS_MODE_KEYPAD && session->wps_pin[0] == '\0')
+                               if (session->wps_mode == WFD_WPS_MODE_KEYPAD && session->wps_pin[0] == '\0')
                                        break;
                                res = wfd_session_connect(session);
                        } else {