Remove the TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND build flag

Change-Id: I8a2d1ae264914f43303d718b1e3231c7b1f9b60c
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f12611c..cb7a43f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,10 +61,6 @@ IF(TIZEN_ENABLE_PRD)
        ADD_DEFINITIONS(-DTIZEN_ENABLE_PRD)
 ENDIF(TIZEN_ENABLE_PRD)
 
-IF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-ENDIF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-
 SET(SRCS
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-manager.c
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-state.c

diff --git a/include/wifi-direct-dbus.h b/include/wifi-direct-dbus.h
index 4f4bb34..d9891fd 100644 (file)
--- a/include/wifi-direct-dbus.h
+++ b/include/wifi-direct-dbus.h
@@ -41,11 +41,9 @@ extern "C" {
 #define WFD_MANAGER_CONFIG_INTERFACE            WFD_MANAGER_SERVICE ".config"
 #define WFD_MANAGER_SERVICE_INTERFACE           WFD_MANAGER_SERVICE ".service"
 #define WFD_MANAGER_DISPLAY_INTERFACE           WFD_MANAGER_SERVICE ".display"
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 #define DBUS_SERVICE                            "org.freedesktop.DBus"
 #define DBUS_INTERFACE                          "org.freedesktop.DBus"
 #define DBUS_PATH                               "/org/freedesktop/DBus"
-#endif /* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 #define WFD_MANAGER_ASP_INTERFACE               WFD_MANAGER_SERVICE ".asp"
 
 #define WFD_MANAGER_DBUS_REPLY_TIMEOUT          10 * 1000
@@ -77,9 +75,7 @@ gboolean wfd_manager_dbus_emit_signal(const gchar *interface_name,
                                      GVariant *parameters);
 
 GVariant* wfd_manager_dbus_pack_ay(const unsigned char *src, int size);
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 void wfd_manager_dbus_unregister_nameowner_signal(void);
-#endif /* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index a08e745..7f69292 100644 (file)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -172,11 +172,9 @@ typedef struct {
 
        wifi_direct_state_e state;
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        unsigned int exit_timer;
        int client_count;
        GSList *client_list;
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
        wfd_device_s *local;
        int go_intent;
        int req_wps_mode;
@@ -256,12 +254,10 @@ int wfd_manager_cancel_discovery(wfd_manager_s *manager);
 wfd_device_s *wfd_manager_get_connected_peer_by_addr(wfd_manager_s *manager, unsigned char *peer_addr);
 int wfd_manager_asp_connect_session(wfd_manager_s *manager, void *params);
 int wfd_manager_asp_confirm_session(wfd_manager_s *manager, void *params, int confirmed);
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 void wfd_manager_free_active_client_list(void);
 void wfd_manager_add_active_client(const char *client_id);
 void wfd_manager_remove_active_client(const char *name,
                                                 const gchar *old_owner,
                                                 const char *new_owner);
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
 #endif /* __WIFI_DIRECT_MANAGER_H__ */

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 39a01a9..100fdaa 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -8,7 +8,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.234
+Version:       1.2.235
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -213,7 +213,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
-       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_MOBILE=1 \
@@ -240,7 +239,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_WLAN_BOARD_SPRD=1 \
-       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_MOBILE=1 \
@@ -270,7 +268,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
-       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_COMMON=1 \
@@ -299,7 +296,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
-       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_TV=1 \
@@ -327,7 +323,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
-       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_COMMON=1 \

diff --git a/src/wifi-direct-dbus.c b/src/wifi-direct-dbus.c
index d8b951a..7a80b76 100644 (file)
--- a/src/wifi-direct-dbus.c
+++ b/src/wifi-direct-dbus.c
@@ -29,19 +29,15 @@
 #include "wifi-direct-iface.h"
 #include "wifi-direct-dbus.h"
 #include "wifi-direct-log.h"
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 #include <wifi-direct.h>
 #include "wifi-direct-ipc.h"
 #include "wifi-direct-manager.h"
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
 static GDBusConnection *g_connection = NULL;
 static guint g_owner_id = 0;  /* Name Owner ID */
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 static int nameowner_changed_sub_id = 0;
 static void wfd_manager_dbus_register_nameowner_signal(void);
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
 static GDBusConnection *__dbus_get_gdbus_conn(void)
 {
@@ -53,9 +49,7 @@ static void __on_bus_acquired(GDBusConnection *connection,
                              gpointer user_data)
 {
        WDS_LOGD("on_bus_acquired: %s", name);
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        wfd_manager_dbus_register_nameowner_signal();
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
        wfd_manager_dbus_register();
 }
 
@@ -73,7 +67,6 @@ static void __on_name_lost(GDBusConnection *connection,
        WDS_LOGD("on_name_lost: %s", name);
 }
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 static void nameowner_signal_handler(GDBusConnection *connection,
                                      const gchar *sender_name,
                                      const gchar *object_path,
@@ -131,7 +124,6 @@ void wfd_manager_dbus_unregister_nameowner_signal(void)
 
        WDS_LOGD("Unsubscribed successfully for NameOwnerChanged signals");
 }
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
 guint wfd_manager_dbus_iface_register(const gchar* iface_name,
                                      const gchar* iface_path,

diff --git a/src/wifi-direct-iface.c b/src/wifi-direct-iface.c
index a84beaa..2df500b 100644 (file)
--- a/src/wifi-direct-iface.c
+++ b/src/wifi-direct-iface.c
@@ -70,11 +70,9 @@ const gchar wfd_manager_introspection_xml[] = {
                        "<method name='Activate'>"
                                "<arg type='i' name='error_code' direction='out'/>"
                        "</method>"
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
                        "<method name='AddClient'>"
                                "<arg type='i' name='result' direction='out'/>"
                        "</method>"
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
                        "<method name='Deactivate'>"
                                "<arg type='i' name='error_code' direction='out'/>"
                        "</method>"
@@ -496,11 +494,9 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                                             "Activation",
                                             g_variant_new("(i)", ret));
                return;
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        } else if (!g_strcmp0(method_name, "AddClient")) {
                return_parameters = g_variant_new("(i)", WIFI_DIRECT_ERROR_NONE);
                goto done;
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
        } else if (!g_strcmp0(method_name, "Deactivate")) {
 
                ret = wfd_util_check_p2p_hotspot_state();
@@ -3068,10 +3064,8 @@ static void wfd_manager_method_call_handler (GDBusConnection       *connection,
 {
        int count = 0;
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        if (!g_strcmp0(method_name, "AddClient"))
                wfd_manager_add_active_client(sender);
-#endif /* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
        /* Method Call */
        WDS_LOGD("interface : [%s], method : [%s]", interface_name, method_name);

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index 9f7e1d4..62c9f1c 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -62,7 +62,6 @@ wfd_manager_s *wfd_get_manager()
        return g_manager;
 }
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
 /* Stop wfd-manager services, If no client
    exists and state is deactivated. */
 static gboolean _wfd_exit_timeout_cb(void *user_data)
@@ -162,7 +161,6 @@ void wfd_manager_remove_active_client(const gchar *name,
                }
        }
 }
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
 static int _wfd_local_init_device(wfd_manager_s *manager)
 {
@@ -1721,13 +1719,14 @@ static wfd_manager_s *wfd_manager_init()
        }
        WDS_LOGD("Succeeded to initialize local device");
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        manager->client_count = 0;
        manager->client_list = NULL;
-       manager->exit_timer = g_timeout_add(120000,
-                                               (GSourceFunc) _wfd_exit_timeout_cb, manager);
-       WDS_LOGD("Exit timer started");
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
+       if (manager->is_on_demand) {
+               manager->exit_timer = g_timeout_add(120000,
+                                                       (GSourceFunc) _wfd_exit_timeout_cb, manager);
+               WDS_LOGD("Exit timer started");
+       }
+
 
        __WDS_LOG_FUNC_EXIT__;
        return manager;
@@ -1743,11 +1742,10 @@ int wfd_manager_deinit(wfd_manager_s *manager)
                return -1;
        }
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
-       if (manager->exit_timer > 0)
+       if (manager->is_on_demand && manager->exit_timer > 0) {
                g_source_remove(manager->exit_timer);
-       manager->exit_timer = 0;
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
+               manager->exit_timer = 0;
+       }
 
        _wfd_local_deinit_device(manager);
 
@@ -1983,9 +1981,7 @@ int main(int argc, char *argv[])
        g_manager->main_loop = main_loop;
        g_main_loop_run(main_loop);
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        wfd_manager_dbus_unregister_nameowner_signal();
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
        wfd_manager_dbus_unregister();
        wfd_manager_dbus_deinit();