ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
ADD_DEFINITIONS("-DTIZEN_DEBUG")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
aux_source_directory(src SOURCES)
ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
CLEAN_DIRECT_OUTPUT 1
)
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION include/network
FILES_MATCHING
${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
@ONLY
)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
ADD_SUBDIRECTORY(test)
+capi-network-wifi (0.1.2-15) unstable; urgency=low
+
+ * Added specific(hidden) scan support
+ * Git: framework/api/wifi
+ * Tag: capi-network-wifi_0.1.2-15
+
+ -- JaeHyun Kim <jeik01.kim@samsung.com> Tue, 26 Feb 2013 11:19:52 +0900
+
capi-network-wifi (0.1.2-14) unstable; urgency=low
* Fix memory corruption
bool _wifi_libnet_get_wifi_state(wifi_connection_state_e* connection_state);
int _wifi_libnet_get_intf_name(char** name);
int _wifi_libnet_scan_request(wifi_scan_finished_cb callback, void* user_data);
+int _wifi_libnet_scan_hidden_ap(const char *essid,
+ wifi_scan_finished_cb callback, void* user_data);
int _wifi_libnet_get_connected_profile(wifi_ap_h *ap);
bool _wifi_libnet_foreach_found_aps(wifi_found_ap_cb callback, void *user_data);
+bool _wifi_libnet_foreach_found_hidden_aps(wifi_found_ap_cb callback, void *user_data);
int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void* user_data);
int _wifi_libnet_close_profile(wifi_ap_h ap_h, wifi_disconnected_cb callback, void* user_data);
* @param[in] ap The access point
* @param[in] user_data The user data passed from the request function
* @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop
-* @pre wifi_foreach_found_aps() will invoke this callback.
+* @pre wifi_foreach_found_aps() and wifi_foreach_found_hidden_aps() will invoke this callback.
* @see wifi_foreach_found_aps()
+* @see wifi_foreach_found_hidden_aps()
*/
typedef bool(*wifi_found_ap_cb)(wifi_ap_h ap, void* user_data);
* @param[in] error_code The error code
* @param[in] user_data The user data passed from the callback registration function
* @see wifi_scan()
+* @see wifi_scan_hidden_ap()
* @see wifi_set_background_scan_cb()
* @see wifi_unset_background_scan_cb()
*/
int wifi_scan(wifi_scan_finished_cb callback, void* user_data);
/**
+* @brief Starts hidden ap scan, asynchronously.
+* @param[in] essid The essid of hidden ap
+* @param[in] callback The callback function to be called
+* @param[in] user_data The user data passed to the callback function
+* @return 0 on success, otherwise negative error value.
+* @retval #WIFI_ERROR_NONE Successful
+* @retval #WIFI_ERROR_INVALID_PARAMETER Invalid parameter
+* @retval #WIFI_ERROR_INVALID_OPERATION Invalid operation
+* @retval #WIFI_ERROR_OPERATION_FAILED Operation failed
+* @post This function invokes wifi_scan_finished_cb().
+*/
+int wifi_scan_hidden_ap(const char* essid, wifi_scan_finished_cb callback, void* user_data);
+
+/**
* @brief Gets the handle of connected access point.
* @remarks @a handle must be released with wifi_ap_destroy().
* @param[out] ap The handle of access point
int wifi_foreach_found_aps(wifi_found_ap_cb callback, void* user_data);
/**
+* @brief Gets the result of hidden ap scan.
+* @param[in] callback The callback to be called
+* @param[in] user_data The user data passed to the callback function
+* @return 0 on success, otherwise negative error value.
+* @retval #WIFI_ERROR_NONE Successful
+* @retval #WIFI_ERROR_INVALID_PARAMETER Invalid parameter
+* @retval #WIFI_ERROR_OPERATION_FAILED Operation failed
+* @post This function invokes wifi_found_ap_cb().
+*/
+int wifi_foreach_found_hidden_aps(wifi_found_ap_cb callback, void* user_data);
+
+/**
* @brief Connects the access point, asynchronously.
* @param[in] ap The handle of access point
* @param[in] callback The callback function to be called. This can be NULL if you don't want to get the notification.
Name: capi-network-wifi
Summary: Network Wi-Fi library in TIZEN C API
-Version: 0.1.2_14
+Version: 0.1.2_15
Release: 1
Group: System/Network
-License: Apache License Version 2.0
+License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: pkgconfig(dlog)
BuildRequires: pkgconfig(vconf)
BuildRequires: pkgconfig(capi-base-common)
BuildRequires: pkgconfig(network)
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description
Network Wi-Fi library in Tizen C API
%build
MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
make %{?_smp_mflags}
void *bg_scan_user_data;
wifi_scan_finished_cb scan_request_cb;
void *scan_request_user_data;
+ wifi_scan_finished_cb scan_hidden_ap_cb;
+ void *scan_hidden_ap_user_data;
wifi_connection_state_changed_cb connection_state_cb;
void *connection_state_user_data;
wifi_activated_cb activated_cb;
static struct _wifi_cb_s wifi_callbacks = {0,};
static struct _profile_list_s profile_iterator = {0, NULL};
+static struct _profile_list_s hidden_profile_iterator = {0, NULL};
static wifi_error_e __libnet_convert_to_ap_error_type(net_err_t err_type)
profile_iterator.profiles = wifi_profiles.profiles;
}
+static void __libnet_update_hidden_profile_iterator(GSList *ap_list)
+{
+ int count;
+ GSList *list = ap_list;
+
+ for (count = 0; list; list = list->next)
+ count++;
+
+ if (count == 0) {
+ WIFI_LOG(WIFI_INFO, "No hidden AP found\n");
+ return;
+ }
+
+ hidden_profile_iterator.count = count;
+ hidden_profile_iterator.profiles = g_try_new0(net_profile_info_t, count);
+
+ list = ap_list;
+ for (count = 0; list; list = list->next) {
+ net_wifi_connection_info_t *ap = list->data;
+ net_profile_info_t *profile = &hidden_profile_iterator.profiles[count];
+
+ g_strlcpy(profile->ProfileInfo.Wlan.essid, ap->essid, NET_WLAN_ESSID_LEN+1);
+ profile->ProfileInfo.Wlan.security_info.sec_mode = ap->security_info.sec_mode;
+ count++;
+ }
+
+ WIFI_LOG(WIFI_INFO, "Hidden AP count : %d\n", count);
+}
+
static void __libnet_convert_profile_info_to_wifi_info(net_wifi_connection_info_t *wifi_info,
net_profile_info_t *ap_info)
{
WIFI_LOG(WIFI_INFO, "Wi-Fi State : Power OFF\n");
state = WIFI_DEVICE_STATE_DEACTIVATED;
__libnet_clear_profile_list(&profile_iterator);
+ __libnet_clear_profile_list(&hidden_profile_iterator);
} else {
WIFI_LOG(WIFI_INFO, "Wi-Fi State : Unknown\n");
error_code = WIFI_ERROR_OPERATION_FAILED;
wifi_callbacks.device_state_cb(state, wifi_callbacks.device_state_user_data);
}
-static void __libnet_scan_cb(net_event_info_t *event_cb, bool is_requested)
+static void __libnet_scan_cb(net_event_info_t *event_cb)
{
wifi_error_e error_code = WIFI_ERROR_NONE;
wifi_callbacks.bg_scan_cb(error_code, wifi_callbacks.bg_scan_user_data);
}
+static void __libnet_hidden_scan_cb(net_event_info_t *event_cb)
+{
+ wifi_error_e error_code = WIFI_ERROR_NONE;
+
+ __libnet_clear_profile_list(&hidden_profile_iterator);
+
+ if (event_cb->Error != NET_ERR_NONE) {
+ WIFI_LOG(WIFI_ERROR, "Hidden scan failed!, Error [%d]\n", event_cb->Error);
+ error_code = WIFI_ERROR_OPERATION_FAILED;
+ } else if (event_cb->Data) {
+ GSList *ap_list = event_cb->Data;
+ __libnet_update_hidden_profile_iterator(ap_list);
+ }
+
+ if (wifi_callbacks.scan_hidden_ap_cb) {
+ wifi_callbacks.scan_hidden_ap_cb(error_code, wifi_callbacks.scan_hidden_ap_user_data);
+ wifi_callbacks.scan_hidden_ap_cb = NULL;
+ wifi_callbacks.scan_hidden_ap_user_data = NULL;
+ }
+}
+
static void __libnet_set_connected_cb(wifi_connected_cb user_cb, void *user_data)
{
if (user_cb) {
break;
case NET_EVENT_WIFI_SCAN_RSP:
case NET_EVENT_WIFI_SCAN_IND:
- WIFI_LOG(WIFI_ERROR, "Got wifi scan IND\n");
- __libnet_scan_cb(event_cb, is_requested);
+ WIFI_LOG(WIFI_INFO, "Got wifi scan IND\n");
+ __libnet_scan_cb(event_cb);
+ break;
+ case NET_EVENT_SPECIFIC_SCAN_RSP:
+ WIFI_LOG(WIFI_INFO, "Got wifi hidden scan RSP\n");
+ break;
+ case NET_EVENT_SPECIFIC_SCAN_IND:
+ WIFI_LOG(WIFI_INFO, "Got wifi hidden scan IND\n");
+ __libnet_hidden_scan_cb(event_cb);
break;
case NET_EVENT_WIFI_POWER_RSP:
is_requested = true;
/* fall through */
case NET_EVENT_WIFI_POWER_IND:
- WIFI_LOG(WIFI_ERROR, "Got wifi power IND\n");
+ WIFI_LOG(WIFI_INFO, "Got wifi power IND\n");
__libnet_power_on_off_cb(event_cb, is_requested);
break;
default :
- WIFI_LOG(WIFI_ERROR, "Error! Unknown Event\n\n");
+ WIFI_LOG(WIFI_INFO, "Error! Unknown Event\n\n");
}
}
return false;
__libnet_clear_profile_list(&profile_iterator);
+ __libnet_clear_profile_list(&hidden_profile_iterator);
g_slist_free_full(ap_handle_list, g_free);
ap_handle_list = NULL;
memset(&wifi_callbacks, 0, sizeof(struct _wifi_cb_s));
for (list = ap_handle_list; list; list = list->next)
if (ap_h == list->data) return true;
- for (;i < profile_iterator.count;i++)
+ for (; i < profile_iterator.count; i++)
if (ap_h == &profile_iterator.profiles[i]) return true;
+ for (i = 0; i < hidden_profile_iterator.count; i++)
+ if (ap_h == &hidden_profile_iterator.profiles[i]) return true;
+
return false;
}
return WIFI_ERROR_OPERATION_FAILED;
}
+int _wifi_libnet_scan_hidden_ap(const char *essid,
+ wifi_scan_finished_cb callback, void* user_data)
+{
+ int rv;
+ rv = net_specific_scan_wifi(essid);
+
+ if (rv == NET_ERR_NONE) {
+ wifi_callbacks.scan_hidden_ap_cb = callback;
+ wifi_callbacks.scan_hidden_ap_user_data = user_data;
+ return WIFI_ERROR_NONE;
+ } else if (rv == NET_ERR_INVALID_OPERATION)
+ return WIFI_ERROR_INVALID_OPERATION;
+
+ return WIFI_ERROR_OPERATION_FAILED;
+}
+
int _wifi_libnet_get_connected_profile(wifi_ap_h *ap)
{
int i = 0;
return true;
}
+bool _wifi_libnet_foreach_found_hidden_aps(wifi_found_ap_cb callback, void *user_data)
+{
+ int i = 0;
+ bool rv = true;
+
+ if (hidden_profile_iterator.count == 0) {
+ WIFI_LOG(WIFI_INFO, "There is no hidden APs.\n");
+ return true;
+ }
+
+ for (;i < hidden_profile_iterator.count;i++) {
+ rv = callback((wifi_ap_h)(&hidden_profile_iterator.profiles[i]), user_data);
+ if (rv == false) break;
+ }
+
+ return true;
+}
+
int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void* user_data)
{
net_profile_info_t *ap_info = ap_h;
return rv;
}
+int wifi_scan_hidden_ap(const char* essid, wifi_scan_finished_cb callback, void* user_data)
+{
+ int rv;
+
+ if (callback == NULL) {
+ WIFI_LOG(WIFI_ERROR, "Wrong Parameter Passed\n");
+ return WIFI_ERROR_INVALID_PARAMETER;
+ }
+
+ if (is_init == false) {
+ WIFI_LOG(WIFI_ERROR, "Not initialized\n");
+ return WIFI_ERROR_INVALID_OPERATION;
+ }
+
+ rv = _wifi_libnet_scan_hidden_ap(essid, callback, user_data);
+ if (rv != WIFI_ERROR_NONE)
+ WIFI_LOG(WIFI_ERROR, "Error!! Wi-Fi hidden scan failed.\n");
+
+ return rv;
+}
+
int wifi_get_connected_ap(wifi_ap_h* ap)
{
int rv;
return WIFI_ERROR_NONE;
}
+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");
+ return WIFI_ERROR_INVALID_PARAMETER;
+ }
+
+ if (_wifi_libnet_foreach_found_hidden_aps(callback, user_data) == false)
+ return WIFI_ERROR_OPERATION_FAILED;
+
+ return WIFI_ERROR_NONE;
+}
+
int wifi_connect(wifi_ap_h ap, wifi_connected_cb callback, void* user_data)
{
if (_wifi_libnet_check_ap_validity(ap) == false) {
__test_convert_error_to_string(error_code));
}
+static bool __test_found_hidden_aps_callback(wifi_ap_h ap, void *user_data)
+{
+ int rv;
+ char *ap_name;
+ wifi_security_type_e sec_type;
+
+ rv = wifi_ap_get_essid(ap, &ap_name);
+ if (rv != WIFI_ERROR_NONE) {
+ printf("Fail to get AP name [%s]\n", __test_convert_error_to_string(rv));
+ return false;
+ }
+
+ printf("AP name : %s\n", ap_name);
+
+ if (wifi_ap_get_security_type(ap, &sec_type) == WIFI_ERROR_NONE)
+ printf("Security type : %d\n", sec_type);
+ else
+ printf("Fail to get Security type\n");
+
+ g_free(ap_name);
+ return true;
+}
+
+static void __test_scan_hidden_ap_callback(wifi_error_e error_code, void* user_data)
+{
+ int rv;
+
+ printf("Hidden scan Completed from scan request, error code : %s\n",
+ __test_convert_error_to_string(error_code));
+
+ if (error_code != WIFI_ERROR_NONE)
+ return;
+
+ rv = wifi_foreach_found_hidden_aps(__test_found_hidden_aps_callback, NULL);
+ if (rv != WIFI_ERROR_NONE) {
+ printf("Fail to get hidden AP(can't get AP list) [%s]\n", __test_convert_error_to_string(rv));
+ return;
+ }
+}
+
static void __test_connection_state_callback(wifi_connection_state_e state, wifi_ap_h ap, void* user_data)
{
int rv = 0;
return 1;
}
+int test_scan_hidden_ap(void)
+{
+ int rv;
+ char ap_name[33];
+
+ printf("Input a part of hidden AP name to find : ");
+ rv = scanf("%32s", ap_name);
+ if (rv <= 0)
+ return -1;
+
+ rv = wifi_scan_hidden_ap(ap_name, __test_scan_hidden_ap_callback, NULL);
+
+ if (rv != WIFI_ERROR_NONE) {
+ printf("Scan request failed [%s]\n", __test_convert_error_to_string(rv));
+ return -1;
+ }
+
+ printf("Scan hidden AP succeeded\n");
+ return 1;
+}
+
int main(int argc, char **argv)
{
GMainLoop *mainloop;
printf("g - Set & connect EAP\n");
printf("h - Set IP method type\n");
printf("i - Set Proxy method type\n");
- printf("j - Get Ap info\n");
+ printf("j - Get AP info\n");
+ printf("k - Scan hidden AP\n");
printf("0 - Exit \n");
printf("ENTER - Show options menu.......\n");
case 'j':
rv = test_get_ap_info();
break;
+ case 'k':
+ rv = test_scan_hidden_ap();
+ break;
default:
break;
}
projects / platform / core / api / wifi.git / commitdiff