projects / platform / core / api / tethering.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[Tizen 3.0 Product] Enable debug logs
[platform/core/api/tethering.git] / src / tethering.c
diff --git a/src/tethering.c b/src/tethering.c
index d47c572..9d55e54 100755 (executable)
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -755,7 +755,7 @@ static void __handle_passphrase_changed(GDBusConnection *connection, const gchar
 static void __wifi_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                gpointer user_data)
 {
-       DBG("+\n");
+       INFO("+\n");
 
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        GError *g_error = NULL;
@@ -787,18 +787,20 @@ static void __wifi_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        }
        retry = 0;
 
+       INFO("cfm event : wifi tethering enable info : %d\n", error);
+
        sigs[E_SIGNAL_WIFI_TETHER_ON].sig_id = g_dbus_connection_signal_subscribe(th->client_bus,
                        NULL, TETHERING_SERVICE_INTERFACE, sigs[E_SIGNAL_WIFI_TETHER_ON].name,
                        TETHERING_SERVICE_OBJECT_PATH, NULL, G_DBUS_SIGNAL_FLAGS_NONE,
                        sigs[E_SIGNAL_WIFI_TETHER_ON].cb, (gpointer)th, NULL);
 
        if (!ecb) {
-               DBG("-\n");
+               INFO("-\n");
                return;
        }
        ecb(error, TETHERING_TYPE_WIFI, true, data);
        g_variant_unref(g_var);
-       DBG("-\n");
+       INFO("-\n");
 }
 
 static void __bt_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
@@ -908,7 +910,7 @@ static void __usb_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
 static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                gpointer user_data)
 {
-       DBG("+\n");
+       INFO("+\n");
 
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        GError *g_error = NULL;
@@ -931,10 +933,10 @@ static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                //LCOV_EXCL_STOP
        }
        g_variant_get(g_var, "(uu)", &event_type, &info);
-       DBG("cfm event : %d info : %d\n", event_type, info);
+       INFO("cfm event : %d info : %d\n", event_type, info);
        g_variant_unref(g_var);
        error = __get_error(info);
-       DBG("cfm event : %d info : %d\n", event_type, error);
+       INFO("cfm event : %d info : %d\n", event_type, error);
        switch (event_type) {
        case MOBILE_AP_DISABLE_WIFI_TETHERING_CFM:
                sigs[E_SIGNAL_WIFI_TETHER_OFF].sig_id = g_dbus_connection_signal_subscribe(th->client_bus,
@@ -1006,7 +1008,7 @@ static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                ERR("Invalid event\n");
                break;
        }
-       DBG("-\n");
+       INFO("-\n");
 }
 
 static void __get_data_usage_cb(GObject *source_object, GAsyncResult *res,
@@ -1227,7 +1229,7 @@ static bool __get_wifi_mode_type(tethering_wifi_mode_type_e type, char **buf)
 
 static int __prepare_wifi_settings(tethering_h tethering, _softap_settings_t *set)
 {
-       DBG("+\n");
+       INFO("+\n");
 
        __tethering_h *th = (__tethering_h *)tethering;
        tethering_error_e ret = TETHERING_ERROR_NONE;
@@ -1296,7 +1298,11 @@ static int __prepare_wifi_settings(tethering_h tethering, _softap_settings_t *se
 
                g_strlcpy(set->key, passphrase, sizeof(set->key));
        }
-       DBG("-\n");
+
+       INFO("ssid: %s security: %d mode: %s channel: %d visibility: %s\n",
+                set->ssid, set->sec_type, set->mode, set->channel,
+                (set->visibility)?"true":"false");
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1309,7 +1315,7 @@ static bool __check_precondition(tethering_type_e type)
        /* data network through cellular */
        vconf_get_int(VCONFKEY_NETWORK_CELLULAR_STATE, &cellular_state);
        if (cellular_state == VCONFKEY_NETWORK_CELLULAR_ON) {
-               ERR("Data Network can be connected later");
+               INFO("Data Network can be connected later");
                return TRUE;
        }
 
@@ -1317,13 +1323,13 @@ static bool __check_precondition(tethering_type_e type)
        /* data network through ethernet */
        vconf_get_int(VCONFKEY_NETWORK_STATUS, &dnet_state);
        if (dnet_state == VCONFKEY_NETWORK_ETHERNET) {
-               ERR("Data Network is connected");
+               INFO("Data Network is connected");
                return TRUE;
        }
 #else
        vconf_get_int(VCONFKEY_DNET_STATE, &dnet_state);
        if (dnet_state > VCONFKEY_DNET_OFF) {
-               ERR("Data Network is connected");
+               INFO("Data Network is connected");
                return TRUE;
        }
 #endif/*TIZEN_TV_EXT*/
@@ -1332,7 +1338,7 @@ static bool __check_precondition(tethering_type_e type)
        if (type != TETHERING_TYPE_WIFI) {
                vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
                if (wifi_state > VCONFKEY_WIFI_UNCONNECTED) {
-                       ERR("Wi-Fi is connected!");
+                       INFO("Wi-Fi is connected!");
                        return TRUE;
                }
        }
@@ -1361,7 +1367,7 @@ API int tethering_create(tethering_h *tethering)
        CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
-       DBG("+\n");
+       INFO("+\n");
 
        __tethering_h *th = NULL;
        GError *error = NULL;
@@ -1428,8 +1434,8 @@ API int tethering_create(tethering_h *tethering)
        __connect_signals((tethering_h)th);
 
        *tethering = (tethering_h)th;
-       DBG("Tethering Handle : 0x%X\n", th);
-       DBG("-\n");
+       INFO("Tethering Handle : 0x%X\n", th);
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1447,7 +1453,7 @@ API int tethering_create(tethering_h *tethering)
  */
 API int tethering_destroy(tethering_h tethering)
 {
-       DBG("+\n");
+       INFO("+\n");
        CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -1455,7 +1461,7 @@ API int tethering_destroy(tethering_h tethering)
        GVariant *result = NULL;
        __tethering_h *th = (__tethering_h *)tethering;
 
-       DBG("Tethering Handle : 0x%X\n", th);
+       INFO("Tethering Handle : 0x%X\n", th);
 
        if (th->change_mac) {
                result = g_dbus_proxy_call_sync(th->client_bus_proxy, "reset_mac", NULL,
@@ -1474,7 +1480,7 @@ API int tethering_destroy(tethering_h tethering)
        memset(th, 0x00, sizeof(__tethering_h));
        free(th);
 
-       DBG("-\n");
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1495,7 +1501,7 @@ API int tethering_destroy(tethering_h tethering)
  */
 API int tethering_enable(tethering_h tethering, tethering_type_e type)
 {
-       DBG("+ type :  %d\n", type);
+       INFO("+ type :  %d\n", type);
        CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
        if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
        else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
@@ -1513,7 +1519,7 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
 
        if (__check_precondition(type) == FALSE) {
                //LCOV_EXCL_START
-               DBG("-\n");
+               INFO("-\n");
                return TETHERING_ERROR_OPERATION_FAILED;
                //LCOV_EXCL_STOP
        }
@@ -1606,7 +1612,7 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
        }
 
        g_dbus_proxy_set_default_timeout(proxy, DBUS_TIMEOUT_USE_DEFAULT);
-       DBG("-\n");
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1627,10 +1633,11 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
  */
 API int tethering_disable(tethering_h tethering, tethering_type_e type)
 {
-       DBG("+ type :  %d\n", type);
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       INFO("+ type :  %d\n", type);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -1698,7 +1705,7 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                DBG("-\n");
                return TETHERING_ERROR_INVALID_PARAMETER;
        }
-       DBG("-\n");
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1714,6 +1721,7 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
  */
 API bool tethering_is_enabled(tethering_h tethering, tethering_type_e type)
 {
+       INFO("+ type :  %d\n", type);
        int is_on = 0;
        int vconf_type = VCONFKEY_MOBILE_HOTSPOT_MODE_NONE;
 
@@ -1739,6 +1747,7 @@ API bool tethering_is_enabled(tethering_h tethering, tethering_type_e type)
                ERR("Not supported type : %d\n", type);
                break;
        }
+       INFO("- enabled:  %s\n",(is_on & vconf_type)? "true" : "false");
        return is_on & vconf_type ? true : false;
 }
 
@@ -1764,9 +1773,10 @@ API bool tethering_is_enabled(tethering_h tethering, tethering_type_e type)
  */
 API int tethering_get_mac_address(tethering_h tethering, tethering_type_e type, char **mac_address)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -1832,9 +1842,10 @@ API int tethering_get_mac_address(tethering_h tethering, tethering_type_e type,
  */
 API int tethering_get_network_interface_name(tethering_h tethering, tethering_type_e type, char **interface_name)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -1879,10 +1890,10 @@ API int tethering_get_network_interface_name(tethering_h tethering, tethering_ty
  */
 API int tethering_get_ip_address(tethering_h tethering, tethering_type_e type, tethering_address_family_e address_family, char **ip_address)
 {
-
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -1941,10 +1952,10 @@ API int tethering_get_ip_address(tethering_h tethering, tethering_type_e type, t
  */
 API int tethering_get_gateway_address(tethering_h tethering, tethering_type_e type, tethering_address_family_e address_family, char **gateway_address)
 {
-
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -1988,9 +1999,10 @@ API int tethering_get_gateway_address(tethering_h tethering, tethering_type_e ty
  */
 API int tethering_get_subnet_mask(tethering_h tethering, tethering_type_e type, tethering_address_family_e address_family, char **subnet_mask)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -2069,10 +2081,10 @@ API int tethering_get_data_usage(tethering_h tethering, tethering_data_usage_cb
  */
 API int tethering_foreach_connected_clients(tethering_h tethering, tethering_type_e type, tethering_connected_client_cb callback, void *user_data)
 {
-       DBG("+\n");
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2185,9 +2197,11 @@ API int tethering_foreach_connected_clients(tethering_h tethering, tethering_typ
  */
 API int tethering_set_enabled_cb(tethering_h tethering, tethering_type_e type, tethering_enabled_cb callback, void *user_data)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       INFO("+ type: %d\n", type);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2210,6 +2224,7 @@ API int tethering_set_enabled_cb(tethering_h tethering, tethering_type_e type, t
                th->enabled_user_data[ti] = user_data;
        }
 
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -2227,9 +2242,10 @@ API int tethering_set_enabled_cb(tethering_h tethering, tethering_type_e type, t
  */
 API int tethering_unset_enabled_cb(tethering_h tethering, tethering_type_e type)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2269,9 +2285,11 @@ API int tethering_unset_enabled_cb(tethering_h tethering, tethering_type_e type)
  */
 API int tethering_set_disabled_cb(tethering_h tethering, tethering_type_e type, tethering_disabled_cb callback, void *user_data)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       INFO("+ type: %d\n", type);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2293,7 +2311,7 @@ API int tethering_set_disabled_cb(tethering_h tethering, tethering_type_e type,
                th->disabled_cb[ti] = callback;
                th->disabled_user_data[ti] = user_data;
        }
-
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -2311,9 +2329,10 @@ API int tethering_set_disabled_cb(tethering_h tethering, tethering_type_e type,
  */
 API int tethering_unset_disabled_cb(tethering_h tethering, tethering_type_e type)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2353,9 +2372,11 @@ API int tethering_unset_disabled_cb(tethering_h tethering, tethering_type_e type
  */
 API int tethering_set_connection_state_changed_cb(tethering_h tethering, tethering_type_e type, tethering_connection_state_changed_cb callback, void *user_data)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       INFO("+ type: %d\n", type);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2377,7 +2398,7 @@ API int tethering_set_connection_state_changed_cb(tethering_h tethering, tetheri
                th->changed_cb[ti] = callback;
                th->changed_user_data[ti] = user_data;
        }
-
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -2395,9 +2416,10 @@ API int tethering_set_connection_state_changed_cb(tethering_h tethering, tetheri
  */
 API int tethering_unset_connection_state_changed_cb(tethering_h tethering, tethering_type_e type)
 {
-       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_USB_FEATURE);
-       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
-       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_BT_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       if (type == TETHERING_TYPE_USB) CHECK_FEATURE_SUPPORTED(TETHERING_USB_FEATURE);
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2436,7 +2458,8 @@ API int tethering_unset_connection_state_changed_cb(tethering_h tethering, tethe
  */
 API int tethering_wifi_set_security_type_changed_cb(tethering_h tethering, tethering_wifi_security_type_changed_cb callback, void *user_data)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2466,7 +2489,8 @@ API int tethering_wifi_set_security_type_changed_cb(tethering_h tethering, tethe
  */
 API int tethering_wifi_unset_security_type_changed_cb(tethering_h tethering)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2494,7 +2518,8 @@ API int tethering_wifi_unset_security_type_changed_cb(tethering_h tethering)
  */
 API int tethering_wifi_set_ssid_visibility_changed_cb(tethering_h tethering, tethering_wifi_ssid_visibility_changed_cb callback, void *user_data)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2522,7 +2547,8 @@ API int tethering_wifi_set_ssid_visibility_changed_cb(tethering_h tethering, tet
  */
 API int tethering_wifi_unset_ssid_visibility_changed_cb(tethering_h tethering)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2550,7 +2576,8 @@ API int tethering_wifi_unset_ssid_visibility_changed_cb(tethering_h tethering)
  */
 API int tethering_wifi_set_passphrase_changed_cb(tethering_h tethering, tethering_wifi_passphrase_changed_cb callback, void *user_data)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2578,7 +2605,8 @@ API int tethering_wifi_set_passphrase_changed_cb(tethering_h tethering, tetherin
  */
 API int tethering_wifi_unset_passphrase_changed_cb(tethering_h tethering)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2608,7 +2636,8 @@ API int tethering_wifi_unset_passphrase_changed_cb(tethering_h tethering)
  */
 API int tethering_wifi_set_security_type(tethering_h tethering, tethering_wifi_security_type_e type)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2654,7 +2683,8 @@ API int tethering_wifi_set_security_type(tethering_h tethering, tethering_wifi_s
  */
 API int tethering_wifi_get_security_type(tethering_h tethering, tethering_wifi_security_type_e *type)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(type == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(type) is NULL\n");
@@ -2679,7 +2709,8 @@ API int tethering_wifi_get_security_type(tethering_h tethering, tethering_wifi_s
  */
 API int tethering_wifi_set_ssid(tethering_h tethering, const char *ssid)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2724,7 +2755,8 @@ API int tethering_wifi_set_ssid(tethering_h tethering, const char *ssid)
  */
 API int tethering_wifi_get_ssid(tethering_h tethering, char **ssid)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2780,7 +2812,8 @@ API int tethering_wifi_get_ssid(tethering_h tethering, char **ssid)
  */
 API int tethering_wifi_set_ssid_visibility(tethering_h tethering, bool visible)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2816,7 +2849,8 @@ API int tethering_wifi_set_ssid_visibility(tethering_h tethering, bool visible)
  */
 API int tethering_wifi_get_ssid_visibility(tethering_h tethering, bool *visible)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(visible == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(visible) is NULL\n");
@@ -2841,7 +2875,8 @@ API int tethering_wifi_get_ssid_visibility(tethering_h tethering, bool *visible)
  */
 API int tethering_wifi_set_passphrase(tethering_h tethering, const char *passphrase)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2910,7 +2945,8 @@ API int tethering_wifi_set_passphrase(tethering_h tethering, const char *passphr
  */
 API int tethering_wifi_get_passphrase(tethering_h tethering, char **passphrase)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -2951,7 +2987,9 @@ API int tethering_wifi_get_passphrase(tethering_h tethering, char **passphrase)
 
 API int tethering_wifi_set_channel(tethering_h tethering, int channel)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
 
@@ -2963,7 +3001,9 @@ API int tethering_wifi_set_channel(tethering_h tethering, int channel)
 
 API int tethering_wifi_get_channel(tethering_h tethering, int *channel)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
 
@@ -2978,7 +3018,9 @@ API int tethering_wifi_get_channel(tethering_h tethering, int *channel)
 
 API int tethering_wifi_set_mode(tethering_h tethering, tethering_wifi_mode_type_e type)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
 
@@ -2991,7 +3033,9 @@ API int tethering_wifi_set_mode(tethering_h tethering, tethering_wifi_mode_type_
 
 API int tethering_wifi_get_mode(tethering_h tethering, tethering_wifi_mode_type_e *type)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
        _retvm_if(type == NULL, TETHERING_ERROR_INVALID_PARAMETER,
@@ -3022,7 +3066,8 @@ API int tethering_wifi_get_mode(tethering_h tethering, tethering_wifi_mode_type_
 API int tethering_wifi_reload_settings(tethering_h tethering, tethering_wifi_settings_reloaded_cb callback, void *user_data)
 
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3060,7 +3105,8 @@ API int tethering_wifi_reload_settings(tethering_h tethering, tethering_wifi_set
 
 API int tethering_wifi_set_mac_filter(tethering_h tethering, bool mac_filter)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3073,7 +3119,8 @@ API int tethering_wifi_set_mac_filter(tethering_h tethering, bool mac_filter)
 
 API int tethering_wifi_get_mac_filter(tethering_h tethering, bool *mac_filter)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(mac_filter) is NULL\n");
@@ -3183,7 +3230,8 @@ static int __remove_mac_from_file(const char *filepath, const char *mac)
 
 API int tethering_wifi_add_allowed_mac_list(tethering_h tethering, const char *mac)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3195,7 +3243,9 @@ API int tethering_wifi_add_allowed_mac_list(tethering_h tethering, const char *m
 
 API int tethering_wifi_remove_allowed_mac_list(tethering_h tethering, const char *mac)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
        _retvm_if(mac == NULL, TETHERING_ERROR_INVALID_PARAMETER,
@@ -3206,7 +3256,9 @@ API int tethering_wifi_remove_allowed_mac_list(tethering_h tethering, const char
 
 API int tethering_wifi_get_allowed_mac_list(tethering_h tethering, void **allowed_mac_list)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
        _retvm_if(allowed_mac_list == NULL, TETHERING_ERROR_INVALID_PARAMETER,
@@ -3218,7 +3270,9 @@ API int tethering_wifi_get_allowed_mac_list(tethering_h tethering, void **allowe
 
 API int tethering_wifi_add_blocked_mac_list(tethering_h tethering, const char *mac)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
        _retvm_if(mac == NULL, TETHERING_ERROR_INVALID_PARAMETER,
@@ -3229,7 +3283,9 @@ API int tethering_wifi_add_blocked_mac_list(tethering_h tethering, const char *m
 
 API int tethering_wifi_remove_blocked_mac_list(tethering_h tethering, const char *mac)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
        _retvm_if(mac == NULL, TETHERING_ERROR_INVALID_PARAMETER,
@@ -3240,7 +3296,8 @@ API int tethering_wifi_remove_blocked_mac_list(tethering_h tethering, const char
 
 API int tethering_wifi_get_blocked_mac_list(tethering_h tethering, void **blocked_mac_list)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3253,7 +3310,8 @@ API int tethering_wifi_get_blocked_mac_list(tethering_h tethering, void **blocke
 
 API int tethering_wifi_enable_dhcp(tethering_h tethering, bool enable)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3296,7 +3354,8 @@ API int tethering_wifi_enable_dhcp(tethering_h tethering, bool enable)
 
 API int tethering_wifi_set_dhcp_range(tethering_h tethering, char *rangestart, char *rangestop)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3340,7 +3399,9 @@ API int tethering_wifi_set_dhcp_range(tethering_h tethering, char *rangestart, c
 
 API int tethering_wifi_is_dhcp_enabled(tethering_h tethering, bool *dhcp_enabled)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
        _retvm_if(dhcp_enabled == NULL, TETHERING_ERROR_INVALID_PARAMETER,
@@ -3354,8 +3415,10 @@ API int tethering_wifi_is_dhcp_enabled(tethering_h tethering, bool *dhcp_enabled
 
 API int tethering_wifi_set_txpower(tethering_h tethering, unsigned int txpower)
 {
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        GError *error = NULL;
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3378,9 +3441,11 @@ API int tethering_wifi_set_txpower(tethering_h tethering, unsigned int txpower)
 
 API int tethering_wifi_get_txpower(tethering_h tethering, unsigned int *txpower)
 {
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+
        GError *error = NULL;
        GVariant *result = NULL;
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3410,7 +3475,8 @@ API int tethering_wifi_get_txpower(tethering_h tethering, unsigned int *txpower)
 
 API int tethering_wifi_set_mtu(tethering_h tethering, unsigned int mtu)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3447,7 +3513,8 @@ API int tethering_wifi_set_mtu(tethering_h tethering, unsigned int mtu)
 
 API int tethering_wifi_change_mac(tethering_h tethering, char *mac)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3488,7 +3555,8 @@ API int tethering_wifi_change_mac(tethering_h tethering, char *mac)
 
 API int tethering_wifi_set_max_connected_device(tethering_h tethering, int max_device)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3502,7 +3570,8 @@ API int tethering_wifi_set_max_connected_device(tethering_h tethering, int max_d
 
 API int tethering_wifi_get_max_connected_device(tethering_h tethering, int *max_device)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3517,7 +3586,8 @@ API int tethering_wifi_get_max_connected_device(tethering_h tethering, int *max_
 
 API int tethering_wifi_enable_port_forwarding(tethering_h tethering, bool enable)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3555,7 +3625,8 @@ API int tethering_wifi_enable_port_forwarding(tethering_h tethering, bool enable
 
 API int tethering_wifi_add_port_forwarding_rule(tethering_h tethering, char *ifname, char *protocol, char *org_ip, int org_port, char *final_ip, int final_port)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3605,7 +3676,8 @@ API int tethering_wifi_add_port_forwarding_rule(tethering_h tethering, char *ifn
 
 API int tethering_wifi_reset_port_forwarding_rule(tethering_h tethering)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3641,7 +3713,8 @@ API int tethering_wifi_reset_port_forwarding_rule(tethering_h tethering)
 
 API int tethering_wifi_is_port_forwarding_enabled(tethering_h tethering, bool* forwarding_enabled)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3657,7 +3730,8 @@ API int tethering_wifi_is_port_forwarding_enabled(tethering_h tethering, bool* f
 
 API int tethering_wifi_get_port_forwarding_rule(tethering_h tethering, void **port_forwarding_list)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3670,7 +3744,8 @@ API int tethering_wifi_get_port_forwarding_rule(tethering_h tethering, void **po
 
 API int tethering_wifi_enable_port_filtering(tethering_h tethering, bool enable)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3708,7 +3783,8 @@ API int tethering_wifi_enable_port_filtering(tethering_h tethering, bool enable)
 
 API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port, char *protocol, bool allow)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3763,7 +3839,8 @@ API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port,
 
 API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int port1, int port2, char *protocol, bool allow)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3818,7 +3895,8 @@ API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int
 
 API int tethering_wifi_get_port_filtering_rule(tethering_h tethering, void **port_filtering_list)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3831,7 +3909,8 @@ API int tethering_wifi_get_port_filtering_rule(tethering_h tethering, void **por
 
 API int tethering_wifi_get_custom_port_filtering_rule(tethering_h tethering, void **custom_port_filtering_list)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3844,7 +3923,8 @@ API int tethering_wifi_get_custom_port_filtering_rule(tethering_h tethering, voi
 
 API int tethering_wifi_is_port_filtering_enabled(tethering_h tethering, bool* filtering_enabled)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3860,7 +3940,8 @@ API int tethering_wifi_is_port_filtering_enabled(tethering_h tethering, bool* fi
 
 API int tethering_wifi_set_vpn_passthrough_rule(tethering_h tethering, tethering_vpn_passthrough_type_e type, bool enable)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL\n");
@@ -3897,7 +3978,8 @@ API int tethering_wifi_set_vpn_passthrough_rule(tethering_h tethering, tethering
 
 API int tethering_wifi_push_wps_button(tethering_h tethering)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL");
@@ -3932,7 +4014,8 @@ API int tethering_wifi_push_wps_button(tethering_h tethering)
 
 API int tethering_wifi_set_wps_pin(tethering_h tethering, const char *wps_pin)
 {
-       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE, TETHERING_WIFI_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_FEATURE);
+       CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
 
        _retvm_if(tethering == NULL, TETHERING_ERROR_INVALID_PARAMETER,
                        "parameter(tethering) is NULL");
Domain: Network & Connectivity / Data Network;