From: Seonah Moon Date: Wed, 25 Apr 2018 10:37:45 +0000 (+0900) Subject: Check wifi.softap feature instead of wifi feature X-Git-Tag: submit/tizen/20180503.053636^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F177108%2F2;p=platform%2Fcore%2Fapi%2Fsoftap.git Check wifi.softap feature instead of wifi feature Change-Id: I7a1e0a2338121e12f15ffc482f77fe3630be8da4 --- diff --git a/include/softap_private.h b/include/softap_private.h index 20adfcf..16a0502 100644 --- a/include/softap_private.h +++ b/include/softap_private.h @@ -74,7 +74,7 @@ extern "C" { } \ } while (0) -#define WIFI_FEATURE "http://tizen.org/feature/network.wifi" +#define SOFTAP_FEATURE "http://tizen.org/feature/network.wifi.softap" #define CHECK_FEATURE_SUPPORTED(key) \ do { \ diff --git a/packaging/capi-network-softap.spec b/packaging/capi-network-softap.spec index 931524b..8ef87f7 100644 --- a/packaging/capi-network-softap.spec +++ b/packaging/capi-network-softap.spec @@ -1,6 +1,6 @@ Name: capi-network-softap Summary: Softap Framework -Version: 0.0.20 +Version: 0.0.21 Release: 1 Group: System/Network License: Apache-2.0 diff --git a/src/softap.c b/src/softap.c index 009f52d..b2b2e49 100755 --- a/src/softap.c +++ b/src/softap.c @@ -777,7 +777,7 @@ static bool __get_ssid_from_vconf(const char *path, char *ssid, unsigned int siz API int softap_create(softap_h *softap) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -869,7 +869,7 @@ API int softap_create(softap_h *softap) API int softap_destroy(softap_h softap) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -898,7 +898,7 @@ API int softap_destroy(softap_h softap) API int softap_enable(softap_h softap) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL"); @@ -927,7 +927,7 @@ API int softap_enable(softap_h softap) API int softap_disable(softap_h softap) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL"); @@ -947,7 +947,7 @@ API int softap_disable(softap_h softap) API int softap_reload_settings(softap_h softap, softap_settings_reloaded_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -983,7 +983,7 @@ API int softap_reload_settings(softap_h softap, softap_settings_reloaded_cb call API int softap_is_enabled(softap_h softap, bool *enable) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL"); _retvm_if(enable == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1006,7 +1006,7 @@ API int softap_is_enabled(softap_h softap, bool *enable) API int softap_get_mac_address(softap_h softap, char **mac_address) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(mac_address == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1055,7 +1055,7 @@ API int softap_get_mac_address(softap_h softap, char **mac_address) API int softap_get_network_interface_name(softap_h softap, char **interface_name) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(interface_name == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1079,7 +1079,7 @@ API int softap_get_network_interface_name(softap_h softap, char **interface_name API int softap_set_ip_address(softap_h softap, softap_address_family_e address_family, const char *ip_address) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(ip_address == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1108,7 +1108,7 @@ API int softap_set_ip_address(softap_h softap, softap_address_family_e address_f API int softap_get_ip_address(softap_h softap, softap_address_family_e address_family, char **ip_address) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(ip_address == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1148,7 +1148,7 @@ API int softap_get_ip_address(softap_h softap, softap_address_family_e address_f API int softap_get_gateway_address(softap_h softap, softap_address_family_e address_family, char **gateway_address) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(gateway_address == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1170,7 +1170,7 @@ API int softap_get_gateway_address(softap_h softap, softap_address_family_e addr API int softap_get_subnet_mask(softap_h softap, softap_address_family_e address_family, char **subnet_mask) { DBG("+"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(subnet_mask == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1192,7 +1192,7 @@ API int softap_get_subnet_mask(softap_h softap, softap_address_family_e address_ API int softap_foreach_connected_clients(softap_h softap, softap_connected_client_cb callback, void *user_data) { DBG("+\n"); - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1283,7 +1283,7 @@ API int softap_foreach_connected_clients(softap_h softap, softap_connected_clien API int softap_set_enabled_cb(softap_h softap, softap_enabled_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1299,7 +1299,7 @@ API int softap_set_enabled_cb(softap_h softap, softap_enabled_cb callback, void API int softap_unset_enabled_cb(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1313,7 +1313,7 @@ API int softap_unset_enabled_cb(softap_h softap) API int softap_set_disabled_cb(softap_h softap, softap_disabled_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1329,7 +1329,7 @@ API int softap_set_disabled_cb(softap_h softap, softap_disabled_cb callback, voi API int softap_unset_disabled_cb(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1343,7 +1343,7 @@ API int softap_unset_disabled_cb(softap_h softap) API int softap_set_client_connection_state_changed_cb(softap_h softap, softap_client_connection_state_changed_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1359,7 +1359,7 @@ API int softap_set_client_connection_state_changed_cb(softap_h softap, softap_cl API int softap_unset_client_connection_state_changed_cb(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1374,7 +1374,7 @@ API int softap_unset_client_connection_state_changed_cb(softap_h softap) API int softap_set_security_type_changed_cb(softap_h softap, softap_security_type_changed_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1390,7 +1390,7 @@ API int softap_set_security_type_changed_cb(softap_h softap, softap_security_typ API int softap_unset_security_type_changed_cb(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1404,7 +1404,7 @@ API int softap_unset_security_type_changed_cb(softap_h softap) API int softap_set_ssid_visibility_changed_cb(softap_h softap, softap_ssid_visibility_changed_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1420,7 +1420,7 @@ API int softap_set_ssid_visibility_changed_cb(softap_h softap, softap_ssid_visib API int softap_unset_ssid_visibility_changed_cb(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1434,7 +1434,7 @@ API int softap_unset_ssid_visibility_changed_cb(softap_h softap) API int softap_set_passphrase_changed_cb(softap_h softap, softap_passphrase_changed_cb callback, void *user_data) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(callback == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1450,7 +1450,7 @@ API int softap_set_passphrase_changed_cb(softap_h softap, softap_passphrase_chan API int softap_unset_passphrase_changed_cb(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1464,7 +1464,7 @@ API int softap_unset_passphrase_changed_cb(softap_h softap) API int softap_set_security_type(softap_h softap, softap_security_type_e type) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1497,7 +1497,7 @@ API int softap_set_security_type(softap_h softap, softap_security_type_e type) API int softap_get_security_type(softap_h softap, softap_security_type_e *type) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(type == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1508,7 +1508,7 @@ API int softap_get_security_type(softap_h softap, softap_security_type_e *type) API int softap_set_ssid(softap_h softap, const char *ssid) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(ssid == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1539,7 +1539,7 @@ API int softap_set_ssid(softap_h softap, const char *ssid) API int softap_get_ssid(softap_h softap, char **ssid) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(ssid == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1582,7 +1582,7 @@ API int softap_get_ssid(softap_h softap, char **ssid) API int softap_set_ssid_visibility(softap_h softap, bool visible) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1603,7 +1603,7 @@ API int softap_set_ssid_visibility(softap_h softap, bool visible) API int softap_get_ssid_visibility(softap_h softap, bool *visible) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(visible == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1614,7 +1614,7 @@ API int softap_get_ssid_visibility(softap_h softap, bool *visible) API int softap_set_passphrase(softap_h softap, const char *passphrase) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(passphrase == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1639,7 +1639,7 @@ API int softap_set_passphrase(softap_h softap, const char *passphrase) API int softap_get_passphrase(softap_h softap, char **passphrase) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(passphrase == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1660,7 +1660,7 @@ API int softap_get_passphrase(softap_h softap, char **passphrase) API int softap_push_wps_button(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); DBG("+"); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1668,6 +1668,7 @@ API int softap_push_wps_button(softap_h softap) __softap_h *sa = (__softap_h *)softap; GDBusProxy *proxy = sa->client_bus_proxy; GVariant *parameters = NULL; + guint info; int ret = 0; GError *error = NULL; @@ -1687,25 +1688,30 @@ API int softap_push_wps_button(softap_h softap) } if (parameters != NULL) { - g_variant_get(parameters, "(u)", &ret); + g_variant_get(parameters, "(u)", &info); g_variant_unref(parameters); + ret = __get_error(info); } DBG("-"); - return SOFTAP_ERROR_NONE; + return ret; } API int softap_set_wps_pin(softap_h softap, const char *wps_pin) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); DBG("+"); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL"); + _retvm_if(wps_pin == NULL, SOFTAP_ERROR_INVALID_PARAMETER, + "parameter(wps_pin) is NULL"); + __softap_h *sa = (__softap_h *)softap; GDBusProxy *proxy = sa->client_bus_proxy; GVariant *parameters = NULL; + guint info; int ret = 0; GError *error = NULL; @@ -1725,18 +1731,19 @@ API int softap_set_wps_pin(softap_h softap, const char *wps_pin) } if (parameters != NULL) { - g_variant_get(parameters, "(u)", &ret); + g_variant_get(parameters, "(u)", &info); g_variant_unref(parameters); + ret = __get_error(info); } DBG("-"); - return SOFTAP_ERROR_NONE; + return ret; } API int softap_get_vendor_element(softap_h softap, char **vendor_element) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(vendor_element == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1761,7 +1768,7 @@ API int softap_get_vendor_element(softap_h softap, char **vendor_element) API int softap_set_vendor_element(softap_h softap, const char *vendor_element) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(vendor_element == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1783,7 +1790,7 @@ API int softap_set_vendor_element(softap_h softap, const char *vendor_element) API int softap_set_channel(softap_h softap, int channel) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1796,7 +1803,7 @@ API int softap_set_channel(softap_h softap, int channel) API int softap_get_channel(softap_h softap, int *channel) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(channel == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1807,7 +1814,7 @@ API int softap_get_channel(softap_h softap, int *channel) API int softap_set_mode(softap_h softap, softap_wireless_mode_e mode) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1819,9 +1826,12 @@ API int softap_set_mode(softap_h softap, softap_wireless_mode_e mode) API int softap_get_mode(softap_h softap, softap_wireless_mode_e *mode) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); + _retvm_if(mode == NULL, SOFTAP_ERROR_INVALID_PARAMETER, + "parameter(mode) is NULL\n"); + __softap_h *sa = (__softap_h *)softap; *mode = sa->mode; @@ -1831,7 +1841,7 @@ API int softap_get_mode(softap_h softap, softap_wireless_mode_e *mode) API int softap_enable_dhcp(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1867,7 +1877,7 @@ API int softap_enable_dhcp(softap_h softap) API int softap_disable_dhcp(softap_h softap) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); @@ -1901,7 +1911,7 @@ API int softap_disable_dhcp(softap_h softap) API int softap_is_dhcp_enabled(softap_h softap, bool *dhcp_enabled) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); _retvm_if(dhcp_enabled == NULL, SOFTAP_ERROR_INVALID_PARAMETER, @@ -1939,7 +1949,7 @@ API int softap_is_dhcp_enabled(softap_h softap, bool *dhcp_enabled) API int softap_enable_dhcp_with_range(softap_h softap, char *rangestart, char *rangestop) { - CHECK_FEATURE_SUPPORTED(WIFI_FEATURE); + CHECK_FEATURE_SUPPORTED(SOFTAP_FEATURE); _retvm_if(softap == NULL, SOFTAP_ERROR_INVALID_PARAMETER, "parameter(softap) is NULL\n"); diff --git a/src/softap_private.c b/src/softap_private.c index 4489255..2c9d02c 100755 --- a/src/softap_private.c +++ b/src/softap_private.c @@ -20,7 +20,6 @@ #include #include "softap_private.h" -#define WIFI_FEATURE "http://tizen.org/feature/network.wifi" static __thread bool is_feature_checked = 0; static __thread bool feature_supported = 0; static __thread GSList *softap_handle_list = NULL;