From 1b40e9122cc20b8ff2d71079e0752e4ca9471609 Mon Sep 17 00:00:00 2001 From: Abhishek Sansanwal Date: Wed, 18 Apr 2018 14:48:15 +0530 Subject: [PATCH] Removed supplicant scanning signal subscribe/unsubscribe Description: The scanning dbus signals will never be received according to dbus policy in wpa_supplicant. This is instead handled by wifi-manager callbacks. Therefore this code is redundant. Signed-off-by: Abhishek Sansanwal Change-Id: If80b32c0b5ebb33276fd18b8f1a8d16dcb9da5a7 --- sources/libraries/Common/common_utils.c | 52 ---------------------- sources/libraries/Common/include/common_utils.h | 2 - .../WlanManager/WlanManager/wlan_manager.c | 2 - sources/ui-gadget/wifi-efl-UG.c | 41 ----------------- sources/wifi-syspopup/wifi-syspopup.c | 1 - 5 files changed, 98 deletions(-) diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c index f64f773..637ad7c 100755 --- a/sources/libraries/Common/common_utils.c +++ b/sources/libraries/Common/common_utils.c @@ -735,58 +735,6 @@ static GDBusConnection *common_util_get_gdbus_conn(void) return gdbus_conn.connection; } -gboolean common_util_subscribe_scanning_signal(GDBusSignalCallback callback) -{ - GDBusConnection *connection; - - connection = common_util_get_gdbus_conn(); - if (connection == NULL) { - ERROR_LOG(UG_NAME_NORMAL, "failed to get gdbus_conn"); - return FALSE; - } - - /* Create supplicant service connection */ - gdbus_conn.subscribe_id_supplicant = g_dbus_connection_signal_subscribe( - connection, - SUPPLICANT_SERVICE, - SUPPLICANT_SERVICE_INTERFACE, - "PropertiesChanged", - NULL, - NULL, - G_DBUS_SIGNAL_FLAGS_NONE, - callback, - NULL, - NULL); - - if (gdbus_conn.subscribe_id_supplicant == 0) { - ERROR_LOG(UG_NAME_NORMAL, "Failed register signals " - "supplicant(%d)\n", - gdbus_conn.subscribe_id_supplicant); - return FALSE; - } - - return TRUE; -} - -gboolean common_util_unsubscribe_scanning_signal(void) -{ - GDBusConnection *connection; - - connection = common_util_get_gdbus_conn(); - if (connection == NULL) { - ERROR_LOG(UG_NAME_NORMAL, "failed to get gdbus_conn"); - return FALSE; - } - - g_dbus_connection_signal_unsubscribe(connection, - gdbus_conn.subscribe_id_supplicant); - - g_object_unref(gdbus_conn.connection); - gdbus_conn.connection = NULL; - - return TRUE; -} - int common_utils_get_sim_state(void) { int value = VCONFKEY_TELEPHONY_SIM_UNKNOWN; diff --git a/sources/libraries/Common/include/common_utils.h b/sources/libraries/Common/include/common_utils.h index 5d05df7..7bba072 100755 --- a/sources/libraries/Common/include/common_utils.h +++ b/sources/libraries/Common/include/common_utils.h @@ -128,8 +128,6 @@ void common_util_managed_ecore_scan_update_timer_add(double interval, void common_util_managed_ecore_scan_update_timer_del(void); void common_util_manager_ecore_scan_update_timer_reset(void); -gboolean common_util_subscribe_scanning_signal(GDBusSignalCallback callback); -gboolean common_util_unsubscribe_scanning_signal(void); int common_utils_get_sim_state(void); Eina_Bool _is_emulator(void); #ifdef __cplusplus diff --git a/sources/libraries/WlanManager/WlanManager/wlan_manager.c b/sources/libraries/WlanManager/WlanManager/wlan_manager.c index 8c11a07..3b02b7a 100755 --- a/sources/libraries/WlanManager/WlanManager/wlan_manager.c +++ b/sources/libraries/WlanManager/WlanManager/wlan_manager.c @@ -102,8 +102,6 @@ int wlan_manager_destroy(void) return ret; } - common_util_unsubscribe_scanning_signal(); - wifi_manager_unset_device_state_changed_cb(manager_object->wifi); wlan_manager_deregister_cbs(); diff --git a/sources/ui-gadget/wifi-efl-UG.c b/sources/ui-gadget/wifi-efl-UG.c index 2e685bd..8d8857e 100755 --- a/sources/ui-gadget/wifi-efl-UG.c +++ b/sources/ui-gadget/wifi-efl-UG.c @@ -53,46 +53,6 @@ static gboolean __wifi_efl_ug_del_found_ap_noti(void *data) return FALSE; } -static void _bg_scan_status_callback(GDBusConnection *conn, - const gchar *name, const gchar *path, const gchar *interface, - const gchar *sig, GVariant *param, gpointer user_data) -{ - __COMMON_FUNC_ENTER__; - - GVariantIter *iter = NULL; - GVariant *var = NULL; - gchar *key = NULL; - gboolean value = FALSE; - - int header_mode = viewer_manager_header_mode_get(); - viewer_manager_create_scan_btn(); - if (header_mode == HEADER_MODE_DEACTIVATING || - header_mode == HEADER_MODE_OFF) { - __COMMON_FUNC_EXIT__; - return; - } - - g_variant_get(param, "(a{sv})", &iter); - while (g_variant_iter_loop(iter, "{sv}", &key, &var)) { - if (g_strcmp0(key, "Scanning") == 0) { - value = g_variant_get_boolean(var); - if (value) { - //TODO: Ignore the Supplicant Property Change Singal. - //viewer_manager_header_mode_set(HEADER_MODE_SEARCHING); - //viewer_manager_show(VIEWER_WINSET_SEARCHING); - } - - g_variant_unref(var); - g_free(key); - break; - } - } - - g_variant_iter_free(iter); - - __COMMON_FUNC_EXIT__; -} - static void _set_rotation(Evas_Object *win) { int rots[4] = { 0, 90, 180, 270 }; @@ -227,7 +187,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, wlan_manager_create(); wlan_manager_set_message_callback(wlan_engine_callback); wlan_manager_set_refresh_callback(wlan_engine_refresh_callback); - common_util_subscribe_scanning_signal(_bg_scan_status_callback); switch (wlan_manager_start()) { case WLAN_MANAGER_ERR_NONE: diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c index a71150d..ac7d070 100755 --- a/sources/wifi-syspopup/wifi-syspopup.c +++ b/sources/wifi-syspopup/wifi-syspopup.c @@ -406,7 +406,6 @@ static int wifi_devpkr_init() wlan_manager_create(); wlan_manager_set_message_callback(wlan_engine_callback); wlan_manager_set_refresh_callback(wlan_engine_refresh_callback); - common_util_subscribe_scanning_signal(_bg_scan_status_callback); wlan_ret = wlan_manager_start(); switch (wlan_ret) { -- 2.7.4