Merge "Fix dereference issues" into tizen
[platform/core/api/tethering.git] / src / tethering.c
index f3780d8..448cd49 100755 (executable)
@@ -125,8 +125,7 @@ static __tethering_sig_t sigs[] = {
        {0, SIGNAL_NAME_SECURITY_TYPE_CHANGED, __handle_security_type_changed},
        {0, SIGNAL_NAME_SSID_VISIBILITY_CHANGED, __handle_ssid_visibility_changed},
        {0, SIGNAL_NAME_PASSPHRASE_CHANGED, __handle_passphrase_changed},
-       {0, SIGNAL_NAME_DHCP_STATUS, __handle_dhcp},
-       {0, "", NULL} };
+       {0, SIGNAL_NAME_DHCP_STATUS, __handle_dhcp} };
 
 static int retry = 0;
 
@@ -154,7 +153,8 @@ static bool __any_tethering_is_enabled(tethering_h tethering)
 {
        if (tethering_is_enabled(tethering, TETHERING_TYPE_USB) ||
                        tethering_is_enabled(tethering, TETHERING_TYPE_WIFI) ||
-                       tethering_is_enabled(tethering, TETHERING_TYPE_BT))
+                       tethering_is_enabled(tethering, TETHERING_TYPE_BT) ||
+                       tethering_is_enabled(tethering, TETHERING_TYPE_P2P))
                return true;
 
        return false;
@@ -165,12 +165,12 @@ static tethering_error_e __set_security_type(const tethering_wifi_security_type_
        if (security_type != TETHERING_WIFI_SECURITY_TYPE_NONE &&
                        security_type != TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK &&
                        security_type != TETHERING_WIFI_SECURITY_TYPE_WPS) {
-               ERR("Invalid param\n");
+               ERR("Invalid param\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_INVALID_PARAMETER;
        }
 
        if (vconf_set_int(VCONFKEY_MOBILE_HOTSPOT_SECURITY, security_type) < 0) {
-               ERR("vconf_set_int is failed\n");
+               ERR("vconf_set_int is failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
@@ -180,13 +180,13 @@ static tethering_error_e __set_security_type(const tethering_wifi_security_type_
 static tethering_error_e __get_security_type(tethering_wifi_security_type_e *security_type)
 {
        if (security_type == NULL) {
-               ERR("Invalid param\n");
+               ERR("Invalid param\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_INVALID_PARAMETER;
        }
 
        if (vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_SECURITY,
                                (int *)security_type) < 0) {
-               ERR("vconf_get_int is failed\n");
+               ERR("vconf_get_int is failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
@@ -217,7 +217,7 @@ static bool __get_ssid_from_vconf(const char *path, char *ssid, unsigned int siz
 static tethering_error_e __set_visible(const bool visible)
 {
        if (vconf_set_int(VCONFKEY_MOBILE_HOTSPOT_HIDE, visible ? 0 : 1) < 0) {
-               ERR("vconf_set_int is failed\n");
+               ERR("vconf_set_int is failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
@@ -227,14 +227,14 @@ static tethering_error_e __set_visible(const bool visible)
 static tethering_error_e __get_visible(bool *visible)
 {
        if (visible == NULL) {
-               ERR("Invalid param\n");
+               ERR("Invalid param\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_INVALID_PARAMETER;
        }
 
        int hide = 0;
 
        if (vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_HIDE, &hide) < 0) {
-               ERR("vconf_get_int is failed\n");
+               ERR("vconf_get_int is failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
@@ -286,6 +286,7 @@ static tethering_error_e __get_error(int agent_error)
                err = TETHERING_ERROR_INVALID_PARAMETER;
                break;
 
+       //LCOV_EXCL_START
        case MOBILE_AP_ERROR_ALREADY_ENABLED:
                err = TETHERING_ERROR_OPERATION_FAILED;
                break;
@@ -310,7 +311,6 @@ static tethering_error_e __get_error(int agent_error)
                err = TETHERING_ERROR_OPERATION_FAILED;
                break;
 
-       //LCOV_EXCL_START
        case MOBILE_AP_ERROR_NOT_PERMITTED:
                err = TETHERING_ERROR_NOT_PERMITTED;
                break;
@@ -319,7 +319,7 @@ static tethering_error_e __get_error(int agent_error)
                err = TETHERING_ERROR_PERMISSION_DENIED;
                break;
        //LCOV_EXCL_STOP
-       default :
+       default:
                ERR("Not defined error : %d\n", agent_error);
                err = TETHERING_ERROR_OPERATION_FAILED;
                break;
@@ -368,6 +368,8 @@ static void __handle_dhcp(GDBusConnection *connection, const gchar *sender_name,
                type = TETHERING_TYPE_WIFI;
        else if (ap_type == MOBILE_AP_TYPE_BT)
                type = TETHERING_TYPE_BT;
+       else if (ap_type == MOBILE_AP_TYPE_P2P)
+               type = TETHERING_TYPE_P2P;
        else {
                ERR("Not supported tethering type [%d]\n", ap_type);
                goto DONE;
@@ -394,9 +396,7 @@ DONE:
        g_free(name);
        DBG("-\n");
 }
-//LCOV_EXCL_STOP
 
-//LCOV_EXCL_START
 static void __handle_net_closed(GDBusConnection *connection, const gchar *sender_name,
                const gchar *object_path, const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
@@ -691,7 +691,7 @@ static void __handle_security_type_changed(GDBusConnection *connection, const gc
        else if (g_strcmp0(buf, TETHERING_WIFI_SECURITY_TYPE_WPS_STR) == 0)
                security_type = TETHERING_WIFI_SECURITY_TYPE_WPS;
        else {
-               SERR("Unknown type : %s\n", buf);
+               SERR("Unknown type : %s\n", buf); //LCOV_EXCL_LINE
                g_free(buf);
                return;
        }
@@ -705,7 +705,7 @@ static void __handle_ssid_visibility_changed(GDBusConnection *connection, const
                const gchar *object_path, const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
-       DBG("+\n");
+       DBG("+\n"); //LCOV_EXCL_LINE
 
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        __tethering_h *th = (__tethering_h *)user_data;
@@ -717,7 +717,7 @@ static void __handle_ssid_visibility_changed(GDBusConnection *connection, const
 
        scb = th->ssid_visibility_changed_cb;
        if (scb == NULL) {
-               DBG("-\n");
+               DBG("-\n"); //LCOV_EXCL_LINE
                return;
        }
        g_variant_get(parameters, "(s)", &buf);
@@ -727,14 +727,14 @@ static void __handle_ssid_visibility_changed(GDBusConnection *connection, const
 
        scb(visible, data);
        g_free(buf);
-       DBG("-\n");
+       DBG("-\n"); //LCOV_EXCL_LINE
 }
 
 static void __handle_passphrase_changed(GDBusConnection *connection, const gchar *sender_name,
                const gchar *object_path, const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
-       DBG("+\n");
+       DBG("+\n"); //LCOV_EXCL_LINE
 
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        __tethering_h *th = (__tethering_h *)user_data;
@@ -749,13 +749,13 @@ static void __handle_passphrase_changed(GDBusConnection *connection, const gchar
        data = th->passphrase_user_data;
 
        pcb(data);
-       DBG("-\n");
+       DBG("-\n"); //LCOV_EXCL_LINE
 }
 
 static void __wifi_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                gpointer user_data)
 {
-       DBG("+\n");
+       INFO("+\n"); //LCOV_EXCL_LINE
 
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        GError *g_error = NULL;
@@ -766,6 +766,9 @@ static void __wifi_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        tethering_enabled_cb ecb = th->enabled_cb[TETHERING_TYPE_WIFI];
        void *data = th->enabled_user_data[TETHERING_TYPE_WIFI];
 
+       if (!_tethering_check_handle((tethering_h)user_data))
+               return;
+
        g_var  = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
        if (g_error) {
                //LCOV_EXCL_START
@@ -787,24 +790,26 @@ static void __wifi_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        }
        retry = 0;
 
+       INFO("cfm event : wifi tethering enable info : %d\n", error); //LCOV_EXCL_LINE
+
        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"); //LCOV_EXCL_LINE
                return;
        }
        ecb(error, TETHERING_TYPE_WIFI, true, data);
        g_variant_unref(g_var);
-       DBG("-\n");
+       INFO("-\n"); //LCOV_EXCL_LINE
 }
 
 static void __bt_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                gpointer user_data)
 {
-       DBG("+\n");
+       DBG("+\n"); //LCOV_EXCL_LINE
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        GError *g_error = NULL;
        GVariant *g_var;
@@ -815,6 +820,9 @@ static void __bt_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        tethering_enabled_cb ecb = th->enabled_cb[TETHERING_TYPE_BT];
        void *data = th->enabled_user_data[TETHERING_TYPE_BT];
 
+       if (!_tethering_check_handle((tethering_h)user_data))
+               return;
+
        g_var  = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
        if (g_error) {
                //LCOV_EXCL_START
@@ -845,7 +853,7 @@ static void __bt_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                        sigs[E_SIGNAL_BT_TETHER_ON].cb, (gpointer)th, NULL);
 
        if (!ecb) {
-               DBG("-\n");
+               DBG("-\n"); //LCOV_EXCL_LINE
                return;
        }
 
@@ -868,6 +876,9 @@ static void __usb_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        tethering_enabled_cb ecb = th->enabled_cb[TETHERING_TYPE_USB];
        void *data = th->enabled_user_data[TETHERING_TYPE_USB];
 
+       if (!_tethering_check_handle((tethering_h)user_data))
+               return;
+
        g_var  = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
        if (g_error) {
                ERR("DBus error [%s]\n", g_error->message);
@@ -903,12 +914,60 @@ static void __usb_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        ecb(error, TETHERING_TYPE_USB, true, data);
        DBG("-\n");
 }
+
+static void __p2p_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
+                                       gpointer user_data)
+{
+       DBG("+\n");
+
+       _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
+       __tethering_h *th = (__tethering_h *)user_data;
+       GError *g_error = NULL;
+       GVariant *g_var;
+       guint info;
+       tethering_error_e error;
+       tethering_enabled_cb ecb = th->enabled_cb[TETHERING_TYPE_P2P];
+       void *data = th->enabled_user_data[TETHERING_TYPE_P2P];
+
+       if (!_tethering_check_handle((tethering_h)user_data))
+               return;
+
+       g_var  = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
+       if (g_error) {
+               ERR("DBus error [%s]\n", g_error->message);
+               if (g_error->code == G_DBUS_ERROR_NO_REPLY &&
+                               ++retry < TETHERING_ERROR_RECOVERY_MAX) {
+                       g_error_free(g_error);
+                       tethering_enable((tethering_h)th, TETHERING_TYPE_P2P);
+                       DBG("-\n");
+                       return;
+               }
+               if (g_error->code == G_DBUS_ERROR_ACCESS_DENIED)
+                       error = TETHERING_ERROR_PERMISSION_DENIED;
+               else
+                       error = TETHERING_ERROR_OPERATION_FAILED;
+               g_error_free(g_error);
+       } else {
+               g_variant_get(g_var, "(u)", &info);
+               g_variant_unref(g_var);
+               error = __get_error(info);
+       }
+       retry = 0;
+
+       if (!ecb) {
+               DBG("-\n");
+               return;
+       }
+
+       ecb(error, TETHERING_TYPE_P2P, true, data);
+       DBG("-\n");
+}
 //LCOV_EXCL_STOP
 
 static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                gpointer user_data)
 {
-       DBG("+\n");
+       INFO("+\n"); //LCOV_EXCL_LINE
 
        _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
        GError *g_error = NULL;
@@ -922,6 +981,9 @@ static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        tethering_disabled_cb dcb = NULL;
        void *data = NULL;
 
+       if (!_tethering_check_handle((tethering_h)user_data))
+               return;
+
        g_var  = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
        if (g_error) {
                //LCOV_EXCL_START
@@ -931,10 +993,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,
@@ -975,7 +1037,14 @@ static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
                if (dcb)
                        dcb(error, type, code, data);
                break;
-       //LCOV_EXCL_STOP
+
+       case MOBILE_AP_DISABLE_P2P_TETHERING_CFM:
+               type = TETHERING_TYPE_P2P;
+               dcb = th->disabled_cb[type];
+               data = th->disabled_user_data[type];
+               if (dcb)
+                       dcb(error, type, code, data);
+               break;
 
        case MOBILE_AP_DISABLE_CFM:
 
@@ -1005,8 +1074,9 @@ static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
        default:
                ERR("Invalid event\n");
                break;
+       //LCOV_EXCL_STOP
        }
-       DBG("-\n");
+       INFO("-\n"); //LCOV_EXCL_LINE
 }
 
 static void __get_data_usage_cb(GObject *source_object, GAsyncResult *res,
@@ -1037,7 +1107,7 @@ static void __get_data_usage_cb(GObject *source_object, GAsyncResult *res,
                //LCOV_EXCL_STOP
        }
        if (th->data_usage_cb == NULL) {
-               ERR("There is no data_usage_cb\n");
+               ERR("There is no data_usage_cb\n"); //LCOV_EXCL_LINE
                return;
        }
        if (flag) {
@@ -1068,7 +1138,7 @@ static void __settings_reloaded_cb(GObject *source_object, GAsyncResult *res,
 
        g_var  = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
        if (g_error) {
-               ERR("DBus fail [%s]\n", g_error->message);
+               ERR("DBus fail [%s]\n", g_error->message); //LCOV_EXCL_LINE
                if (g_error->code == G_DBUS_ERROR_ACCESS_DENIED)
                        tethering_error = TETHERING_ERROR_PERMISSION_DENIED;
                else
@@ -1145,9 +1215,11 @@ static bool __get_intf_name(tethering_type_e type, char *buf, unsigned int len)
                g_strlcpy(buf, TETHERING_BT_IF, len);
                break;
 
+       //LCOV_EXCL_START
        default:
                ERR("Not supported type : %d\n", type);
                return false;
+       //LCOV_EXCL_STOP
        }
        return true;
 }
@@ -1157,10 +1229,11 @@ static bool __get_gateway_addr(tethering_type_e type, char *buf, unsigned int le
        _retvm_if(buf == NULL, false, "parameter(buf) is NULL\n");
 
        switch (type) {
+       //LCOV_EXCL_START
        case TETHERING_TYPE_USB:
                g_strlcpy(buf, TETHERING_USB_GATEWAY, len);
                break;
-
+       //LCOV_EXCL_STOP
        case TETHERING_TYPE_WIFI:
                g_strlcpy(buf, TETHERING_WIFI_GATEWAY, len);
                break;
@@ -1168,10 +1241,11 @@ static bool __get_gateway_addr(tethering_type_e type, char *buf, unsigned int le
        case TETHERING_TYPE_BT:
                g_strlcpy(buf, TETHERING_BT_GATEWAY, len);
                break;
-
+       //LCOV_EXCL_START
        default:
                ERR("Not supported type : %d\n", type);
                return false;
+       //LCOV_EXCL_STOP
        }
        return true;
 }
@@ -1227,14 +1301,14 @@ 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;
        char *ptr = NULL;
 
        if (th == NULL || set == NULL) {
-               ERR("null parameter\n-\n");
+               ERR("null parameter\n-\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_INVALID_PARAMETER;
        }
 
@@ -1296,37 +1370,32 @@ 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;
 }
 
 static bool __check_precondition(tethering_type_e type)
 {
-       int dnet_state = 0;
+       int dnet_status = 0;
        int cellular_state = 0;
-       int wifi_state = 0;
 
        /* 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;
        }
 
-       vconf_get_int(VCONFKEY_DNET_STATE, &dnet_state);
-       if (dnet_state > VCONFKEY_DNET_OFF) {
-               ERR("Data Network is connected");
+       /* data network status */
+       vconf_get_int(VCONFKEY_NETWORK_STATUS, &dnet_status);
+       if ((dnet_status == VCONFKEY_NETWORK_WIFI
+                       && type != TETHERING_TYPE_WIFI)
+               || dnet_status == VCONFKEY_NETWORK_ETHERNET)
                return TRUE;
-       }
-
-       /* data network through wifi */
-       if (type != TETHERING_TYPE_WIFI) {
-               vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
-               if (wifi_state > VCONFKEY_WIFI_UNCONNECTED) {
-                       ERR("Wi-Fi is connected!");
-                       return TRUE;
-               }
-       }
 
        ERR("Network is not available!");
        return FALSE;
@@ -1352,7 +1421,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;
@@ -1366,21 +1435,25 @@ API int tethering_create(tethering_h *tethering)
        th->sec_type = TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK;
        th->visibility = true;
        th->mac_filter = false;
-       th->channel = 6;
+       th->channel = TETHERING_WIFI_CHANNEL;
        th->mode_type = TETHERING_WIFI_MODE_TYPE_G;
        th->wifi_max_connected = TETHERING_WIFI_MAX_STA;
 
        if (__generate_initial_passphrase(th->passphrase,
                        sizeof(th->passphrase)) == 0) {
-               ERR("random passphrase generation failed\n"); //LCOV_EXCL_LINE
+               //LCOV_EXCL_START
+               ERR("random passphrase generation failed\n");
                free(th);
                return TETHERING_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
        }
 
        if (__get_common_ssid(ssid, sizeof(ssid)) != TETHERING_ERROR_NONE) {
-               ERR("common ssid get failed\n"); //LCOV_EXCL_LINE
+               //LCOV_EXCL_START
+               ERR("common ssid get failed\n");
                free(th);
                return TETHERING_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
        }
 
 #if !GLIB_CHECK_VERSION(2, 36, 0)
@@ -1418,8 +1491,9 @@ 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");
+       _tethering_add_handle(th);
+       INFO("Tethering Handle : %p\n", th);
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1437,15 +1511,17 @@ 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");
 
        __tethering_h *th = (__tethering_h *)tethering;
 
-       DBG("Tethering Handle : 0x%X\n", th);
+       INFO("Tethering Handle : %p\n", th);
+
        __disconnect_signals(tethering);
+       _tethering_remove_handle(th);
 
        if (th->ssid)
                free(th->ssid);
@@ -1454,9 +1530,10 @@ API int tethering_destroy(tethering_h tethering)
        g_object_unref(th->client_bus_proxy);
        g_object_unref(th->client_bus);
        memset(th, 0x00, sizeof(__tethering_h));
+
        free(th);
 
-       DBG("-\n");
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1477,7 +1554,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);
@@ -1495,7 +1572,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
        }
@@ -1517,15 +1594,17 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
 
                ret = __prepare_wifi_settings(tethering, &set);
                if (ret != TETHERING_ERROR_NONE) {
+                       //LCOV_EXCL_START
                        ERR("softap settings initialization failed\n");
                        DBG("-\n");
                        return TETHERING_ERROR_OPERATION_FAILED;
+                       //LCOV_EXCL_STOP
                }
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_WIFI_TETHER_ON].sig_id);
 
                g_dbus_proxy_call(proxy, "enable_wifi_tethering",
-                               g_variant_new("(sssiiiii)", set.ssid, set.key, set.mode, set.channel, set.visibility, set.mac_filter, set.max_connected, set.sec_type),
+                               g_variant_new("(sssiiiiii)", set.ssid, set.key, set.mode, set.channel, set.visibility, set.mac_filter, set.max_connected, set.sec_type, TETHERING_ADDRESS_FAMILY_IPV4),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __wifi_enabled_cfm_cb, (gpointer)tethering);
                break;
@@ -1535,13 +1614,30 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_BT_TETHER_ON].sig_id);
 
-               g_dbus_proxy_call(proxy, "enable_bt_tethering", NULL,
+               g_dbus_proxy_call(proxy, "enable_bt_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __bt_enabled_cfm_cb, (gpointer)tethering);
 
                break;
 
        //LCOV_EXCL_START
+       case TETHERING_TYPE_P2P: {
+               _softap_settings_t p2p_set = {"", "", "", 0, false};
+               ret = __prepare_wifi_settings(tethering, &p2p_set);
+               if (ret != TETHERING_ERROR_NONE) {
+                       ERR("p2p settings initialization failed\n");
+                       DBG("-\n");
+                       return TETHERING_ERROR_OPERATION_FAILED;
+               }
+
+               g_dbus_proxy_call(proxy, "enable_p2p_tethering",
+                               g_variant_new("(ssi)", p2p_set.ssid, p2p_set.key, p2p_set.channel),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __p2p_enabled_cfm_cb, (gpointer)tethering);
+               break;
+       }
+
        case TETHERING_TYPE_ALL: {
                _softap_settings_t set = {"", "", "", 0, false};
 
@@ -1564,7 +1660,9 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
                                sigs[E_SIGNAL_WIFI_TETHER_ON].sig_id);
 
                g_dbus_proxy_call(proxy, "enable_wifi_tethering",
-                               g_variant_new("(ssii)", set.ssid, set.key, set.visibility, set.sec_type),
+                               g_variant_new("(sssiiiiii)", set.ssid, set.key, set.mode,
+                               set.channel, set.visibility, set.mac_filter, set.max_connected,
+                               set.sec_type, TETHERING_ADDRESS_FAMILY_IPV4),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __wifi_enabled_cfm_cb, (gpointer)tethering);
 
@@ -1572,11 +1670,11 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_BT_TETHER_ON].sig_id);
 
-               g_dbus_proxy_call(proxy, "enable_usb_tethering", NULL,
+               g_dbus_proxy_call(proxy, "enable_bt_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __bt_enabled_cfm_cb, (gpointer)tethering);
                break;
-               //LCOV_EXCL_STOP
        }
        default:
                ERR("Unknown type : %d\n", type);
@@ -1586,12 +1684,127 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
                DBG("-\n");
                return TETHERING_ERROR_INVALID_PARAMETER;
        }
+       //LCOV_EXCL_STOP
+
+       g_dbus_proxy_set_default_timeout(proxy, DBUS_TIMEOUT_USE_DEFAULT);
+       INFO("-\n");
+       return TETHERING_ERROR_NONE;
+}
+
+API int tethering_ipv6_enable(tethering_h tethering, tethering_type_e type)
+{
+       DBG("+ 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");
+
+       __tethering_h *th = (__tethering_h *)tethering;
+       GDBusProxy *proxy = th->client_bus_proxy;
+       GDBusConnection *connection = th->client_bus;
+       int ret = 0;
+
+       g_dbus_proxy_set_default_timeout(proxy, DBUS_TIMEOUT_INFINITE);
+
+       if (__check_precondition(type) == FALSE) {
+               //LCOV_EXCL_START
+               DBG("-\n");
+               return TETHERING_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
+       }
+
+       switch (type) {
+       case TETHERING_TYPE_WIFI: {
+               _softap_settings_t set = {"", "", "", 0, false, false, 0, 0};
+
+               ret = __prepare_wifi_settings(tethering, &set);
+               if (ret != TETHERING_ERROR_NONE) {
+                       ERR("softap settings initialization failed\n");
+                       DBG("-\n");
+                       return TETHERING_ERROR_OPERATION_FAILED;
+               }
+               g_dbus_connection_signal_unsubscribe(connection,
+                               sigs[E_SIGNAL_WIFI_TETHER_ON].sig_id);
+                       g_dbus_proxy_call(proxy, "enable_wifi_tethering",
+                               g_variant_new("(sssiiiiii)", set.ssid, set.key, set.mode, set.channel, set.visibility, set.mac_filter, set.max_connected, set.sec_type, TETHERING_ADDRESS_FAMILY_IPV6),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __wifi_enabled_cfm_cb, (gpointer)tethering);
+               break;
+        }
+       case TETHERING_TYPE_BT: {
+               g_dbus_connection_signal_unsubscribe(connection,
+                               sigs[E_SIGNAL_BT_TETHER_ON].sig_id);
+
+               /* For TEST */
+               g_dbus_proxy_call(proxy, "enable_bt_tethering", g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __bt_enabled_cfm_cb, (gpointer)tethering);
+
+               break;
+       }
+
+       default: {
+               ERR("Unknown type : %d\n", type);
+
+               g_dbus_proxy_set_default_timeout(proxy, DBUS_TIMEOUT_USE_DEFAULT);
+
+               DBG("-\n");
+               return TETHERING_ERROR_INVALID_PARAMETER;
+       }
+       }
 
        g_dbus_proxy_set_default_timeout(proxy, DBUS_TIMEOUT_USE_DEFAULT);
        DBG("-\n");
        return TETHERING_ERROR_NONE;
 }
 
+API int tethering_ipv6_disable(tethering_h tethering, tethering_type_e type)
+{
+       DBG("+ 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");
+
+       __tethering_h *th = (__tethering_h *)tethering;
+       GDBusProxy *proxy = th->client_bus_proxy;
+       GDBusConnection *connection = th->client_bus;
+
+       switch (type) {
+       case TETHERING_TYPE_WIFI:
+               DBG("Disable wifi tethering..");
+               g_dbus_connection_signal_unsubscribe(connection,
+                               sigs[E_SIGNAL_WIFI_TETHER_OFF].sig_id);
+
+               g_dbus_proxy_call(proxy, "disable_wifi_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
+               break;
+       case TETHERING_TYPE_BT:
+               g_dbus_connection_signal_unsubscribe(connection,
+                               sigs[E_SIGNAL_BT_TETHER_OFF].sig_id);
+
+               g_dbus_proxy_call(proxy, "disable_bt_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
+               break;
+
+       default:
+               ERR("Not supported tethering type [%d]\n", type);
+               DBG("-\n");
+               return TETHERING_ERROR_INVALID_PARAMETER;
+       }
+       DBG("-\n");
+       return TETHERING_ERROR_NONE;
+}
 /**
  * @internal
  * @brief Disables the tethering, asynchronously.
@@ -1609,10 +1822,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");
@@ -1622,6 +1836,7 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
        GDBusConnection *connection = th->client_bus;
 
        switch (type) {
+       //LCOV_EXCL_START
        case TETHERING_TYPE_USB:
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_USB_TETHER_OFF].sig_id);
@@ -1631,6 +1846,7 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
 
                break;
+       //LCOV_EXCL_STOP
 
        case TETHERING_TYPE_WIFI:
 
@@ -1638,7 +1854,8 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                                sigs[E_SIGNAL_WIFI_TETHER_OFF].sig_id);
 
                g_dbus_proxy_call(proxy, "disable_wifi_tethering",
-                               NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
                break;
 
@@ -1648,6 +1865,14 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                                sigs[E_SIGNAL_BT_TETHER_OFF].sig_id);
 
                g_dbus_proxy_call(proxy, "disable_bt_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
+               break;
+
+       //LCOV_EXCL_START
+       case TETHERING_TYPE_P2P:
+               g_dbus_proxy_call(proxy, "disable_p2p_tethering",
                                NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
                break;
@@ -1664,14 +1889,16 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                                sigs[E_SIGNAL_WIFI_TETHER_OFF].sig_id);
 
                g_dbus_proxy_call(proxy, "disable_wifi_tethering",
-                               NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
 
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_BT_TETHER_OFF].sig_id);
 
                g_dbus_proxy_call(proxy, "disable_bt_tethering",
-                               NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
                break;
 
@@ -1679,8 +1906,9 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                ERR("Not supported tethering type [%d]\n", type);
                DBG("-\n");
                return TETHERING_ERROR_INVALID_PARAMETER;
+       //LCOV_EXCL_STOP
        }
-       DBG("-\n");
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -1696,6 +1924,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;
 
@@ -1717,10 +1946,15 @@ API bool tethering_is_enabled(tethering_h tethering, tethering_type_e type)
                vconf_type = VCONFKEY_MOBILE_HOTSPOT_MODE_BT;
                break;
 
+       case TETHERING_TYPE_P2P:
+               vconf_type = VCONFKEY_MOBILE_HOTSPOT_MODE_P2P;
+               break;
+
        default:
                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;
 }
 
@@ -1746,9 +1980,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); //LCOV_EXCL_LINE
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE); //LCOV_EXCL_LINE
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -1770,9 +2005,11 @@ API int tethering_get_mac_address(tethering_h tethering, tethering_type_e type,
        _retvm_if(s < 0, TETHERING_ERROR_OPERATION_FAILED,
                        "getting socket is failed\n");
        if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0) {
+               //LCOV_EXCL_START
                ERR("getting mac is failed\n");
                close(s);
                return TETHERING_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
        }
        close(s);
 
@@ -1814,9 +2051,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,
@@ -1861,10 +2099,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); //LCOV_EXCL_LINE
+       else if (type == TETHERING_TYPE_WIFI) CHECK_FEATURE_SUPPORTED(TETHERING_WIFI_FEATURE);
+       else if (type == TETHERING_TYPE_BT) CHECK_FEATURE_SUPPORTED(TETHERING_BT_FEATURE); //LCOV_EXCL_LINE
 
        _retvm_if(tethering_is_enabled(tethering, type) == false,
                        TETHERING_ERROR_NOT_ENABLED,
@@ -1923,10 +2161,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,
@@ -1970,9 +2208,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,
@@ -2051,10 +2290,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");
@@ -2083,8 +2322,9 @@ API int tethering_foreach_connected_clients(tethering_h tethering, tethering_typ
                        NULL, G_DBUS_CALL_FLAGS_NONE,
                        -1, th->cancellable, &error);
        if (error)
-               ERR("g_dbus_proxy_call_sync is failed and error is %s\n", error->message);
+               ERR("g_dbus_proxy_call_sync is failed and error is %s\n", error->message); //LCOV_EXCL_LINE
        g_variant_get(result, "(a(a{sv}))", &outer_iter);
+       //LCOV_EXCL_START
        while (g_variant_iter_loop(outer_iter, "(@a{sv})", &station)) {
                g_variant_get(station, "a{sv}", &inner_iter);
                while (g_variant_iter_loop(inner_iter, "{sv}", &key, &value)) {
@@ -2096,6 +2336,8 @@ API int tethering_foreach_connected_clients(tethering_h tethering, tethering_typ
                                        client.interface = TETHERING_TYPE_WIFI;
                                else if (interface == MOBILE_AP_TYPE_BT)
                                        client.interface = TETHERING_TYPE_BT;
+                               else if (interface == MOBILE_AP_TYPE_P2P)
+                                       client.interface = TETHERING_TYPE_P2P;
                                else {
                                        ERR("Invalid interface\n");
                                        g_free(key);
@@ -2132,10 +2374,16 @@ API int tethering_foreach_connected_clients(tethering_h tethering, tethering_typ
                g_free(hostname);
                g_free(ip);
                g_free(mac);
+
+               hostname = NULL;
+               ip = NULL;
+               mac = NULL;
+
                g_variant_iter_free(inner_iter);
                if (callback((tethering_client_h)&client, user_data) == false) {
                        DBG("iteration is stopped\n");
                        g_free(client.hostname);
+                       client.hostname = NULL;
                        g_variant_iter_free(outer_iter);
                        g_variant_unref(station);
                        g_variant_unref(result);
@@ -2143,7 +2391,9 @@ API int tethering_foreach_connected_clients(tethering_h tethering, tethering_typ
                        return TETHERING_ERROR_OPERATION_FAILED;
                }
                g_free(client.hostname);
+               client.hostname = NULL;
        }
+       //LCOV_EXCL_STOP
        g_variant_iter_free(outer_iter);
        g_variant_unref(station);
        g_variant_unref(result);
@@ -2167,9 +2417,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");
@@ -2187,11 +2439,12 @@ API int tethering_set_enabled_cb(tethering_h tethering, tethering_type_e type, t
        }
 
        /* TETHERING_TYPE_ALL */
-       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
                th->enabled_cb[ti] = callback;
                th->enabled_user_data[ti] = user_data;
        }
 
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -2209,9 +2462,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");
@@ -2227,7 +2481,7 @@ API int tethering_unset_enabled_cb(tethering_h tethering, tethering_type_e type)
        }
 
        /* TETHERING_TYPE_ALL */
-       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
                th->enabled_cb[ti] = NULL;
                th->enabled_user_data[ti] = NULL;
        }
@@ -2251,9 +2505,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");
@@ -2271,11 +2527,11 @@ API int tethering_set_disabled_cb(tethering_h tethering, tethering_type_e type,
        }
 
        /* TETHERING_TYPE_ALL */
-       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
                th->disabled_cb[ti] = callback;
                th->disabled_user_data[ti] = user_data;
        }
-
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -2293,9 +2549,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");
@@ -2311,7 +2568,7 @@ API int tethering_unset_disabled_cb(tethering_h tethering, tethering_type_e type
        }
 
        /* TETHERING_TYPE_ALL */
-       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
                th->disabled_cb[ti] = NULL;
                th->disabled_user_data[ti] = NULL;
        }
@@ -2335,9 +2592,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");
@@ -2355,11 +2614,11 @@ API int tethering_set_connection_state_changed_cb(tethering_h tethering, tetheri
        }
 
        /* TETHERING_TYPE_ALL */
-       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
                th->changed_cb[ti] = callback;
                th->changed_user_data[ti] = user_data;
        }
-
+       INFO("-\n");
        return TETHERING_ERROR_NONE;
 }
 
@@ -2377,9 +2636,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");
@@ -2395,7 +2655,7 @@ API int tethering_unset_connection_state_changed_cb(tethering_h tethering, tethe
        }
 
        /* TETHERING_TYPE_ALL */
-       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+       for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
                th->changed_cb[ti] = NULL;
                th->changed_user_data[ti] = NULL;
        }
@@ -2418,7 +2678,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");
@@ -2448,7 +2709,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");
@@ -2476,7 +2738,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");
@@ -2504,7 +2767,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");
@@ -2532,7 +2796,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");
@@ -2560,7 +2825,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");
@@ -2590,7 +2856,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");
@@ -2636,7 +2903,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");
@@ -2661,7 +2929,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");
@@ -2706,7 +2975,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");
@@ -2737,7 +3007,7 @@ API int tethering_wifi_get_ssid(tethering_h tethering, char **ssid)
        }
 
        if (*ssid == NULL) {
-               ERR("strdup is failed\n");
+               ERR("strdup is failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OUT_OF_MEMORY;
        }
 
@@ -2762,7 +3032,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");
@@ -2772,7 +3043,6 @@ API int tethering_wifi_set_ssid_visibility(tethering_h tethering, bool visible)
 
        ret = __set_visible(visible);
        if (ret == TETHERING_ERROR_NONE) {
-
                __send_dbus_signal(th->client_bus,
                                SIGNAL_NAME_SSID_VISIBILITY_CHANGED,
                                visible ? SIGNAL_MSG_SSID_VISIBLE :
@@ -2798,7 +3068,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");
@@ -2823,7 +3094,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");
@@ -2892,7 +3164,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");
@@ -2933,7 +3206,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");
 
@@ -2945,7 +3220,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");
 
@@ -2960,7 +3237,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");
 
@@ -2973,7 +3252,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,
@@ -3004,7 +3285,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");
@@ -3019,13 +3301,13 @@ API int tethering_wifi_reload_settings(tethering_h tethering, tethering_wifi_set
        DBG("+\n");
 
        if (th->settings_reloaded_cb) {
-               ERR("Operation in progress\n");
+               ERR("Operation in progress\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
        ret = __prepare_wifi_settings(tethering, &set);
        if (ret != TETHERING_ERROR_NONE) {
-               ERR("softap settings initialization failed\n");
+               ERR("softap settings initialization failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
@@ -3042,7 +3324,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");
@@ -3055,7 +3338,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");
@@ -3077,19 +3361,19 @@ static int __add_mac_to_file(const char *filepath, const char *mac)
 
        p_mac = strdup(mac);
        if (p_mac == NULL) {
-               ERR("strdup failed\n");
+               ERR("strdup failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OUT_OF_MEMORY;
        }
 
        fp = fopen(filepath, "a+");
        if (!fp) {
-               ERR("fopen is failed\n");
+               ERR("fopen is failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OPERATION_FAILED;
        }
 
        while (fgets(line, MAX_BUF_SIZE, fp) != NULL) {
                if (strncmp(mac, line, 17) == 0) {
-                       DBG("MAC %s already exist in the list\n", mac);
+                       DBG("MAC %s already exist in the list\n", mac); //LCOV_EXCL_LINE
                        mac_exist = true;
                        break;
                }
@@ -3165,7 +3449,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");
@@ -3177,7 +3462,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,
@@ -3188,7 +3475,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,
@@ -3200,7 +3489,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,
@@ -3211,7 +3502,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,
@@ -3222,7 +3515,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");
@@ -3235,7 +3529,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");
@@ -3253,6 +3548,7 @@ API int tethering_wifi_enable_dhcp(tethering_h tethering, bool enable)
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
 
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
                        result = TETHERING_ERROR_PERMISSION_DENIED;
@@ -3263,6 +3559,7 @@ API int tethering_wifi_enable_dhcp(tethering_h tethering, bool enable)
                th->dhcp_enabled = false;
 
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3278,7 +3575,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");
@@ -3299,6 +3597,7 @@ API int tethering_wifi_set_dhcp_range(tethering_h tethering, char *rangestart, c
                        g_variant_new("(ss)", rangestart, rangestop),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3310,6 +3609,7 @@ API int tethering_wifi_set_dhcp_range(tethering_h tethering, char *rangestart, c
                th->dhcp_enabled = false;
 
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3322,7 +3622,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,
@@ -3336,8 +3638,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");
@@ -3351,18 +3655,22 @@ API int tethering_wifi_set_txpower(tethering_h tethering, unsigned int txpower)
                        G_DBUS_CALL_FLAGS_NONE,
                        -1, th->cancellable, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync is failed and error is %s\n", error->message);
                g_clear_error(&error);
                return TETHERING_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
        }
        return TETHERING_ERROR_NONE;
 }
 
 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");
@@ -3381,10 +3689,12 @@ API int tethering_wifi_get_txpower(tethering_h tethering, unsigned int *txpower)
                g_variant_get(result, "(u)", txpower);
                g_variant_unref(result);
        } else {
+               //LCOV_EXCL_START
                if (error)
                        ERR("g_dbus_proxy_call_sync is failed and error is %s\n", error->message);
                g_clear_error(&error);
                return TETHERING_ERROR_OPERATION_FAILED;
+               //LCOV_EXCL_STOP
        }
        g_clear_error(&error);
        return TETHERING_ERROR_NONE;
@@ -3392,7 +3702,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");
@@ -3409,6 +3720,7 @@ API int tethering_wifi_set_mtu(tethering_h tethering, unsigned int mtu)
                        g_variant_new("(u)", mtu),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3418,6 +3730,7 @@ API int tethering_wifi_set_mtu(tethering_h tethering, unsigned int mtu)
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3429,7 +3742,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");
@@ -3448,6 +3762,7 @@ API int tethering_wifi_change_mac(tethering_h tethering, char *mac)
                        g_variant_new("(s)", mac),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3457,18 +3772,22 @@ API int tethering_wifi_change_mac(tethering_h tethering, char *mac)
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
-
        g_variant_unref(parameters);
 
+       if (result == MOBILE_AP_ERROR_NOT_PERMITTED)
+               return TETHERING_ERROR_NOT_SUPPORT_API;
+
        return TETHERING_ERROR_NONE;
 }
 
 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");
@@ -3482,7 +3801,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");
@@ -3497,7 +3817,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");
@@ -3514,6 +3835,7 @@ API int tethering_wifi_enable_port_forwarding(tethering_h tethering, bool enable
                        g_variant_new("(b)", enable),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3523,6 +3845,7 @@ API int tethering_wifi_enable_port_forwarding(tethering_h tethering, bool enable
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3535,7 +3858,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");
@@ -3556,6 +3880,7 @@ API int tethering_wifi_add_port_forwarding_rule(tethering_h tethering, char *ifn
                        g_variant_new("(sssisi)", ifname, protocol, org_ip, org_port, final_ip, final_port),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3565,6 +3890,7 @@ API int tethering_wifi_add_port_forwarding_rule(tethering_h tethering, char *ifn
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3574,7 +3900,7 @@ API int tethering_wifi_add_port_forwarding_rule(tethering_h tethering, char *ifn
 
        list = strdup(cmd);
        if (list == NULL) {
-               ERR("strdup failed\n");
+               ERR("strdup failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OUT_OF_MEMORY;
        }
 
@@ -3585,7 +3911,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");
@@ -3601,6 +3928,7 @@ API int tethering_wifi_reset_port_forwarding_rule(tethering_h tethering)
        parameters = g_dbus_proxy_call_sync(proxy, "reset_port_forwarding_rule",
                        NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3610,6 +3938,7 @@ API int tethering_wifi_reset_port_forwarding_rule(tethering_h tethering)
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3621,7 +3950,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");
@@ -3637,7 +3967,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");
@@ -3650,7 +3981,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");
@@ -3667,6 +3999,7 @@ API int tethering_wifi_enable_port_filtering(tethering_h tethering, bool enable)
                        g_variant_new("(b)", enable),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3676,6 +4009,7 @@ API int tethering_wifi_enable_port_filtering(tethering_h tethering, bool enable)
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3688,7 +4022,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");
@@ -3709,6 +4044,7 @@ API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port,
                        g_variant_new("(isb)", port, protocol, allow),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3718,6 +4054,7 @@ API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port,
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3732,7 +4069,7 @@ API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port,
 
        list = strdup(cmd);
        if (list == NULL) {
-               ERR("strdup failed\n");
+               ERR("strdup failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OUT_OF_MEMORY;
        }
 
@@ -3743,7 +4080,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");
@@ -3764,6 +4102,7 @@ API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int
                        g_variant_new("(iisb)", port1, port2, protocol, allow),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3773,6 +4112,7 @@ API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3787,7 +4127,7 @@ API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int
 
        list = strdup(cmd);
        if (list == NULL) {
-               ERR("strdup failed\n");
+               ERR("strdup failed\n"); //LCOV_EXCL_LINE
                return TETHERING_ERROR_OUT_OF_MEMORY;
        }
 
@@ -3798,7 +4138,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");
@@ -3811,7 +4152,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");
@@ -3824,7 +4166,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");
@@ -3840,7 +4183,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");
@@ -3857,6 +4201,7 @@ API int tethering_wifi_set_vpn_passthrough_rule(tethering_h tethering, tethering
                        g_variant_new("(ib)", type, enable),
                        G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3866,6 +4211,7 @@ API int tethering_wifi_set_vpn_passthrough_rule(tethering_h tethering, tethering
 
                g_error_free(error);
                return result;
+               //LCOV_EXCL_STOP
        }
 
        g_variant_get(parameters, "(u)", &result);
@@ -3877,7 +4223,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");
@@ -3891,6 +4238,7 @@ API int tethering_wifi_push_wps_button(tethering_h tethering)
                        NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
 
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3900,6 +4248,7 @@ API int tethering_wifi_push_wps_button(tethering_h tethering)
 
                g_error_free(error);
                return ret;
+               //LCOV_EXCL_STOP
        }
 
        if (parameters != NULL) {
@@ -3912,7 +4261,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");
@@ -3926,6 +4276,7 @@ API int tethering_wifi_set_wps_pin(tethering_h tethering, const char *wps_pin)
                        g_variant_new("(s)", wps_pin), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
 
        if (error) {
+               //LCOV_EXCL_START
                ERR("g_dbus_proxy_call_sync failed because  %s\n", error->message);
 
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED)
@@ -3935,6 +4286,7 @@ API int tethering_wifi_set_wps_pin(tethering_h tethering, const char *wps_pin)
 
                g_error_free(error);
                return ret;
+               //LCOV_EXCL_STOP
        }
 
        if (parameters != NULL) {