From: Seonah Moon Date: Thu, 9 May 2019 12:36:08 +0000 (+0900) Subject: Remove dependency with libnet-client X-Git-Tag: accepted/tizen/5.5/unified/20191031.014631~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e3a533f0d761d66d3e65fb2f19709375d69910c;p=apps%2Fnative%2Fug-wifi-efl.git Remove dependency with libnet-client Change-Id: Ib1eda6145a43b2a660e0dc76f689e071fde45b0b --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ce50643..64faf40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") -SET(ENGINE_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/WlanManager/EngineManager/connman-request.c - ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/WlanManager/EngineManager/connman-response.c -) - -SET(ENGINE_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/WlanManager/EngineManager/include) - -SET(ENGINE_PKGCONFIGS - capi-network-wifi-manager - network) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations") @@ -44,9 +33,7 @@ pkg_check_modules(pkgs REQUIRED #syspopup-caller feedback #setting-common-lite-internal - ${TETHERING_REQUIRED_PKGS} -#engine pkgconfigs - ${ENGINE_PKGCONFIGS}) + ${TETHERING_REQUIRED_PKGS}) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/sources/ui-gadget/include @@ -57,9 +44,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/WlanManager/WlanManager/include ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/WlanManager/EngineManager/include ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/appcoreWrapper/include - ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/i18nManager/include -#engine includes - ${ENGINE_INCLUDES}) + ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/i18nManager/include) IF(TIZEN_MOBILE) ADD_SUBDIRECTORY(po) diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index 529a827..3c4e7b5 100644 --- a/packaging/wifi-efl-ug.spec +++ b/packaging/wifi-efl-ug.spec @@ -1,6 +1,6 @@ Name: wifi-efl-ug Summary: Wi-Fi UI Gadget for TIZEN -Version: 1.0.237 +Version: 1.0.238 Release: 1 Group: App/Network License: Flora-1.1 @@ -20,7 +20,6 @@ BuildRequires: pkgconfig(capi-network-wifi-manager) BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(capi-network-tethering) BuildRequires: pkgconfig(capi-ui-efl-util) -BuildRequires: pkgconfig(network) BuildRequires: pkgconfig(feedback) BuildRequires: pkgconfig(efl-extension) BuildRequires: pkgconfig(aul) diff --git a/sources/libraries/Common/common_ip_info.c b/sources/libraries/Common/common_ip_info.c index b0ab185..2fc570b 100755 --- a/sources/libraries/Common/common_ip_info.c +++ b/sources/libraries/Common/common_ip_info.c @@ -500,11 +500,12 @@ static Evas_Object *_ip_info_entry_item_content_get(void *data, Evas_Object *obj _ip_info_entry_add_callbacks(editfield, entry_info); elm_object_part_content_set(layout, "elm.swallow.content", editfield); +#if 0 /* TODO: Apply DPM */ if (!net_get_device_policy_wifi_profile()) elm_object_disabled_set(editfield, EINA_TRUE); else elm_object_disabled_set(editfield, EINA_FALSE); - +#endif return layout; } @@ -886,11 +887,13 @@ static void __ip_info_toggle_item_sel_cb(void* data, return; } +#if 0 /* TODO: Apply DPM */ if (!net_get_device_policy_wifi_profile()) { SECURE_DEBUG_LOG(UG_NAME_NORMAL, "Wifi profile device policy restricts"); __COMMON_FUNC_EXIT__; return; } +#endif wifi_manager_ap_h ap = ip_info_list_data->ap; @@ -1011,14 +1014,14 @@ static Evas_Object *_ip_info_iptoggle_content_get(void *data, evas_object_smart_callback_add(toggle_btn, "changed", __ip_info_toggle_item_sel_cb, ip_data); +#if 0 /* TODO: Apply DPM */ if (!net_get_device_policy_wifi_profile()) elm_object_disabled_set(toggle_btn, EINA_TRUE); else elm_object_disabled_set(toggle_btn, EINA_FALSE); +#endif } - - __COMMON_FUNC_EXIT__; return toggle_btn; } diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c index 3246955..6a98206 100755 --- a/sources/libraries/Common/common_utils.c +++ b/sources/libraries/Common/common_utils.c @@ -176,36 +176,13 @@ char *common_utils_get_ap_security_type_info_txt(const char *pkg_name, char *temp = NULL; char *status_txt = NULL; - /* TODO: temporary disabled */ - /* - wifi_manager_connection_state_e state; - wifi_connection_error_e error; - - wifi_manager_ap_get_connection_state(device_info->ap, &state); - if (state == WIFI_MANAGER_CONNECTION_STATE_FAILURE) { - error = wlan_manager_get_connection_error_state(device_info->ap); - - if (error == WIFI_MANAGER_CONNECTION_ERROR_INVALID_KEY) - return g_strdup(sc(pkg_name, - I18N_TYPE_WIFI_AUTHENTICATION_ERROR_OCCURRED)); - - if (error == WIFI_MANAGER_CONNECTION_ERROR_DHCP_FAILED) - return g_strdup(sc(pkg_name, - I18N_TYPE_WIFI_FAILED_TO_OBTAIN_IP_ADDRESS)); - } - */ - switch (device_info->security_mode) { - case WLAN_SEC_MODE_NONE: /** Security disabled */ + case WIFI_MANAGER_SECURITY_TYPE_NONE: /** Security disabled */ status_txt = g_strdup(sc(pkg_name, I18N_TYPE_Open)); break; - case WLAN_SEC_MODE_IEEE8021X: /** EAP */ - status_txt = g_strdup_printf("%s (%s)", sc(pkg_name, I18N_TYPE_Secured), - sc(pkg_name, I18N_TYPE_EAP)); - break; - case WLAN_SEC_MODE_WEP: /** WEP */ - case WLAN_SEC_MODE_WPA_PSK: /** WPA-PSK */ - case WLAN_SEC_MODE_WPA2_PSK: /** WPA2-PSK */ + case WIFI_MANAGER_SECURITY_TYPE_WEP: /** WEP */ + case WIFI_MANAGER_SECURITY_TYPE_WPA_PSK: /** WPA-PSK */ + case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK: /** WPA2-PSK */ if (TRUE == device_info->wps_mode) { status_txt = g_strdup_printf("%s (%s)", sc(pkg_name, I18N_TYPE_Secured), sc(pkg_name, I18N_TYPE_WPS_Available)); @@ -213,6 +190,10 @@ char *common_utils_get_ap_security_type_info_txt(const char *pkg_name, status_txt = g_strdup(sc(pkg_name, I18N_TYPE_Secured)); } break; + case WIFI_MANAGER_SECURITY_TYPE_EAP: /** EAP */ + status_txt = g_strdup_printf("%s (%s)", sc(pkg_name, I18N_TYPE_Secured), + sc(pkg_name, I18N_TYPE_EAP)); + break; default: /** Unknown */ status_txt = g_strdup(sc(pkg_name, I18N_TYPE_Unknown)); break; @@ -237,7 +218,7 @@ void common_utils_get_device_icon(wifi_device_info_t *device_info, char **icon_p g_strlcat(buf, "A01-3_icon", sizeof(buf)); - if (device_info->security_mode != WLAN_SEC_MODE_NONE) + if (device_info->security_mode != WIFI_MANAGER_SECURITY_TYPE_NONE) g_strlcat(buf, "_lock", sizeof(buf)); switch (wlan_manager_get_signal_strength(device_info->rssi)) { @@ -530,26 +511,6 @@ int common_utils_get_rotate_angle(enum appcore_rm rotate_mode) return rotate_angle; } -wlan_security_mode_type_t common_utils_get_sec_mode(wifi_manager_security_type_e sec_type) -{ - switch (sec_type) { - case WIFI_MANAGER_SECURITY_TYPE_NONE: - return WLAN_SEC_MODE_NONE; - case WIFI_MANAGER_SECURITY_TYPE_WEP: - return WLAN_SEC_MODE_WEP; - case WIFI_MANAGER_SECURITY_TYPE_WPA_PSK: - return WLAN_SEC_MODE_WPA_PSK; - case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK: - return WLAN_SEC_MODE_WPA_PSK; - case WIFI_MANAGER_SECURITY_TYPE_EAP: - return WLAN_SEC_MODE_IEEE8021X; - default: - return WLAN_SEC_MODE_NONE; - } - - return WLAN_SEC_MODE_NONE; -} - int common_utils_send_message_to_net_popup(const char *title, const char *content, const char *type, const char *ssid) { diff --git a/sources/libraries/Common/include/common_ip_info.h b/sources/libraries/Common/include/common_ip_info.h index b5db9f1..5b5cf08 100755 --- a/sources/libraries/Common/include/common_ip_info.h +++ b/sources/libraries/Common/include/common_ip_info.h @@ -26,7 +26,6 @@ extern "C" #endif #include -#include #include "wlan_manager.h" #include "common_utils.h" diff --git a/sources/libraries/Common/include/common_utils.h b/sources/libraries/Common/include/common_utils.h index 7bba072..517f897 100755 --- a/sources/libraries/Common/include/common_utils.h +++ b/sources/libraries/Common/include/common_utils.h @@ -111,8 +111,6 @@ Evas_Object *common_utils_show_info_ok_popup(Evas_Object *win, Evas_Object *common_utils_show_info_timeout_popup(Evas_Object *win, const char* info_text, const double timeout); int common_utils_get_rotate_angle(enum appcore_rm rotate_mode); -wlan_security_mode_type_t common_utils_get_sec_mode( - wifi_manager_security_type_e sec_type); int common_utils_send_message_to_net_popup(const char *title, const char *content, const char *type, const char *ssid); int common_utils_send_restriction_to_net_popup(const char *title, diff --git a/sources/libraries/WlanManager/EngineManager/connman-request.c b/sources/libraries/WlanManager/EngineManager/connman-request.c deleted file mode 100644 index 51afda2..0000000 --- a/sources/libraries/WlanManager/EngineManager/connman-request.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Wi-Fi - * - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "common.h" -#include "wlan_manager.h" - -int connman_request_register(void) -{ - int ret = net_register_client(network_evt_cb, NULL); - switch (ret) { - case NET_ERR_NONE: - return WLAN_MANAGER_ERR_NONE; - case NET_ERR_APP_ALREADY_REGISTERED: - return WLAN_MANAGER_ERR_ALREADY_REGISTERED; - default: - return WLAN_MANAGER_ERR_UNKNOWN; - } -} - -int connman_request_deregister(void) -{ - int ret = net_deregister_client(); - switch (ret) { - case NET_ERR_NONE: - return WLAN_MANAGER_ERR_NONE; - default: - return WLAN_MANAGER_ERR_UNKNOWN; - } -} - -int connman_request_specific_scan(const char *ssid) -{ - int ret = net_specific_scan_wifi(ssid); - INFO_LOG(COMMON_NAME_LIB, "net_specific_scan_wifi ret: %d", ret); - - switch (ret) { - case NET_ERR_NONE: - case NET_ERR_IN_PROGRESS: - return WLAN_MANAGER_ERR_NONE; - default: - return WLAN_MANAGER_ERR_UNKNOWN; - } -} - -int connman_request_scan_mode_set(net_wifi_background_scan_mode_t scan_mode) -{ - int ret = net_wifi_set_background_scan_mode(scan_mode); - - switch (ret) { - case NET_ERR_NONE: - return WLAN_MANAGER_ERR_NONE; - - default: - return WLAN_MANAGER_ERR_UNKNOWN; - } -} diff --git a/sources/libraries/WlanManager/EngineManager/connman-response.c b/sources/libraries/WlanManager/EngineManager/connman-response.c deleted file mode 100644 index 9cdad09..0000000 --- a/sources/libraries/WlanManager/EngineManager/connman-response.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Wi-Fi - * - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "common.h" -#include "wlan_manager.h" - -struct _wifi_cb_s { - wifi_specific_scan_finished_cb specific_scan_cb; - void *specific_scan_user_data; -}; - -static struct _wifi_cb_s wifi_callbacks = {NULL, NULL}; - -int wifi_set_specific_scan_cb(wifi_specific_scan_finished_cb cb, void *data) -{ - __COMMON_FUNC_ENTER__; - - if (!cb) { - __COMMON_FUNC_EXIT__; - return WIFI_MANAGER_ERROR_INVALID_PARAMETER; - } - - wifi_callbacks.specific_scan_cb = cb; - wifi_callbacks.specific_scan_user_data = data; - - __COMMON_FUNC_EXIT__; - return WIFI_MANAGER_ERROR_NONE; -} - -int wifi_unset_specific_scan_cb(void) -{ - __COMMON_FUNC_ENTER__; - - if (wifi_callbacks.specific_scan_cb == NULL) { - __COMMON_FUNC_EXIT__; - return WIFI_MANAGER_ERROR_INVALID_OPERATION; - } - - wifi_callbacks.specific_scan_cb = NULL; - wifi_callbacks.specific_scan_user_data = NULL; - - __COMMON_FUNC_EXIT__; - return WIFI_MANAGER_ERROR_NONE; -} - -void network_evt_cb(const net_event_info_t *net_event, void *user_data) -{ - __COMMON_FUNC_ENTER__; - - switch (net_event->Event) { - case NET_EVENT_SPECIFIC_SCAN_RSP: - INFO_LOG(COMMON_NAME_LIB, "NET_EVENT_SPECIFIC_SCAN_RSP"); - - if (wifi_callbacks.specific_scan_cb) { - if (net_event->Error != NET_ERR_NONE) { - wifi_callbacks.specific_scan_cb( - WIFI_MANAGER_ERROR_OPERATION_FAILED, - NULL, - wifi_callbacks.specific_scan_user_data); - } else { - INFO_LOG(COMMON_NAME_LIB, "Specific scan request successful"); - } - } else { - ERROR_LOG(COMMON_NAME_LIB, "Specific scan cb is not set !!!"); - } - break; - - case NET_EVENT_SPECIFIC_SCAN_IND: - INFO_LOG(COMMON_NAME_LIB, "SSID scan results (%d found)", (int)net_event->Datalength); - - if (wifi_callbacks.specific_scan_cb) { - if (net_event->Error == NET_ERR_NONE) { - wifi_callbacks.specific_scan_cb(WIFI_MANAGER_ERROR_NONE, - net_event->Data, - wifi_callbacks.specific_scan_user_data); - } else { - wifi_callbacks.specific_scan_cb(WIFI_MANAGER_ERROR_OPERATION_FAILED, - NULL, - wifi_callbacks.specific_scan_user_data); - } - } - break; - - default: - break; - } - - __COMMON_FUNC_EXIT__; -} diff --git a/sources/libraries/WlanManager/EngineManager/include/connman-request.h b/sources/libraries/WlanManager/EngineManager/include/connman-request.h deleted file mode 100644 index c554c18..0000000 --- a/sources/libraries/WlanManager/EngineManager/include/connman-request.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Wi-Fi - * - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef __CONNMAN_REQUEST_H__ -#define __CONNMAN_REQUEST_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#include - -int connman_request_specific_scan(const char *ssid); -int connman_request_scan_mode_set(net_wifi_background_scan_mode_t scan_mode); -int connman_request_register(void); -int connman_request_deregister(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/sources/libraries/WlanManager/EngineManager/include/connman-response.h b/sources/libraries/WlanManager/EngineManager/include/connman-response.h deleted file mode 100644 index 214ddb3..0000000 --- a/sources/libraries/WlanManager/EngineManager/include/connman-response.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Wi-Fi - * - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef __CONNMAN_RESPONSE_H__ -#define __CONNMAN_RESPONSE_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#include "connman-request.h" - -/** -* @brief Called when the specific scan is finished. -* @param[in] error_code The error code -* @param[in] user_data The user data passed from the callback registration function -* @see wifi_set_specific_scan_cb() -*/ -typedef void(*wifi_specific_scan_finished_cb)(wifi_manager_error_e error_code, GSList *bss_info_list, void* user_data); - - -int wifi_set_specific_scan_cb(wifi_specific_scan_finished_cb cb, void *data); -int wifi_unset_specific_scan_cb(void); -void network_evt_cb(const net_event_info_t* net_event, void* user_data); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/sources/libraries/WlanManager/WlanManager/include/wlan_manager.h b/sources/libraries/WlanManager/WlanManager/include/wlan_manager.h index cef6295..409f974 100755 --- a/sources/libraries/WlanManager/WlanManager/include/wlan_manager.h +++ b/sources/libraries/WlanManager/WlanManager/include/wlan_manager.h @@ -27,9 +27,7 @@ extern "C" #include #include - -#include "connman-request.h" -#include "connman-response.h" +#include typedef enum { WLAN_MANAGER_ERR_NONE = 0x00, @@ -42,6 +40,7 @@ typedef enum { WLAN_MANAGER_ERR_WIFI_AP_TETHERING_OCCUPIED, WLAN_MANAGER_ERR_NOSERVICE, WLAN_MANAGER_ERR_IN_PROGRESS, + WLAN_MANAGER_ERR_OPERATION_FAILED, } WLAN_MANAGER_ERR_TYPE; typedef enum { @@ -147,6 +146,11 @@ typedef enum { WIFI_MANAGER_CONNECTION_ERROR_UNKNOWN = 0x08, } wifi_connection_error_e; +typedef enum { + WLAN_MANAGER_AUTOSCAN_MODE_PERIODIC = WIFI_MANAGER_AUTOSCAN_MODE_PERIODIC, + WLAN_MANAGER_AUTOSCAN_MODE_EXPONENTIAL = WIFI_MANAGER_AUTOSCAN_MODE_EXPONENTIAL, +} wlan_manager_autoscan_mode_e; + #define WLAN_PROXY_LEN_MAX 64 typedef struct _wifi_device_info_t { @@ -157,7 +161,7 @@ typedef struct _wifi_device_info_t { char *ap_image_path; int ipconfigtype; int rssi; - wlan_security_mode_type_t security_mode; + wifi_manager_security_type_e security_mode; bool wps_mode; bool is_hidden; } wifi_device_info_t; @@ -244,12 +248,9 @@ int wlan_manager_disconnect(wifi_manager_ap_h); int wlan_manager_scan(void); int wlan_manager_forget(wifi_manager_ap_h ap); int wlan_manager_scan_with_ssid(const char *ssid, void *data); -wifi_connection_error_e wlan_manager_get_connection_error_state(wifi_manager_ap_h ap); gboolean wlan_manager_is_same_network(wifi_manager_ap_h ap1, wifi_manager_ap_h ap2); - -int wlan_manager_profile_modify_by_device_info(net_profile_info_t *profiles); - STRENGTH_TYPES wlan_manager_get_signal_strength(int rssi); +int wlan_manager_set_autoscan_mode(wlan_manager_autoscan_mode_e mode); //// profile refresh ///////////////////////////////////////////// void wlan_manager_scanned_profile_refresh(void); diff --git a/sources/libraries/WlanManager/WlanManager/wlan_manager.c b/sources/libraries/WlanManager/WlanManager/wlan_manager.c index 6c5a9b1..9b7ebd5 100755 --- a/sources/libraries/WlanManager/WlanManager/wlan_manager.c +++ b/sources/libraries/WlanManager/WlanManager/wlan_manager.c @@ -336,8 +336,7 @@ static void wlan_manager_device_state_changed_cb( switch (state) { case WIFI_MANAGER_DEVICE_STATE_ACTIVATED: - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_PERIODIC); - + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_PERIODIC); wlan_manager_enable_scan_result_update(); wlan_manager_register_cbs(); event_info.event_type = WLAN_MANAGER_RESPONSE_TYPE_POWER_ON_OK; @@ -411,18 +410,17 @@ static void wlan_manager_rssi_level_changed_cb( } static void wlan_manager_specific_scan_finished_cb( - wifi_manager_error_e error_code, GSList *bss_info_list, void *user_data) + wifi_manager_error_e error_code, void *user_data) { __COMMON_FUNC_ENTER__; wlan_mgr_event_info_t event_info; memset(&event_info, 0, sizeof(event_info)); - wifi_unset_specific_scan_cb(); - if (WIFI_MANAGER_ERROR_NONE == error_code) { event_info.event_type = WLAN_MANAGER_RESPONSE_TYPE_SPECIFIC_SCAN_OK; - event_info.bss_info_list = bss_info_list; + // Maybe bss_info_list is not used. + //event_info.bss_info_list = bss_info_list; } else { event_info.event_type = WLAN_MANAGER_RESPONSE_TYPE_SPECIFIC_SCAN_FAIL; } @@ -444,8 +442,6 @@ static void wlan_manager_register_cbs(void) scan_req_data.req_type = WLAN_MANAGER_REQ_TYPE_SCAN_RESULT; wifi_manager_set_background_scan_cb(manager_object->wifi, wlan_manager_network_event_cb, &scan_req_data); - connman_request_register(); - __COMMON_FUNC_EXIT__; } @@ -463,12 +459,9 @@ static void wlan_manager_deregister_cbs(void) * detsroy. */ - wifi_manager_unset_background_scan_cb(manager_object->wifi); wifi_manager_unset_connection_state_changed_cb(manager_object->wifi); wifi_manager_unset_rssi_level_changed_cb(manager_object->wifi); - wifi_unset_specific_scan_cb(); - connman_request_deregister(); __COMMON_FUNC_EXIT__; } @@ -893,14 +886,12 @@ int wlan_manager_scan_with_ssid(const char *ssid, void *user_data) { __COMMON_FUNC_ENTER__; - wifi_set_specific_scan_cb(wlan_manager_specific_scan_finished_cb, user_data); - - int ret = connman_request_specific_scan(ssid); - if (ret != WLAN_MANAGER_ERR_NONE) { + int ret = wifi_manager_scan_specific_ap(manager_object->wifi, + ssid, wlan_manager_specific_scan_finished_cb, user_data); + if (ret != WIFI_MANAGER_ERROR_NONE) { ERROR_LOG(UG_NAME_REQ, "Specific Scan failed. Ret: %d", ret); - __COMMON_FUNC_EXIT__; - return ret; + return WLAN_MANAGER_ERR_OPERATION_FAILED; } /* Since the scan request was success, @@ -997,37 +988,6 @@ int wlan_manager_get_connection_state(wifi_manager_connection_state_e *state) __COMMON_FUNC_EXIT__; } -wifi_connection_error_e wlan_manager_get_connection_error_state(wifi_manager_ap_h ap) -{ - net_profile_info_t *profile_info; - - if (!ap) - return WIFI_MANAGER_CONNECTION_ERROR_UNKNOWN; - - profile_info = (net_profile_info_t *)ap; - - switch (profile_info->ProfileErrorState) { - case NET_STATE_ERROR_NONE: - return WIFI_MANAGER_CONNECTION_ERROR_NONE; - case NET_STATE_ERROR_OUT_OF_RANGE: - return WIFI_MANAGER_CONNECTION_ERROR_OUT_OF_RANGE; - case NET_STATE_ERROR_PIN_MISSING: - return WIFI_MANAGER_CONNECTION_ERROR_PIN_MISSING; - case NET_STATE_ERROR_DHCP_FAILED: - return WIFI_MANAGER_CONNECTION_ERROR_DHCP_FAILED; - case NET_STATE_ERROR_CONNECT_FAILED: - return WIFI_MANAGER_CONNECTION_ERROR_CONNECT_FAILED; - case NET_STATE_ERROR_LOGIN_FAILED: - return WIFI_MANAGER_CONNECTION_ERROR_LOGIN_FAILED; - case NET_STATE_ERROR_AUTH_FAILED: - return WIFI_MANAGER_CONNECTION_ERROR_AUTH_FAILED; - case NET_STATE_ERROR_INVALID_KEY: - return WIFI_MANAGER_CONNECTION_ERROR_INVALID_KEY; - } - - return WIFI_MANAGER_CONNECTION_ERROR_UNKNOWN; -} - gboolean wlan_manager_is_same_network(wifi_manager_ap_h ap1, wifi_manager_ap_h ap2) { gboolean is_same = FALSE; @@ -1083,3 +1043,12 @@ void wlan_validate_alt_connection(void) break; } } + +int wlan_manager_set_autoscan_mode(wlan_manager_autoscan_mode_e mode) +{ + int ret = wifi_manager_set_autoscan_mode(manager_object->wifi, mode); + if (ret == WIFI_MANAGER_ERROR_NONE) + return WLAN_MANAGER_ERR_NONE; + else + return WLAN_MANAGER_ERR_OPERATION_FAILED; +} diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c index 6de1d70..05657bd 100755 --- a/sources/ui-gadget/viewers-layout/viewer_manager.c +++ b/sources/ui-gadget/viewers-layout/viewer_manager.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "common.h" #include "ug_wifi.h" @@ -35,7 +36,7 @@ #include "view_detail.h" typedef struct { - wlan_security_mode_type_t sec_mode; + wifi_manager_security_type_e sec_mode; char *ssid; wifi_device_info_t *device_info; Evas_Object *confirm_popup; @@ -85,11 +86,11 @@ static Eina_Bool rotate_flag = EINA_FALSE; static bool show_more = TRUE; wifi_emulator_sample_s wifi_samples[] = { - {"datanetwork", WLAN_SEC_MODE_WPA_PSK, 1}, - {"ureadyinternet", WLAN_SEC_MODE_IEEE8021X, 0}, - {"uready", WLAN_SEC_MODE_IEEE8021X, 1}, - {"setup", WLAN_SEC_MODE_NONE, 0}, - {"Tizen", WLAN_SEC_MODE_WPA2_PSK, 1}, + {"datanetwork", WIFI_MANAGER_SECURITY_TYPE_WPA_PSK, 1}, + {"ureadyinternet", WIFI_MANAGER_SECURITY_TYPE_EAP, 0}, + {"uready", WIFI_MANAGER_SECURITY_TYPE_EAP, 1}, + {"setup", WIFI_MANAGER_SECURITY_TYPE_NONE, 0}, + {"Tizen", WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK, 1}, }; int wifi_sample_count = sizeof(wifi_samples) / sizeof(wifi_samples[0]); @@ -1918,24 +1919,18 @@ static void hidden_ap_connect_ok_cb(void *data, hidden_ap_data->ssid, hidden_ap_data->sec_mode); switch (hidden_ap_data->sec_mode) { - case WLAN_SEC_MODE_NONE: + case WIFI_MANAGER_SECURITY_TYPE_NONE: INFO_LOG(UG_NAME_NORMAL, "OPEN: event %p; passpopup %p", event_info, ug_app_state->passpopup); wifi_manager_ap_set_security_type(ap, WIFI_MANAGER_SECURITY_TYPE_NONE); break; - case WLAN_SEC_MODE_WEP: - case WLAN_SEC_MODE_WPA_PSK: - case WLAN_SEC_MODE_WPA2_PSK: + case WIFI_MANAGER_SECURITY_TYPE_WEP: + case WIFI_MANAGER_SECURITY_TYPE_WPA_PSK: + case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK: szPassword = passwd_popup_get_txt(ug_app_state->passpopup); - - if (WLAN_SEC_MODE_WEP == hidden_ap_data->sec_mode) - wifi_manager_ap_set_security_type(ap, WIFI_MANAGER_SECURITY_TYPE_WEP); - else if (WLAN_SEC_MODE_WPA_PSK == hidden_ap_data->sec_mode) - wifi_manager_ap_set_security_type(ap, WIFI_MANAGER_SECURITY_TYPE_WPA_PSK); - else - wifi_manager_ap_set_security_type(ap, WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK); + wifi_manager_ap_set_security_type(ap, hidden_ap_data->sec_mode); int ret = wifi_manager_ap_set_passphrase(ap, szPassword); if (ret != WIFI_MANAGER_ERROR_NONE) @@ -1977,13 +1972,13 @@ static void hidden_ap_connect_cancel_cb(void *data, Evas_Object *obj, } switch (hidden_ap_data->sec_mode) { - case WLAN_SEC_MODE_NONE: + case WIFI_MANAGER_SECURITY_TYPE_NONE: INFO_LOG(UG_NAME_NORMAL, "This hidden AP is Open"); break; - case WLAN_SEC_MODE_WEP: - case WLAN_SEC_MODE_WPA_PSK: - case WLAN_SEC_MODE_WPA2_PSK: + case WIFI_MANAGER_SECURITY_TYPE_WEP: + case WIFI_MANAGER_SECURITY_TYPE_WPA_PSK: + case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK: INFO_LOG(UG_NAME_NORMAL, "Hidden AP Secured"); passwd_popup_free(ug_app_state->passpopup); @@ -2040,7 +2035,7 @@ void viewer_manager_specific_scan_response_hlr( { hidden_ap_data_t *hidden_ap_data = NULL; const char *ssid = (const char *)user_data; - wlan_security_mode_type_t sec_mode = 0; + wifi_manager_security_type_e sec_mode = 0; bool favorite = false; ug_genlist_data_t* gdata = NULL; Evas_Object *popup = NULL; @@ -2102,11 +2097,11 @@ void viewer_manager_specific_scan_response_hlr( /* Only if there is one AP found then we need Users further action */ switch (sec_mode) { - case WLAN_SEC_MODE_NONE: + case WIFI_MANAGER_SECURITY_TYPE_NONE: SECURE_INFO_LOG(UG_NAME_NORMAL, "%s open network found", ssid); hidden_ap_data = g_new0(hidden_ap_data_t, 1); - hidden_ap_data->sec_mode = WLAN_SEC_MODE_NONE; + hidden_ap_data->sec_mode = sec_mode; hidden_ap_data->ssid = g_strdup(ssid); popup_btn_info_t popup_btn_data; @@ -2137,7 +2132,7 @@ void viewer_manager_specific_scan_response_hlr( manager_object->hidden_popup_data = hidden_ap_data; break; - case WLAN_SEC_MODE_IEEE8021X: + case WIFI_MANAGER_SECURITY_TYPE_EAP: SECURE_INFO_LOG(UG_NAME_NORMAL, "%s IEEE8021X found", ssid); wifi_device_info_t device_info; @@ -2163,9 +2158,9 @@ void viewer_manager_specific_scan_response_hlr( break; - case WLAN_SEC_MODE_WEP: - case WLAN_SEC_MODE_WPA_PSK: - case WLAN_SEC_MODE_WPA2_PSK: + case WIFI_MANAGER_SECURITY_TYPE_WEP: + case WIFI_MANAGER_SECURITY_TYPE_WPA_PSK: + case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK: SECURE_INFO_LOG(UG_NAME_NORMAL, "Secured(%d) %s found", sec_mode, ssid); @@ -2192,13 +2187,7 @@ void viewer_manager_specific_scan_response_hlr( popup_info.ok_cb = hidden_ap_connect_ok_cb; popup_info.cancel_cb = hidden_ap_connect_cancel_cb; popup_info.cb_data = hidden_ap_data; - - if (sec_mode == WLAN_SEC_MODE_WEP) - popup_info.sec_type = WIFI_MANAGER_SECURITY_TYPE_WEP; - else if (sec_mode == WLAN_SEC_MODE_WPA_PSK) - popup_info.sec_type = WIFI_MANAGER_SECURITY_TYPE_WPA_PSK; - else if (sec_mode == WLAN_SEC_MODE_WPA2_PSK) - popup_info.sec_type = WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK; + popup_info.sec_type = sec_mode; ug_app_state->passpopup = create_passwd_popup( @@ -2223,7 +2212,6 @@ exit: wifi_device_info_t *view_list_item_device_info_create(wifi_manager_ap_h ap) { - wifi_manager_security_type_e sec_type; int ret = false; wifi_device_info_t* wifi_device = NULL; @@ -2237,12 +2225,11 @@ wifi_device_info_t *view_list_item_device_info_create(wifi_manager_ap_h ap) goto FREE_DEVICE_INFO; else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_rssi(ap, &(wifi_device->rssi))) goto FREE_DEVICE_INFO; - else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_security_type(ap, &sec_type)) + else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_security_type(ap, &(wifi_device->security_mode))) goto FREE_DEVICE_INFO; else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_is_wps_supported(ap, &(wifi_device->wps_mode))) goto FREE_DEVICE_INFO; - wifi_device->security_mode = common_utils_get_sec_mode(sec_type); common_utils_get_device_icon(wifi_device, &wifi_device->ap_image_path); } ret = true; diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c index 91a3832..2142e3b 100755 --- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c +++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c @@ -1246,24 +1246,23 @@ Elm_Object_Item* item_get_for_ap(wifi_manager_ap_h ap) } char *essid = NULL; - wifi_manager_security_type_e type = WIFI_MANAGER_SECURITY_TYPE_NONE; + wifi_manager_security_type_e sec_type = WIFI_MANAGER_SECURITY_TYPE_NONE; if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_essid(ap, &essid)) { __COMMON_FUNC_EXIT__; return NULL; - } else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_security_type(ap, &type)) { + } else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_security_type(ap, &sec_type)) { g_free(essid); __COMMON_FUNC_EXIT__; return NULL; } Elm_Object_Item *it = first_item; - wlan_security_mode_type_t sec_mode = common_utils_get_sec_mode(type); while (it) { ug_genlist_data_t* gdata = elm_object_item_data_get(it); wifi_device_info_t *device_info = NULL; if (gdata && (device_info = gdata->device_info)) { - if (!g_strcmp0(device_info->ssid, essid) && device_info->security_mode == sec_mode) + if (!g_strcmp0(device_info->ssid, essid) && device_info->security_mode == sec_type) break; } if (it == last_item) { diff --git a/sources/ui-gadget/wifi-efl-UG.c b/sources/ui-gadget/wifi-efl-UG.c index 8d8857e..746d0c6 100755 --- a/sources/ui-gadget/wifi-efl-UG.c +++ b/sources/ui-gadget/wifi-efl-UG.c @@ -253,8 +253,7 @@ static void on_start(ui_gadget_h ug, app_control_h app_control, void *priv) __COMMON_FUNC_ENTER__; common_util_managed_idle_add(load_initial_ap_list, NULL); - - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_PERIODIC); + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_PERIODIC); __COMMON_FUNC_EXIT__; } @@ -265,8 +264,7 @@ static void on_pause(ui_gadget_h ug, app_control_h app_control, void *priv) INFO_LOG(UG_NAME_NORMAL, "Wi-Fi UG paused"); - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_EXPONENTIAL); - + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_EXPONENTIAL); common_util_set_system_registry(VCONFKEY_WIFI_UG_RUN_STATE, VCONFKEY_WIFI_UG_RUN_STATE_ON_BACKGROUND); @@ -279,8 +277,7 @@ static void on_resume(ui_gadget_h ug, app_control_h app_control, void *priv) INFO_LOG(UG_NAME_NORMAL, "Wi-Fi UG resumed"); - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_PERIODIC); - + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_PERIODIC); common_util_set_system_registry(VCONFKEY_WIFI_UG_RUN_STATE, VCONFKEY_WIFI_UG_RUN_STATE_ON_FOREGROUND); @@ -326,8 +323,7 @@ static void on_destroy(ui_gadget_h ug, app_control_h app_control, void *priv) #endif if (wifi_exit_end == FALSE) { - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_EXPONENTIAL); - + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_EXPONENTIAL); common_util_managed_idle_cleanup(); common_util_managed_ecore_scan_update_timer_del(); @@ -575,8 +571,7 @@ int wifi_exit(void) ugd = ug_app_state->gadget; ug_app_state->bAlive = EINA_FALSE; - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_EXPONENTIAL); - + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_EXPONENTIAL); common_util_managed_idle_cleanup(); common_util_managed_ecore_scan_update_timer_del(); diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/sources/wifi-syspopup/viewer-popups/view-main.c index efbcd42..e791dad 100755 --- a/sources/wifi-syspopup/viewer-popups/view-main.c +++ b/sources/wifi-syspopup/viewer-popups/view-main.c @@ -415,24 +415,23 @@ Elm_Object_Item *view_main_item_get_for_ap(wifi_manager_ap_h ap) } char *essid = NULL; - wifi_manager_security_type_e type = WIFI_MANAGER_SECURITY_TYPE_NONE; + wifi_manager_security_type_e sec_type = WIFI_MANAGER_SECURITY_TYPE_NONE; if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_essid(ap, &essid)) { __COMMON_FUNC_EXIT__; return NULL; - } else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_security_type(ap, &type)) { + } else if (WIFI_MANAGER_ERROR_NONE != wifi_manager_ap_get_security_type(ap, &sec_type)) { g_free(essid); __COMMON_FUNC_EXIT__; return NULL; } Elm_Object_Item *it = elm_genlist_first_item_get(list); - wlan_security_mode_type_t sec_mode = common_utils_get_sec_mode(type); while (it) { devpkr_gl_data_t* gdata = elm_object_item_data_get(it); wifi_device_info_t *device_info = NULL; if (gdata && (device_info = gdata->dev_info)) { - if (!g_strcmp0(device_info->ssid, essid) && device_info->security_mode == sec_mode) + if (!g_strcmp0(device_info->ssid, essid) && device_info->security_mode == sec_type) break; } @@ -728,7 +727,6 @@ void view_main_item_state_set(wifi_manager_ap_h ap, ITEM_CONNECTION_MODES state) char *item_ssid = NULL; wifi_manager_security_type_e sec_type; - wlan_security_mode_type_t item_sec_mode; Elm_Object_Item* it = NULL; it = elm_genlist_first_item_get(list); @@ -741,8 +739,7 @@ void view_main_item_state_set(wifi_manager_ap_h ap, ITEM_CONNECTION_MODES state) __COMMON_FUNC_EXIT__; return; } - item_sec_mode = common_utils_get_sec_mode(sec_type); - SECURE_INFO_LOG(SP_NAME_NORMAL, "item state set for AP[%s] with sec mode[%d]", item_ssid, item_sec_mode); + SECURE_INFO_LOG(SP_NAME_NORMAL, "item state set for AP[%s] with sec mode[%d]", item_ssid, sec_type); while (it) { devpkr_gl_data_t *gdata = (devpkr_gl_data_t *)elm_object_item_data_get(it); if (gdata != NULL) { @@ -750,7 +747,7 @@ void view_main_item_state_set(wifi_manager_ap_h ap, ITEM_CONNECTION_MODES state) gdata->dev_info->ssid, gdata->dev_info->security_mode); } - if (gdata && gdata->dev_info->security_mode == item_sec_mode && + if (gdata && gdata->dev_info->security_mode == sec_type && !g_strcmp0(gdata->dev_info->ssid, item_ssid)) { if (gdata->connection_mode != state) { gdata->connection_mode = state; @@ -797,7 +794,7 @@ static wifi_device_info_t *view_main_item_device_info_create(wifi_manager_ap_h a return NULL; } - wifi_device->security_mode = common_utils_get_sec_mode(sec_type); + wifi_device->security_mode = sec_type; wifi_device->ap_status_txt = common_utils_get_ap_security_type_info_txt(PACKAGE, wifi_device, true); common_utils_get_device_icon(wifi_device, &wifi_device->ap_image_path); diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c index 1d9a15f..ada8cce 100755 --- a/sources/wifi-syspopup/wifi-syspopup.c +++ b/sources/wifi-syspopup/wifi-syspopup.c @@ -17,7 +17,6 @@ * */ -#include #include #include #include @@ -275,7 +274,7 @@ int wifi_devpkr_destroy(void) vconf_ignore_key_changed(VCONFKEY_IDLE_LOCK_STATE, __idle_lock_state_change_cb); - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_EXPONENTIAL); + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_EXPONENTIAL); elm_exit(); @@ -430,7 +429,7 @@ static int wifi_devpkr_init() break; } - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_PERIODIC); + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_PERIODIC); __COMMON_FUNC_EXIT__; return wlan_ret; @@ -674,7 +673,7 @@ static void app_pause(void *data) { __COMMON_FUNC_ENTER__; - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_EXPONENTIAL); + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_EXPONENTIAL); __COMMON_FUNC_EXIT__; return; @@ -684,7 +683,7 @@ static void app_resume(void *data) { __COMMON_FUNC_ENTER__; - connman_request_scan_mode_set(WIFI_BGSCAN_MODE_PERIODIC); + wlan_manager_set_autoscan_mode(WLAN_MANAGER_AUTOSCAN_MODE_PERIODIC); __COMMON_FUNC_EXIT__; return;