From 7465c3af0d98efa280977797aa939f27d36b12b8 Mon Sep 17 00:00:00 2001 From: "taesub.kim" Date: Fri, 29 Nov 2013 13:49:16 +0900 Subject: Set CFLAGS fvisibility hidden Change-Id: I031092518981d5c4790bb74c8253d0eab1d4e4b8 Signed-off-by: Taesub Kim --- CMakeLists.txt | 3 +- debian/changelog | 8 +++ include/net_wifi_private.h | 5 +- include/wifi.h | 29 ++++++----- packaging/capi-network-wifi.spec | 2 +- src/net_wifi.c | 55 ++++++++++---------- src/net_wifi_ap.c | 106 ++++++++++++++++++--------------------- 7 files changed, 101 insertions(+), 107 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b799a0d..82df0a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fvisibility=hidden") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") @@ -93,4 +93,3 @@ ADD_CUSTOM_COMMAND( ) ENDIF(UNIX) - diff --git a/debian/changelog b/debian/changelog index f1272cd..a03ab63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +capi-network-wifi (0.1.2-20) unstable; urgency=low + + * Set CFLAGS fvisibility hidden + * Git: framework/api/wifi + * Tag: capi-network-wifi_0.1.2-20 + + -- Taesub Kim Fri, 29 Nov 2013 13:31:46 +0900 + capi-network-wifi (0.1.2-19) unstable; urgency=low * Fix Wi-Fi open connection diff --git a/include/net_wifi_private.h b/include/net_wifi_private.h index 2bab494..2cc31d1 100644 --- a/include/net_wifi_private.h +++ b/include/net_wifi_private.h @@ -14,14 +14,13 @@ * limitations under the License. */ - - -#ifndef __NET_CONNECTION_PRIVATE_H__ /* To prevent inclusion of a header file twice */ +#ifndef __NET_CONNECTION_PRIVATE_H__ #define __NET_CONNECTION_PRIVATE_H__ #include #include #include + #include "wifi.h" #undef LOG_TAG diff --git a/include/wifi.h b/include/wifi.h index da8b9ea..fcf3add 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -1,18 +1,18 @@ /* -* Copyright (c) 2012-2013 Samsung Electronics Co., Ltd All Rights Reserved -* -* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -* -* 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. -*/ + * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * 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 __TIZEN_NETWORK_WIFI_H__ #define __TIZEN_NETWORK_WIFI_H__ @@ -1244,7 +1244,6 @@ int wifi_ap_set_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e type); * @} */ - #ifdef __cplusplus } #endif diff --git a/packaging/capi-network-wifi.spec b/packaging/capi-network-wifi.spec index 19170c9..894568a 100644 --- a/packaging/capi-network-wifi.spec +++ b/packaging/capi-network-wifi.spec @@ -1,6 +1,6 @@ Name: capi-network-wifi Summary: Network Wi-Fi library in TIZEN C API -Version: 0.1.2_19 +Version: 0.1.2_20 Release: 1 Group: System/Network License: Apache-2.0 diff --git a/src/net_wifi.c b/src/net_wifi.c index a722315..0c4abf3 100755 --- a/src/net_wifi.c +++ b/src/net_wifi.c @@ -31,7 +31,7 @@ static void __rssi_level_changed_cb(keynode_t *node, void *user_data) rssi_level_changed_cb(rssi_level, rssi_level_changed_user_data); } -int wifi_initialize(void) +EXPORT_API int wifi_initialize(void) { if (is_init) { WIFI_LOG(WIFI_ERROR, "Already initialized\n"); @@ -48,7 +48,7 @@ int wifi_initialize(void) return WIFI_ERROR_NONE; } -int wifi_deinitialize(void) +EXPORT_API int wifi_deinitialize(void) { if (is_init == false) { WIFI_LOG(WIFI_ERROR, "Not initialized\n"); @@ -66,7 +66,7 @@ int wifi_deinitialize(void) return WIFI_ERROR_NONE; } -int wifi_activate(wifi_activated_cb callback, void* user_data) +EXPORT_API int wifi_activate(wifi_activated_cb callback, void* user_data) { int rv; @@ -82,7 +82,7 @@ int wifi_activate(wifi_activated_cb callback, void* user_data) return rv; } -int wifi_deactivate(wifi_deactivated_cb callback, void* user_data) +EXPORT_API int wifi_deactivate(wifi_deactivated_cb callback, void* user_data) { int rv; @@ -98,7 +98,7 @@ int wifi_deactivate(wifi_deactivated_cb callback, void* user_data) return rv; } -int wifi_is_activated(bool* activated) +EXPORT_API int wifi_is_activated(bool* activated) { wifi_device_state_e device_state; @@ -120,7 +120,7 @@ int wifi_is_activated(bool* activated) return WIFI_ERROR_NONE; } -int wifi_get_connection_state(wifi_connection_state_e* connection_state) +EXPORT_API int wifi_get_connection_state(wifi_connection_state_e* connection_state) { if (connection_state == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -133,7 +133,7 @@ int wifi_get_connection_state(wifi_connection_state_e* connection_state) return WIFI_ERROR_NONE; } -int wifi_get_mac_address(char** mac_address) +EXPORT_API int wifi_get_mac_address(char** mac_address) { if (mac_address == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -152,7 +152,7 @@ int wifi_get_mac_address(char** mac_address) return WIFI_ERROR_NONE; } -int wifi_get_network_interface_name(char** name) +EXPORT_API int wifi_get_network_interface_name(char** name) { if (name == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -162,7 +162,7 @@ int wifi_get_network_interface_name(char** name) return _wifi_libnet_get_intf_name(name); } -int wifi_scan(wifi_scan_finished_cb callback, void* user_data) +EXPORT_API int wifi_scan(wifi_scan_finished_cb callback, void* user_data) { int rv; @@ -183,7 +183,7 @@ int wifi_scan(wifi_scan_finished_cb callback, void* user_data) return rv; } -int wifi_scan_hidden_ap(const char* essid, wifi_scan_finished_cb callback, void* user_data) +EXPORT_API int wifi_scan_hidden_ap(const char* essid, wifi_scan_finished_cb callback, void* user_data) { int rv; @@ -204,7 +204,7 @@ int wifi_scan_hidden_ap(const char* essid, wifi_scan_finished_cb callback, void* return rv; } -int wifi_get_connected_ap(wifi_ap_h* ap) +EXPORT_API int wifi_get_connected_ap(wifi_ap_h* ap) { int rv; @@ -213,13 +213,13 @@ int wifi_get_connected_ap(wifi_ap_h* ap) return WIFI_ERROR_INVALID_PARAMETER; } - rv = _wifi_libnet_get_connected_profile(ap); - WIFI_LOG(WIFI_INFO, "Connected AP : %p, rv : %d\n", *ap, rv); + rv = _wifi_libnet_get_connected_profile(ap); + WIFI_LOG(WIFI_INFO, "Connected AP %p, rv %d\n", *ap, rv); return rv; } -int wifi_foreach_found_aps(wifi_found_ap_cb callback, void* user_data) +EXPORT_API int wifi_foreach_found_aps(wifi_found_ap_cb callback, void* user_data) { if (callback == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -232,7 +232,7 @@ int wifi_foreach_found_aps(wifi_found_ap_cb callback, void* user_data) return WIFI_ERROR_NONE; } -int wifi_foreach_found_hidden_aps(wifi_found_ap_cb callback, void* user_data) +EXPORT_API int wifi_foreach_found_hidden_aps(wifi_found_ap_cb callback, void* user_data) { if (callback == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -245,7 +245,7 @@ int wifi_foreach_found_hidden_aps(wifi_found_ap_cb callback, void* user_data) return WIFI_ERROR_NONE; } -int wifi_connect(wifi_ap_h ap, wifi_connected_cb callback, void* user_data) +EXPORT_API int wifi_connect(wifi_ap_h ap, wifi_connected_cb callback, void* user_data) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -260,7 +260,7 @@ int wifi_connect(wifi_ap_h ap, wifi_connected_cb callback, void* user_data) return _wifi_libnet_open_profile(ap, callback, user_data); } -int wifi_disconnect(wifi_ap_h ap, wifi_disconnected_cb callback, void* user_data) +EXPORT_API int wifi_disconnect(wifi_ap_h ap, wifi_disconnected_cb callback, void* user_data) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -275,7 +275,7 @@ int wifi_disconnect(wifi_ap_h ap, wifi_disconnected_cb callback, void* user_data return _wifi_libnet_close_profile(ap, callback, user_data); } -int wifi_connect_by_wps_pbc(wifi_ap_h ap, wifi_connected_cb callback, void* user_data) +EXPORT_API int wifi_connect_by_wps_pbc(wifi_ap_h ap, wifi_connected_cb callback, void* user_data) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -290,7 +290,7 @@ int wifi_connect_by_wps_pbc(wifi_ap_h ap, wifi_connected_cb callback, void* user return _wifi_libnet_connect_with_wps(ap, callback, user_data); } -int wifi_forget_ap(wifi_ap_h ap) +EXPORT_API int wifi_forget_ap(wifi_ap_h ap) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -305,7 +305,7 @@ int wifi_forget_ap(wifi_ap_h ap) return _wifi_libnet_forget_ap(ap); } -int wifi_set_device_state_changed_cb(wifi_device_state_changed_cb callback, void* user_data) +EXPORT_API int wifi_set_device_state_changed_cb(wifi_device_state_changed_cb callback, void* user_data) { if (callback == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -320,12 +320,12 @@ int wifi_set_device_state_changed_cb(wifi_device_state_changed_cb callback, void return _wifi_set_power_on_off_cb(callback, user_data); } -int wifi_unset_device_state_changed_cb(void) +EXPORT_API int wifi_unset_device_state_changed_cb(void) { return _wifi_unset_power_on_off_cb(); } -int wifi_set_background_scan_cb(wifi_scan_finished_cb callback, void* user_data) +EXPORT_API int wifi_set_background_scan_cb(wifi_scan_finished_cb callback, void* user_data) { if (callback == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -340,12 +340,12 @@ int wifi_set_background_scan_cb(wifi_scan_finished_cb callback, void* user_data) return _wifi_set_background_scan_cb(callback, user_data); } -int wifi_unset_background_scan_cb(void) +EXPORT_API int wifi_unset_background_scan_cb(void) { return _wifi_unset_background_scan_cb(); } -int wifi_set_connection_state_changed_cb(wifi_connection_state_changed_cb callback, void* user_data) +EXPORT_API int wifi_set_connection_state_changed_cb(wifi_connection_state_changed_cb callback, void* user_data) { if (callback == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -360,12 +360,12 @@ int wifi_set_connection_state_changed_cb(wifi_connection_state_changed_cb callba return _wifi_set_connection_state_cb(callback, user_data); } -int wifi_unset_connection_state_changed_cb(void) +EXPORT_API int wifi_unset_connection_state_changed_cb(void) { return _wifi_unset_connection_state_cb(); } -int wifi_set_rssi_level_changed_cb(wifi_rssi_level_changed_cb callback, void* user_data) +EXPORT_API int wifi_set_rssi_level_changed_cb(wifi_rssi_level_changed_cb callback, void* user_data) { if (callback == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -383,7 +383,7 @@ int wifi_set_rssi_level_changed_cb(wifi_rssi_level_changed_cb callback, void* us return WIFI_ERROR_NONE; } -int wifi_unset_rssi_level_changed_cb(void) +EXPORT_API int wifi_unset_rssi_level_changed_cb(void) { if (rssi_level_changed_cb != NULL) vconf_ignore_key_changed(VCONFKEY_WIFI_STRENGTH, __rssi_level_changed_cb); @@ -395,4 +395,3 @@ int wifi_unset_rssi_level_changed_cb(void) return WIFI_ERROR_NONE; } - diff --git a/src/net_wifi_ap.c b/src/net_wifi_ap.c index 0afee41..85b6871 100755 --- a/src/net_wifi_ap.c +++ b/src/net_wifi_ap.c @@ -72,9 +72,8 @@ wifi_connection_state_e _wifi_convert_to_ap_state(net_state_type_t state) return ap_state; } -/* Wi-Fi AP module ********************************************************************************/ - -int wifi_ap_create(const char* essid, wifi_ap_h* ap) +/* Wi-Fi AP ******************************************************************/ +EXPORT_API int wifi_ap_create(const char* essid, wifi_ap_h* ap) { if (essid == NULL || ap == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -93,7 +92,7 @@ int wifi_ap_create(const char* essid, wifi_ap_h* ap) return WIFI_ERROR_NONE; } -int wifi_ap_destroy(wifi_ap_h ap) +EXPORT_API int wifi_ap_destroy(wifi_ap_h ap) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -105,7 +104,7 @@ int wifi_ap_destroy(wifi_ap_h ap) return WIFI_ERROR_NONE; } -int wifi_ap_clone(wifi_ap_h* cloned_ap, wifi_ap_h origin) +EXPORT_API int wifi_ap_clone(wifi_ap_h* cloned_ap, wifi_ap_h origin) { if (_wifi_libnet_check_ap_validity(origin) == false || cloned_ap == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -124,7 +123,7 @@ int wifi_ap_clone(wifi_ap_h* cloned_ap, wifi_ap_h origin) return WIFI_ERROR_NONE; } -int wifi_ap_refresh(wifi_ap_h ap) +EXPORT_API int wifi_ap_refresh(wifi_ap_h ap) { net_profile_info_t ap_info_local; net_profile_info_t *ap_info = ap; @@ -139,9 +138,8 @@ int wifi_ap_refresh(wifi_ap_h ap) return WIFI_ERROR_NONE; } -/* Wi-Fi network information module ***************************************************************/ - -int wifi_ap_get_essid(wifi_ap_h ap, char** essid) +/* Wi-Fi network information *************************************************/ +EXPORT_API int wifi_ap_get_essid(wifi_ap_h ap, char** essid) { if (_wifi_libnet_check_ap_validity(ap) == false || essid == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -156,7 +154,7 @@ int wifi_ap_get_essid(wifi_ap_h ap, char** essid) return WIFI_ERROR_NONE; } -int wifi_ap_get_bssid(wifi_ap_h ap, char** bssid) +EXPORT_API int wifi_ap_get_bssid(wifi_ap_h ap, char** bssid) { if (_wifi_libnet_check_ap_validity(ap) == false || bssid == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -171,7 +169,7 @@ int wifi_ap_get_bssid(wifi_ap_h ap, char** bssid) return WIFI_ERROR_NONE; } -int wifi_ap_get_rssi(wifi_ap_h ap, int* rssi) +EXPORT_API int wifi_ap_get_rssi(wifi_ap_h ap, int* rssi) { if (_wifi_libnet_check_ap_validity(ap) == false || rssi == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -184,7 +182,7 @@ int wifi_ap_get_rssi(wifi_ap_h ap, int* rssi) return WIFI_ERROR_NONE; } -int wifi_ap_get_frequency(wifi_ap_h ap, int* frequency) +EXPORT_API int wifi_ap_get_frequency(wifi_ap_h ap, int* frequency) { if (_wifi_libnet_check_ap_validity(ap) == false || frequency == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -197,7 +195,7 @@ int wifi_ap_get_frequency(wifi_ap_h ap, int* frequency) return WIFI_ERROR_NONE; } -int wifi_ap_get_max_speed(wifi_ap_h ap, int* max_speed) +EXPORT_API int wifi_ap_get_max_speed(wifi_ap_h ap, int* max_speed) { if (_wifi_libnet_check_ap_validity(ap) == false || max_speed == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -210,7 +208,7 @@ int wifi_ap_get_max_speed(wifi_ap_h ap, int* max_speed) return WIFI_ERROR_NONE; } -int wifi_ap_is_favorite(wifi_ap_h ap, bool* favorite) +EXPORT_API int wifi_ap_is_favorite(wifi_ap_h ap, bool* favorite) { if (_wifi_libnet_check_ap_validity(ap) == false || favorite == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -227,7 +225,7 @@ int wifi_ap_is_favorite(wifi_ap_h ap, bool* favorite) return WIFI_ERROR_NONE; } -int wifi_ap_get_connection_state(wifi_ap_h ap, wifi_connection_state_e* state) +EXPORT_API int wifi_ap_get_connection_state(wifi_ap_h ap, wifi_connection_state_e* state) { if (_wifi_libnet_check_ap_validity(ap) == false || state == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -244,7 +242,7 @@ int wifi_ap_get_connection_state(wifi_ap_h ap, wifi_connection_state_e* state) return WIFI_ERROR_NONE; } -int wifi_ap_get_ip_config_type(wifi_ap_h ap, wifi_address_family_e address_family, wifi_ip_config_type_e* type) +EXPORT_API int wifi_ap_get_ip_config_type(wifi_ap_h ap, wifi_address_family_e address_family, wifi_ip_config_type_e* type) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -284,7 +282,7 @@ int wifi_ap_get_ip_config_type(wifi_ap_h ap, wifi_address_family_e address_famil return WIFI_ERROR_NONE; } -int wifi_ap_set_ip_config_type(wifi_ap_h ap, wifi_address_family_e address_family, wifi_ip_config_type_e type) +EXPORT_API int wifi_ap_set_ip_config_type(wifi_ap_h ap, wifi_address_family_e address_family, wifi_ip_config_type_e type) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -329,7 +327,7 @@ int wifi_ap_set_ip_config_type(wifi_ap_h ap, wifi_address_family_e address_famil return _wifi_update_ap_info(profile_info); } -int wifi_ap_get_ip_address(wifi_ap_h ap, wifi_address_family_e address_family, char** ip_address) +EXPORT_API int wifi_ap_get_ip_address(wifi_ap_h ap, wifi_address_family_e address_family, char** ip_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -352,7 +350,7 @@ int wifi_ap_get_ip_address(wifi_ap_h ap, wifi_address_family_e address_family, c return WIFI_ERROR_NONE; } -int wifi_ap_set_ip_address(wifi_ap_h ap, wifi_address_family_e address_family, const char* ip_address) +EXPORT_API int wifi_ap_set_ip_address(wifi_ap_h ap, wifi_address_family_e address_family, const char* ip_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -379,7 +377,7 @@ int wifi_ap_set_ip_address(wifi_ap_h ap, wifi_address_family_e address_family, c return _wifi_update_ap_info(profile_info); } -int wifi_ap_get_subnet_mask(wifi_ap_h ap, wifi_address_family_e address_family, char** subnet_mask) +EXPORT_API int wifi_ap_get_subnet_mask(wifi_ap_h ap, wifi_address_family_e address_family, char** subnet_mask) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -402,7 +400,7 @@ int wifi_ap_get_subnet_mask(wifi_ap_h ap, wifi_address_family_e address_family, return WIFI_ERROR_NONE; } -int wifi_ap_set_subnet_mask(wifi_ap_h ap, wifi_address_family_e address_family, const char* subnet_mask) +EXPORT_API int wifi_ap_set_subnet_mask(wifi_ap_h ap, wifi_address_family_e address_family, const char* subnet_mask) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -429,7 +427,7 @@ int wifi_ap_set_subnet_mask(wifi_ap_h ap, wifi_address_family_e address_family, return _wifi_update_ap_info(profile_info); } -int wifi_ap_get_gateway_address(wifi_ap_h ap, wifi_address_family_e address_family, char** gateway_address) +EXPORT_API int wifi_ap_get_gateway_address(wifi_ap_h ap, wifi_address_family_e address_family, char** gateway_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -452,7 +450,7 @@ int wifi_ap_get_gateway_address(wifi_ap_h ap, wifi_address_family_e address_fami return WIFI_ERROR_NONE; } -int wifi_ap_set_gateway_address(wifi_ap_h ap, wifi_address_family_e address_family, const char* gateway_address) +EXPORT_API int wifi_ap_set_gateway_address(wifi_ap_h ap, wifi_address_family_e address_family, const char* gateway_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -479,7 +477,7 @@ int wifi_ap_set_gateway_address(wifi_ap_h ap, wifi_address_family_e address_fami return _wifi_update_ap_info(profile_info); } -int wifi_ap_get_proxy_address(wifi_ap_h ap, wifi_address_family_e address_family, char** proxy_address) +EXPORT_API int wifi_ap_get_proxy_address(wifi_ap_h ap, wifi_address_family_e address_family, char** proxy_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -502,7 +500,7 @@ int wifi_ap_get_proxy_address(wifi_ap_h ap, wifi_address_family_e address_family return WIFI_ERROR_NONE; } -int wifi_ap_set_proxy_address(wifi_ap_h ap, wifi_address_family_e address_family, const char* proxy_address) +EXPORT_API int wifi_ap_set_proxy_address(wifi_ap_h ap, wifi_address_family_e address_family, const char* proxy_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -530,7 +528,7 @@ int wifi_ap_set_proxy_address(wifi_ap_h ap, wifi_address_family_e address_family return _wifi_update_ap_info(profile_info); } -int wifi_ap_get_proxy_type(wifi_ap_h ap, wifi_proxy_type_e* type) +EXPORT_API int wifi_ap_get_proxy_type(wifi_ap_h ap, wifi_proxy_type_e* type) { if (_wifi_libnet_check_ap_validity(ap) == false || type == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -559,7 +557,7 @@ int wifi_ap_get_proxy_type(wifi_ap_h ap, wifi_proxy_type_e* type) return WIFI_ERROR_NONE; } -int wifi_ap_set_proxy_type(wifi_ap_h ap, wifi_proxy_type_e proxy_type) +EXPORT_API int wifi_ap_set_proxy_type(wifi_ap_h ap, wifi_proxy_type_e proxy_type) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -597,7 +595,7 @@ int wifi_ap_set_proxy_type(wifi_ap_h ap, wifi_proxy_type_e proxy_type) return rv; } -int wifi_ap_get_dns_address(wifi_ap_h ap, int order, wifi_address_family_e address_family, char** dns_address) +EXPORT_API int wifi_ap_get_dns_address(wifi_ap_h ap, int order, wifi_address_family_e address_family, char** dns_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -623,7 +621,7 @@ int wifi_ap_get_dns_address(wifi_ap_h ap, int order, wifi_address_family_e addre return WIFI_ERROR_NONE; } -int wifi_ap_set_dns_address(wifi_ap_h ap, int order, wifi_address_family_e address_family, const char* dns_address) +EXPORT_API int wifi_ap_set_dns_address(wifi_ap_h ap, int order, wifi_address_family_e address_family, const char* dns_address) { if (_wifi_libnet_check_ap_validity(ap) == false || (address_family != WIFI_ADDRESS_FAMILY_IPV4 && @@ -655,11 +653,8 @@ int wifi_ap_set_dns_address(wifi_ap_h ap, int order, wifi_address_family_e addre return _wifi_update_ap_info(profile_info); } - - -/* Wi-Fi security information module **************************************************************/ - -int wifi_ap_get_security_type(wifi_ap_h ap, wifi_security_type_e* type) +/* Wi-Fi security information ************************************************/ +EXPORT_API int wifi_ap_get_security_type(wifi_ap_h ap, wifi_security_type_e* type) { if (_wifi_libnet_check_ap_validity(ap) == false || type == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -691,7 +686,7 @@ int wifi_ap_get_security_type(wifi_ap_h ap, wifi_security_type_e* type) return WIFI_ERROR_NONE; } -int wifi_ap_set_security_type(wifi_ap_h ap, wifi_security_type_e type) +EXPORT_API int wifi_ap_set_security_type(wifi_ap_h ap, wifi_security_type_e type) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -723,7 +718,7 @@ int wifi_ap_set_security_type(wifi_ap_h ap, wifi_security_type_e type) return WIFI_ERROR_NONE; } -int wifi_ap_get_encryption_type(wifi_ap_h ap, wifi_encryption_type_e* type) +EXPORT_API int wifi_ap_get_encryption_type(wifi_ap_h ap, wifi_encryption_type_e* type) { if (_wifi_libnet_check_ap_validity(ap) == false || type == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -755,7 +750,7 @@ int wifi_ap_get_encryption_type(wifi_ap_h ap, wifi_encryption_type_e* type) return WIFI_ERROR_NONE; } -int wifi_ap_set_encryption_type(wifi_ap_h ap, wifi_encryption_type_e type) +EXPORT_API int wifi_ap_set_encryption_type(wifi_ap_h ap, wifi_encryption_type_e type) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -787,7 +782,7 @@ int wifi_ap_set_encryption_type(wifi_ap_h ap, wifi_encryption_type_e type) return WIFI_ERROR_NONE; } -int wifi_ap_is_passphrase_required(wifi_ap_h ap, bool* required) +EXPORT_API int wifi_ap_is_passphrase_required(wifi_ap_h ap, bool* required) { if (_wifi_libnet_check_ap_validity(ap) == false || required == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -818,7 +813,7 @@ int wifi_ap_is_passphrase_required(wifi_ap_h ap, bool* required) return WIFI_ERROR_NONE; } -int wifi_ap_set_passphrase(wifi_ap_h ap, const char* passphrase) +EXPORT_API int wifi_ap_set_passphrase(wifi_ap_h ap, const char* passphrase) { if (_wifi_libnet_check_ap_validity(ap) == false || passphrase == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -846,7 +841,7 @@ int wifi_ap_set_passphrase(wifi_ap_h ap, const char* passphrase) return WIFI_ERROR_NONE; } -int wifi_ap_is_wps_supported(wifi_ap_h ap, bool* supported) +EXPORT_API int wifi_ap_is_wps_supported(wifi_ap_h ap, bool* supported) { if (_wifi_libnet_check_ap_validity(ap) == false || supported == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -863,11 +858,8 @@ int wifi_ap_is_wps_supported(wifi_ap_h ap, bool* supported) return WIFI_ERROR_NONE; } - - -/* Wi-Fi EAP module *******************************************************************************/ - -int wifi_ap_set_eap_passphrase(wifi_ap_h ap, const char* user_name, const char* password) +/* Wi-Fi EAP *****************************************************************/ +EXPORT_API int wifi_ap_set_eap_passphrase(wifi_ap_h ap, const char* user_name, const char* password) { if (_wifi_libnet_check_ap_validity(ap) == false || (user_name == NULL && password == NULL)) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -889,7 +881,7 @@ int wifi_ap_set_eap_passphrase(wifi_ap_h ap, const char* user_name, const char* return WIFI_ERROR_NONE; } -int wifi_ap_get_eap_passphrase(wifi_ap_h ap, char** user_name, bool* is_password_set) +EXPORT_API int wifi_ap_get_eap_passphrase(wifi_ap_h ap, char** user_name, bool* is_password_set) { if (_wifi_libnet_check_ap_validity(ap) == false ||user_name == NULL || is_password_set == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -913,7 +905,7 @@ int wifi_ap_get_eap_passphrase(wifi_ap_h ap, char** user_name, bool* is_password return WIFI_ERROR_NONE; } -int wifi_ap_get_eap_ca_cert_file(wifi_ap_h ap, char** file) +EXPORT_API int wifi_ap_get_eap_ca_cert_file(wifi_ap_h ap, char** file) { if (_wifi_libnet_check_ap_validity(ap) == false || file == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -931,7 +923,7 @@ int wifi_ap_get_eap_ca_cert_file(wifi_ap_h ap, char** file) return WIFI_ERROR_NONE; } -int wifi_ap_set_eap_ca_cert_file(wifi_ap_h ap, const char* file) +EXPORT_API int wifi_ap_set_eap_ca_cert_file(wifi_ap_h ap, const char* file) { if (_wifi_libnet_check_ap_validity(ap) == false || file == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -948,7 +940,7 @@ int wifi_ap_set_eap_ca_cert_file(wifi_ap_h ap, const char* file) return WIFI_ERROR_NONE; } -int wifi_ap_get_eap_client_cert_file(wifi_ap_h ap, char** file) +EXPORT_API int wifi_ap_get_eap_client_cert_file(wifi_ap_h ap, char** file) { if (_wifi_libnet_check_ap_validity(ap) == false || file == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -966,7 +958,7 @@ int wifi_ap_get_eap_client_cert_file(wifi_ap_h ap, char** file) return WIFI_ERROR_NONE; } -int wifi_ap_set_eap_client_cert_file(wifi_ap_h ap, const char* file) +EXPORT_API int wifi_ap_set_eap_client_cert_file(wifi_ap_h ap, const char* file) { if (_wifi_libnet_check_ap_validity(ap) == false || file == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -983,7 +975,7 @@ int wifi_ap_set_eap_client_cert_file(wifi_ap_h ap, const char* file) return WIFI_ERROR_NONE; } -int wifi_ap_get_eap_private_key_file(wifi_ap_h ap, char** file) +EXPORT_API int wifi_ap_get_eap_private_key_file(wifi_ap_h ap, char** file) { if (_wifi_libnet_check_ap_validity(ap) == false || file == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -1001,7 +993,7 @@ int wifi_ap_get_eap_private_key_file(wifi_ap_h ap, char** file) return WIFI_ERROR_NONE; } -int wifi_ap_set_eap_private_key_info(wifi_ap_h ap, const char* file, const char* password) +EXPORT_API int wifi_ap_set_eap_private_key_info(wifi_ap_h ap, const char* file, const char* password) { if (_wifi_libnet_check_ap_validity(ap) == false || file == NULL || password == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -1020,7 +1012,7 @@ int wifi_ap_set_eap_private_key_info(wifi_ap_h ap, const char* file, const char* return WIFI_ERROR_NONE; } -int wifi_ap_get_eap_type(wifi_ap_h ap, wifi_eap_type_e* type) +EXPORT_API int wifi_ap_get_eap_type(wifi_ap_h ap, wifi_eap_type_e* type) { if (_wifi_libnet_check_ap_validity(ap) == false || type == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -1054,7 +1046,7 @@ int wifi_ap_get_eap_type(wifi_ap_h ap, wifi_eap_type_e* type) return WIFI_ERROR_NONE; } -int wifi_ap_set_eap_type(wifi_ap_h ap, wifi_eap_type_e type) +EXPORT_API int wifi_ap_set_eap_type(wifi_ap_h ap, wifi_eap_type_e type) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -1088,7 +1080,7 @@ int wifi_ap_set_eap_type(wifi_ap_h ap, wifi_eap_type_e type) return WIFI_ERROR_NONE; } -int wifi_ap_get_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e* type) +EXPORT_API int wifi_ap_get_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e* type) { if (_wifi_libnet_check_ap_validity(ap) == false || type == NULL) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -1125,7 +1117,7 @@ int wifi_ap_get_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e* type) return WIFI_ERROR_NONE; } -int wifi_ap_set_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e type) +EXPORT_API int wifi_ap_set_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e type) { if (_wifi_libnet_check_ap_validity(ap) == false) { WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n"); @@ -1161,5 +1153,3 @@ int wifi_ap_set_eap_auth_type(wifi_ap_h ap, wifi_eap_auth_type_e type) return WIFI_ERROR_NONE; } - - -- cgit v1.2.3