Add missing description for doxygen doc
[platform/core/api/connection.git] / src / connection.c
index e01c914..8def171 100755 (executable)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <vconf/vconf.h>
 #include <system_info.h>
 
 #include "net_connection_private.h"
 
-static __thread GSList *conn_handle_list = NULL;
-static int tv_profile = -1; // Unknown
+static GSList *conn_handle_list = NULL;
 
 //LCOV_EXCL_START
 static int __connection_convert_net_state(int status)
@@ -74,368 +74,243 @@ static bool __connection_check_handle_validity(connection_h connection)
        return ret;
 }
 
-static connection_type_changed_cb
-__connection_get_type_changed_callback(connection_handle_s *local_handle)
+bool _connection_check_handle_validity(connection_h connection)
 {
-       return local_handle->type_changed_callback;
+       return __connection_check_handle_validity(connection);
 }
 
-static void *__connection_get_type_changed_userdata(
-                                                       connection_handle_s *local_handle)
+void *_connection_get_default_handle(void)
 {
-       return local_handle->type_changed_user_data;
-}
-
-static gboolean __connection_cb_type_changed_cb_idle(gpointer user_data)
-{
-       int state, status;
-       void *data;
-       connection_type_changed_cb callback;
-       connection_handle_s *local_handle = (connection_handle_s *)user_data;
-
-       if (__connection_check_handle_validity((connection_h)local_handle) != true)
-               return FALSE;
+       GSList *list = NULL;
 
-       if (vconf_get_int(VCONFKEY_NETWORK_STATUS, &status) != 0)
-               return FALSE;
+       for (list = conn_handle_list; list; list = list->next)
+               if (list->data)
+                       return list->data;
 
-       state = __connection_convert_net_state(status);
+       return NULL;
+}
 
-       callback = __connection_get_type_changed_callback(local_handle);
-       data = __connection_get_type_changed_userdata(local_handle);
-       if (callback)
-               callback(state, data);
+void _connection_handle_ref(connection_handle_s *handle)
+{
+       CONNECTION_LOG(CONNECTION_INFO, "%p ref %d",
+                       handle, handle->refcount + 1);
 
-       return FALSE;
+       __sync_fetch_and_add(&handle->refcount, 1);
 }
 
-static void __connection_cb_type_change_cb(keynode_t *node, void *user_data)
+void _connection_handle_unref(connection_handle_s *handle)
 {
-       GSList *list;
-       connection_h handle;
+       CONNECTION_LOG(CONNECTION_INFO, "%p ref %d",
+                       handle, handle->refcount - 1);
 
-       if (_connection_is_created() != true) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-                               "If multi-threaded, thread integrity be broken.");
+       if (__sync_fetch_and_sub(&handle->refcount, 1) != 1)
                return;
-       }
 
-       for (list = conn_handle_list; list; list = list->next) {
-               handle = (connection_h)list->data;
-               _connection_callback_add(__connection_cb_type_changed_cb_idle, (gpointer)handle);
-       }
+       conn_handle_list = g_slist_remove(conn_handle_list, handle);
+       _connection_libnet_deinit(handle, (conn_handle_list == NULL));
+
+       g_free(handle);
 }
 
-static void __connection_cb_ethernet_cable_state_changed_cb(connection_ethernet_cable_state_e state)
+static void __connection_dummy_type_changed_cb(connection_type_e type, void* user_data)
 {
-       CONNECTION_LOG(CONNECTION_INFO, "Ethernet Cable state Indication");
-
-       GSList *list;
-
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->ethernet_cable_state_changed_callback)
-                       local_handle->ethernet_cable_state_changed_callback(state,
-                                       local_handle->ethernet_cable_state_changed_user_data);
-       }
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
 }
 
-static int __connection_get_ethernet_cable_state_changed_callback_count(void)
+static void __connection_set_type_changed_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       GSList *list;
-       int count = 0;
-
-       for (list = conn_handle_list; list; list = list->next) {
-               connection_handle_s *local_handle = (connection_handle_s *)list->data;
-               if (local_handle->ethernet_cable_state_changed_callback) count++;
-       }
-
-       return count;
+       conn_handle->type_changed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->type_changed_callback = callback;
+       else
+               conn_handle->type_changed_callback = __connection_dummy_type_changed_cb;
 }
 
-static int __connection_set_type_changed_callback(connection_h connection,
-                                                       void *callback, void *user_data)
+static void __connection_dummy_address_changed_cb(const char* ipv4_address,
+                       const char* ipv6_address, void* user_data)
 {
-       static __thread gint refcount = 0;
-       connection_handle_s *local_handle;
-
-       local_handle = (connection_handle_s *)connection;
-
-       if (callback) {
-               if (refcount == 0)
-                       vconf_notify_key_changed(VCONFKEY_NETWORK_STATUS,
-                                       __connection_cb_type_change_cb, NULL);
-
-               refcount++;
-               CONNECTION_LOG(CONNECTION_INFO, "Successfully registered(%d)", refcount);
-       } else {
-               if (refcount > 0 &&
-                               __connection_get_type_changed_callback(local_handle) != NULL) {
-                       if (--refcount == 0) {
-                               if (vconf_ignore_key_changed(VCONFKEY_NETWORK_STATUS,
-                                               __connection_cb_type_change_cb) < 0) {
-                                       CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
-                                                       "Error to de-register vconf callback(%d)", refcount);
-                               } else {
-                                       CONNECTION_LOG(CONNECTION_INFO,
-                                                       "Successfully de-registered(%d)", refcount);
-                               }
-                       }
-               }
-       }
-
-       local_handle->type_changed_user_data = user_data;
-       local_handle->type_changed_callback = callback;
-
-       return CONNECTION_ERROR_NONE;
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
 }
 
-static connection_address_changed_cb
-__connection_get_ip_changed_callback(connection_handle_s *local_handle)
+static void __connection_set_ip_changed_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       return local_handle->ip_changed_callback;
+       conn_handle->ip_changed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->ip_changed_callback = callback;
+       else
+               conn_handle->ip_changed_callback = __connection_dummy_address_changed_cb;
 }
 
-static void *__connection_get_ip_changed_userdata(
-                                                       connection_handle_s *local_handle)
+static void __connection_set_proxy_changed_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       return local_handle->ip_changed_user_data;
+       conn_handle->proxy_changed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->proxy_changed_callback = callback;
+       else
+               conn_handle->proxy_changed_callback = __connection_dummy_address_changed_cb;
 }
 
-static gboolean __connection_cb_ip_changed_cb_idle(gpointer user_data)
+static void __connection_dummy_dhcp_state_changed_cb(connection_dhcp_state_e state,
+            const char *interface_name, connection_error_e result, void *user_data)
 {
-       char *ip_addr;
-       void *data;
-       connection_address_changed_cb callback;
-       connection_handle_s *local_handle = (connection_handle_s *)user_data;
-
-       if (__connection_check_handle_validity((connection_h)local_handle) != true)
-               return FALSE;
-
-       ip_addr = vconf_get_str(VCONFKEY_NETWORK_IP);
-       if (ip_addr == NULL)
-               CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
-                       "vconf_get_str(VCONFKEY_NETWORK_IP) is Failed");
-
-       callback = __connection_get_ip_changed_callback(local_handle);
-       data = __connection_get_ip_changed_userdata(local_handle);
-       /* TODO: IPv6 should be supported */
-       if (callback)
-               callback(ip_addr, NULL, data);
-
-       g_free(ip_addr);
-
-       return FALSE;
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
 }
 
-static void __connection_cb_ip_change_cb(keynode_t *node, void *user_data)
+static void __connection_set_dhcp_state_changed_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       GSList *list;
-       connection_h handle;
-
-       if (_connection_is_created() != true) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-                               "If multi-threaded, thread integrity be broken.");
-               return;
-       }
-
-       for (list = conn_handle_list; list; list = list->next) {
-               handle = (connection_h)list->data;
-               _connection_callback_add(__connection_cb_ip_changed_cb_idle, (gpointer)handle);
-       }
+       conn_handle->dhcp_state_changed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->dhcp_state_changed_callback = callback;
+       else
+               conn_handle->dhcp_state_changed_callback = __connection_dummy_dhcp_state_changed_cb;
 }
 
-static int __connection_set_ip_changed_callback(connection_h connection,
-                                                       void *callback, void *user_data)
+static void __connection_dummy_internet_state_changed_cb(connection_internet_state_e state,
+                       void* user_data)
 {
-       static __thread gint refcount = 0;
-       connection_handle_s *local_handle;
-
-       local_handle = (connection_handle_s *)connection;
-
-       if (callback) {
-               if (refcount == 0)
-                       vconf_notify_key_changed(VCONFKEY_NETWORK_IP,
-                                       __connection_cb_ip_change_cb, NULL);
-
-               refcount++;
-               CONNECTION_LOG(CONNECTION_INFO, "Successfully registered(%d)", refcount);
-       } else {
-               if (refcount > 0 &&
-                               __connection_get_ip_changed_callback(local_handle) != NULL) {
-                       if (--refcount == 0) {
-                               if (vconf_ignore_key_changed(VCONFKEY_NETWORK_IP,
-                                               __connection_cb_ip_change_cb) < 0) {
-                                       CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
-                                                       "Error to de-register vconf callback(%d)", refcount);
-                               } else {
-                                       CONNECTION_LOG(CONNECTION_INFO,
-                                                       "Successfully de-registered(%d)", refcount);
-                               }
-                       }
-               }
-       }
-
-       local_handle->ip_changed_user_data = user_data;
-       local_handle->ip_changed_callback = callback;
-
-       return CONNECTION_ERROR_NONE;
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
 }
 
-static connection_address_changed_cb
-__connection_get_proxy_changed_callback(connection_handle_s *local_handle)
+static void __connection_set_internet_state_changed_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       return local_handle->proxy_changed_callback;
+       conn_handle->internet_state_changed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->internet_state_changed_callback = callback;
+       else
+               conn_handle->internet_state_changed_callback = __connection_dummy_internet_state_changed_cb;
 }
 
-static void *__connection_get_proxy_changed_userdata(
-                                                       connection_handle_s *local_handle)
+static void __connection_dummy_ethernet_cable_state_changed_cb(connection_ethernet_cable_state_e state,
+                       void* user_data)
 {
-       return local_handle->proxy_changed_user_data;
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
 }
 
-static gboolean __connection_cb_proxy_changed_cb_idle(gpointer user_data)
+static void __connection_set_ethernet_cable_state_changed_cb(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       char *proxy;
-       void *data;
-       connection_address_changed_cb callback;
-       connection_handle_s *local_handle = (connection_handle_s *)user_data;
-
-       if (__connection_check_handle_validity((connection_h)local_handle) != true)
-               return FALSE;
-
-       proxy = vconf_get_str(VCONFKEY_NETWORK_PROXY);
-       if (proxy == NULL)
-               CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
-                       "vconf_get_str(VCONFKEY_NETWORK_PROXY) is Failed");
-
-       callback = __connection_get_proxy_changed_callback(local_handle);
-       data = __connection_get_proxy_changed_userdata(local_handle);
-       /* TODO: IPv6 should be supported */
-       if (callback)
-               callback(proxy, NULL, data);
-
-       g_free(proxy);
-
-       return FALSE;
+       conn_handle->ethernet_cable_state_changed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->ethernet_cable_state_changed_callback = callback;
+       else
+               conn_handle->ethernet_cable_state_changed_callback = __connection_dummy_ethernet_cable_state_changed_cb;
 }
 
-static void __connection_cb_proxy_change_cb(keynode_t *node, void *user_data)
+static void __connection_dummy_set_default_cb(connection_error_e result, void* user_data)
 {
-       GSList *list;
-       connection_h handle;
-
-       if (_connection_is_created() != true) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-                               "If multi-threaded, thread integrity be broken.");
-               return;
-       }
-
-       for (list = conn_handle_list; list; list = list->next) {
-               handle = (connection_h)list->data;
-               _connection_callback_add(__connection_cb_proxy_changed_cb_idle, (gpointer)handle);
-       }
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
 }
 
-static int __connection_set_proxy_changed_callback(connection_h connection,
-                                                       void *callback, void *user_data)
+static void __connection_set_default_cellular_service_profile_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       static __thread gint refcount = 0;
-       connection_handle_s *local_handle;
-
-       local_handle = (connection_handle_s *)connection;
-
-       if (callback) {
-               if (refcount == 0)
-                       vconf_notify_key_changed(VCONFKEY_NETWORK_PROXY,
-                                       __connection_cb_proxy_change_cb, NULL);
-
-               refcount++;
-               CONNECTION_LOG(CONNECTION_INFO, "Successfully registered(%d)", refcount);
-       } else {
-               if (refcount > 0 &&
-                               __connection_get_proxy_changed_callback(local_handle) != NULL) {
-                       if (--refcount == 0) {
-                               if (vconf_ignore_key_changed(VCONFKEY_NETWORK_PROXY,
-                                               __connection_cb_proxy_change_cb) < 0) {
-                                       CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
-                                                       "Error to de-register vconf callback(%d)", refcount);
-                               } else {
-                                       CONNECTION_LOG(CONNECTION_INFO,
-                                                       "Successfully de-registered(%d)", refcount);
-                               }
-                       }
-               }
-       }
-
-       local_handle->proxy_changed_user_data = user_data;
-       local_handle->proxy_changed_callback = callback;
-
-       return CONNECTION_ERROR_NONE;
+       conn_handle->set_default_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->set_default_callback = callback;
+       else
+               conn_handle->set_default_callback = __connection_dummy_set_default_cb;
 }
 
-static int __connection_set_ethernet_cable_state_changed_cb(connection_h connection,
-               connection_ethernet_cable_state_chaged_cb callback, void *user_data)
+static void __connection_dummy_opened_cb(connection_error_e result, void* user_data)
 {
-       connection_handle_s *local_handle = (connection_handle_s *)connection;
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
+}
 
-       if (callback) {
-               if (__connection_get_ethernet_cable_state_changed_callback_count() == 0)
-                       _connection_libnet_set_ethernet_cable_state_changed_cb(
-                                       __connection_cb_ethernet_cable_state_changed_cb);
+static void __connection_open_profile_set_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
+{
+       conn_handle->opened_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->opened_callback = callback;
+       else
+               conn_handle->opened_callback = __connection_dummy_opened_cb;
+}
 
-       } else {
-               if (__connection_get_ethernet_cable_state_changed_callback_count() == 1)
-                       _connection_libnet_set_ethernet_cable_state_changed_cb(NULL);
-       }
+static void __connection_dummy_closed_cb(connection_error_e result, void* user_data)
+{
+       CONNECTION_LOG(CONNECTION_INFO, "Dummy callback");
+}
 
-       local_handle->ethernet_cable_state_changed_callback = callback;
-       local_handle->ethernet_cable_state_changed_user_data = user_data;
-       return CONNECTION_ERROR_NONE;
+static void __connection_close_profile_set_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
+{
+       conn_handle->closed_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->closed_callback = callback;
+       else
+               conn_handle->closed_callback = __connection_dummy_closed_cb;
 }
-//LCOV_EXCL_STOP
 
-static int __connection_get_handle_count(void)
+static void __connection_reset_profile_set_callback(connection_handle_s *conn_handle,
+                       void *callback, void *user_data)
 {
-       return ((int)g_slist_length(conn_handle_list));
+       conn_handle->reset_user_data = user_data;
+       if (callback != NULL)
+               conn_handle->reset_callback = callback;
+       else
+               conn_handle->reset_callback = __connection_dummy_opened_cb;
 }
+//LCOV_EXCL_STOP
 
 /* Connection Manager ********************************************************/
 EXPORT_API int connection_create(connection_h *connection)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
+       int rv;
+
        if (connection == NULL || __connection_check_handle_validity(*connection)) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       int rv = _connection_libnet_init();
+       *connection = g_try_malloc0(sizeof(connection_handle_s));
+       if (*connection != NULL) {
+               CONNECTION_LOG(CONNECTION_INFO, "New handle created[%p]", *connection);
+       } else {
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+       }
+
+       rv = _connection_libnet_init(*connection);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               g_free(*connection); //LCOV_EXCL_LINE
+               *connection = NULL; //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to create connection[%d]", rv); //LCOV_EXCL_LINE
+               g_free(*connection); //LCOV_EXCL_LINE
+               *connection = NULL; //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
-       *connection = g_try_malloc0(sizeof(connection_handle_s));
-       if (*connection != NULL)
-               CONNECTION_LOG(CONNECTION_INFO, "New handle created[%p]", *connection);
-       else
-               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
-
        conn_handle_list = g_slist_prepend(conn_handle_list, *connection);
+       _connection_handle_ref(*connection);
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_destroy(connection_h connection)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -444,36 +319,72 @@ EXPORT_API int connection_destroy(connection_h connection)
        __connection_set_type_changed_callback(connection, NULL, NULL);
        __connection_set_ip_changed_callback(connection, NULL, NULL);
        __connection_set_proxy_changed_callback(connection, NULL, NULL);
+       __connection_set_internet_state_changed_callback(connection, NULL, NULL);
        __connection_set_ethernet_cable_state_changed_cb(connection, NULL, NULL);
+       __connection_set_dhcp_state_changed_callback(connection, NULL, NULL);
+
+       _connection_handle_unref(connection);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+//LCOV_EXCL_START
+EXPORT_API int connection_create_cs(int tid, connection_h *connection)
+{
+       int rv;
+
+       rv = connection_create(connection);
+       if (rv == CONNECTION_ERROR_NONE) {
+               CONN_LOCK;
+               _connection_set_cs_tid(tid, *connection);
+               CONN_UNLOCK;
+       }
 
-       conn_handle_list = g_slist_remove(conn_handle_list, connection);
+       return rv;
+}
+
+EXPORT_API int connection_destroy_cs(int tid, connection_h connection)
+{
+       int rv;
 
-       g_free(connection);
-       connection = NULL;
+       CONN_LOCK;
 
-       if (__connection_get_handle_count() == 0) {
-               _connection_libnet_deinit();
-               _connection_callback_cleanup();
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return CONNECTION_ERROR_NONE;
+       CONNECTION_LOG(CONNECTION_INFO, "Destroy connection handle: %p", connection);
+       _connection_unset_cs_tid(tid, connection);
+       CONN_UNLOCK;
+
+       rv = connection_destroy(connection);
+
+       return rv;
 }
+//LCOV_EXCL_STOP
 
-EXPORT_API int connection_get_type(connection_h connection, connection_type_etype)
+EXPORT_API int connection_get_type(connection_h connection, connection_type_e *type)
 {
        int rv = 0;
        int status = 0;
 
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (type == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       rv = vconf_get_int(VCONFKEY_NETWORK_STATUS, &status);
+       rv = _connection_vconf_get_int(connection, VCONFKEY_NETWORK_STATUS, &status);
        if (rv != VCONF_OK) {
                CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_int Failed = %d", status); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
@@ -481,70 +392,87 @@ EXPORT_API int connection_get_type(connection_h connection, connection_type_e* t
 
        *type = __connection_convert_net_state(status);
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_ip_address(connection_h connection,
                                connection_address_family_e address_family, char** ip_address)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (ip_address == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        switch (address_family) {
        case CONNECTION_ADDRESS_FAMILY_IPV4:
+               *ip_address = _connection_vconf_get_str(connection, VCONFKEY_NETWORK_IP);
+               break;
        case CONNECTION_ADDRESS_FAMILY_IPV6:
-               *ip_address = vconf_get_str(VCONFKEY_NETWORK_IP);
+               *ip_address = _connection_vconf_get_str(connection, VCONFKEY_NETWORK_IP6);
                break;
        default:
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        if (*ip_address == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_str Failed"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED;//LCOV_EXCL_LINE
        }
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_proxy(connection_h connection,
                                connection_address_family_e address_family, char** proxy)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (proxy == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        switch (address_family) {
        case CONNECTION_ADDRESS_FAMILY_IPV4:
        case CONNECTION_ADDRESS_FAMILY_IPV6:
-               *proxy = vconf_get_str(VCONFKEY_NETWORK_PROXY);
+               *proxy = _connection_vconf_get_str(connection, VCONFKEY_NETWORK_PROXY);
                break;
        default:
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        if (*proxy == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_str Failed"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_mac_address(connection_h connection, connection_type_e type, char** mac_addr)
 {
-       FILE *fp;
+       FILE *fp = NULL;
        char buf[CONNECTION_MAC_INFO_LENGTH + 1];
 
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE, ETHERNET_FEATURE);
 
        if (type == CONNECTION_TYPE_WIFI)
@@ -554,48 +482,42 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
 
        if (mac_addr == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        switch (type) {
        case CONNECTION_TYPE_WIFI:
-               if (__builtin_expect(tv_profile == -1, 0)) {
-                       char *profileName;
-                       system_info_get_platform_string("http://tizen.org/feature/profile", &profileName);
-                       if (*profileName == 't' || *profileName == 'T')
-                               tv_profile = 1;
-                       else
-                               tv_profile = 0;
-                       free(profileName);
-               }
-               if (tv_profile == 1) {
+               if (access(WIFI_MAC_INFO_FILE, F_OK) == 0)
                        fp = fopen(WIFI_MAC_INFO_FILE, "r");
-                       if (fp == NULL) {
-                               CONNECTION_LOG(CONNECTION_ERROR, "Failed to open file %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
-                               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
-                       }
 
+               if (fp) {
                        if (fgets(buf, sizeof(buf), fp) == NULL) {
                                CONNECTION_LOG(CONNECTION_ERROR, "Failed to get MAC info from %s", WIFI_MAC_INFO_FILE); //LCOV_EXCL_LINE
                                fclose(fp); //LCOV_EXCL_LINE
-                               return CONNECTION_ERROR_OPERATION_FAILED;
+                               CONN_UNLOCK; //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
                        }
 
-                       CONNECTION_LOG(CONNECTION_INFO, "%s : %s", WIFI_MAC_INFO_FILE, buf);
+                       CONNECTION_LOG(CONNECTION_INFO, "%s : %s", WIFI_MAC_INFO_FILE, buf); //LCOV_EXCL_LINE
 
-                       *mac_addr = (char *)malloc(CONNECTION_MAC_INFO_LENGTH + 1);
-                       if (*mac_addr == NULL) {
-                               CONNECTION_LOG(CONNECTION_ERROR, "malloc() failed"); //LCOV_EXCL_LINE
-                               fclose(fp); //LCOV_EXCL_LINE
-                               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
-                       }
-                       g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
-                       fclose(fp);
+                       *mac_addr = g_strdup(buf); //LCOV_EXCL_LINE
+                       fclose(fp); //LCOV_EXCL_LINE
                } else {
-                       *mac_addr = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
+                       *mac_addr = _connection_vconf_get_str(connection, VCONFKEY_WIFI_BSSID_ADDRESS);
 
                        if (*mac_addr == NULL) {
                                CONNECTION_LOG(CONNECTION_ERROR, "Failed to get vconf from %s", VCONFKEY_WIFI_BSSID_ADDRESS); //LCOV_EXCL_LINE
+                               CONN_UNLOCK; //LCOV_EXCL_LINE
+                               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+                       }
+
+                       if (strlen(*mac_addr) == 0) {
+                               CONNECTION_LOG(CONNECTION_ERROR, "Mac address is invalid" //LCOV_EXCL_LINE
+                                       " from %s", VCONFKEY_WIFI_BSSID_ADDRESS); //LCOV_EXCL_LINE
+                               g_free(*mac_addr); //LCOV_EXCL_LINE
+                               *mac_addr = NULL; //LCOV_EXCL_LINE
+                               CONN_UNLOCK; //LCOV_EXCL_LINE
                                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
                        }
                }
@@ -605,48 +527,70 @@ EXPORT_API int connection_get_mac_address(connection_h connection, connection_ty
                fp = fopen(ETHERNET_MAC_INFO_FILE, "r");
                if (fp == NULL) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Failed to open file %s", ETHERNET_MAC_INFO_FILE);
+                       CONN_UNLOCK;
                        return CONNECTION_ERROR_OUT_OF_MEMORY;
                }
 
                if (fgets(buf, sizeof(buf), fp) == NULL) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Failed to get MAC info from %s", ETHERNET_MAC_INFO_FILE);
                        fclose(fp);
+                       CONN_UNLOCK;
                        return CONNECTION_ERROR_OPERATION_FAILED;
                }
 
                CONNECTION_LOG(CONNECTION_INFO, "%s : %s", ETHERNET_MAC_INFO_FILE, buf);
 
-               *mac_addr = (char *)malloc(CONNECTION_MAC_INFO_LENGTH + 1);
-               if (*mac_addr == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "malloc() failed");
-                       fclose(fp);
-                       return CONNECTION_ERROR_OUT_OF_MEMORY;
-               }
-
-               g_strlcpy(*mac_addr, buf, CONNECTION_MAC_INFO_LENGTH + 1);
+               *mac_addr = g_strdup(buf);
                fclose(fp);
-
                break;
        //LCOV_EXCL_STOP
-       default :
+       default:
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        /* Checking Invalid MAC Address */
-       if ((strcmp(*mac_addr, "00:00:00:00:00:00") == 0) ||
+       if (*mac_addr == NULL || (strcmp(*mac_addr, "00:00:00:00:00:00") == 0) ||
                        (strcmp(*mac_addr, "ff:ff:ff:ff:ff:ff") == 0)) {
                CONNECTION_LOG(CONNECTION_ERROR, "MAC Address(%s) is invalid", *mac_addr); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_OPERATION; //LCOV_EXCL_LINE
        }
 
        CONNECTION_LOG(CONNECTION_INFO, "MAC Address %s", *mac_addr);
 
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+
+EXPORT_API int connection_is_metered_network(connection_h connection, bool* is_metered)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (is_metered == NULL || !(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       int rv = _connection_libnet_get_metered_state(connection, is_metered);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get metered state[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONNECTION_LOG(CONNECTION_INFO, "metered state: %s", is_metered ? "true" : "false");
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 
-EXPORT_API int connection_get_cellular_state(connection_h connection, connection_cellular_state_estate)
+EXPORT_API int connection_get_cellular_state(connection_h connection, connection_cellular_state_e *state)
 {
        int rv = 0;
        int status = 0;
@@ -655,16 +599,20 @@ EXPORT_API int connection_get_cellular_state(connection_h connection, connection
        int sim_id = 0;
 #endif
 
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_STATE, &status);
+       rv = _connection_vconf_get_int(connection, VCONFKEY_NETWORK_CELLULAR_STATE, &status);
        if (rv != VCONF_OK) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to get cellular state"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
@@ -673,31 +621,34 @@ EXPORT_API int connection_get_cellular_state(connection_h connection, connection
 
        if (*state == CONNECTION_CELLULAR_STATE_AVAILABLE) {
 #if defined TIZEN_DUALSIM_ENABLE
-               rv = vconf_get_int(VCONF_TELEPHONY_DEFAULT_DATA_SERVICE, &sim_id);
+               rv = _connection_vconf_get_int(connection, VCONF_TELEPHONY_DEFAULT_DATA_SERVICE, &sim_id);
                if (rv != VCONF_OK) {
                        CONNECTION_LOG(CONNECTION_ERROR,
                                        "Failed to get default subscriber id", sim_id);
+                       CONN_UNLOCK;
                        return CONNECTION_ERROR_OPERATION_FAILED;
                }
 
                switch (sim_id) {
                case CONNECTION_CELLULAR_SUBSCRIBER_1:
 #endif
-                       rv = vconf_get_int(VCONFKEY_DNET_STATE, &cellular_state);
+                       rv = _connection_vconf_get_int(connection, VCONFKEY_DNET_STATE, &cellular_state);
 #if defined TIZEN_DUALSIM_ENABLE
                        break;
 
                case CONNECTION_CELLULAR_SUBSCRIBER_2:
-                       rv = vconf_get_int(VCONFKEY_DNET_STATE2, &cellular_state);
+                       rv = _connection_vconf_get_int(connection, VCONFKEY_DNET_STATE2, &cellular_state);
                        break;
 
                default:
                        CONNECTION_LOG(CONNECTION_ERROR, "Invalid subscriber id:%d", sim_id);
+                       CONN_UNLOCK;
                        return CONNECTION_ERROR_OPERATION_FAILED;
                }
 #endif
                if (rv != VCONF_OK) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Failed to get cellular state"); //LCOV_EXCL_LINE
+                       CONN_UNLOCK; //LCOV_EXCL_LINE
                        return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
                }
        }
@@ -709,265 +660,521 @@ EXPORT_API int connection_get_cellular_state(connection_h connection, connection
                        cellular_state == VCONFKEY_DNET_TRANSFER)
                *state = CONNECTION_CELLULAR_STATE_CONNECTED;
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
-EXPORT_API int connection_get_wifi_state(connection_h connection, connection_wifi_state_estate)
+EXPORT_API int connection_get_wifi_state(connection_h connection, connection_wifi_state_e *state)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       int rv = _connection_libnet_get_wifi_state(state);
+       int rv = _connection_libnet_get_wifi_state(connection, state);
        if (rv != CONNECTION_ERROR_NONE) {
                CONNECTION_LOG(CONNECTION_ERROR, "Fail to get Wi-Fi state[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return rv; //LCOV_EXCL_LINE
        }
 
        CONNECTION_LOG(CONNECTION_INFO, "Wi-Fi state: %d", *state);
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
-//LCOV_EXCL_START
 EXPORT_API int connection_get_ethernet_state(connection_h connection, connection_ethernet_state_e *state)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_get_ethernet_state(state);
+       int rv = _connection_libnet_get_ethernet_state(connection, state);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get ethernet state[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_ethernet_cable_state(connection_h connection, connection_ethernet_cable_state_e *state)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_get_ethernet_cable_state(state);
+       int rv = _connection_libnet_get_ethernet_cable_state(connection, state);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get ethernet cable state[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_get_dhcp_state(connection_h connection,
+               const char *interface_name, connection_dhcp_state_e *state)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (interface_name == NULL || state == NULL ||
+                       !(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+       }
+
+       int rv = _connection_libnet_get_dhcp_state(connection, interface_name, state);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get DHCP  state[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK; //LCOV_EXCL_LINE
+       return CONNECTION_ERROR_NONE; //LCOV_EXCL_LINE
 }
 
 EXPORT_API int connection_set_ethernet_cable_state_chaged_cb(connection_h connection,
                          connection_ethernet_cable_state_chaged_cb callback, void *user_data)
 {
+       DEPRECATED_LOG(__FUNCTION__, "connection_set_ethernet_cable_state_changed_cb");
+
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
 
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_ethernet_cable_state_changed_cb(connection,
-                                                       callback, user_data);
+       DEPRECATED_LOG("connection_ethernet_cable_state_chaged_cb",
+                       "connection_ethernet_cable_state_changed_cb");
+
+       __connection_set_ethernet_cable_state_changed_cb(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_unset_ethernet_cable_state_chaged_cb(connection_h connection)
 {
+       DEPRECATED_LOG(__FUNCTION__, "connection_unset_ethernet_cable_state_changed_cb");
+
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_ethernet_cable_state_changed_cb(connection,
-                                                       NULL, NULL);
+       __connection_set_ethernet_cable_state_changed_cb(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_set_ethernet_cable_state_changed_cb(connection_h connection,
+                         connection_ethernet_cable_state_changed_cb callback, void *user_data)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
+
+       if (callback == NULL || !(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       __connection_set_ethernet_cable_state_changed_cb(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_unset_ethernet_cable_state_changed_cb(connection_h connection)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       __connection_set_ethernet_cable_state_changed_cb(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
-//LCOV_EXCL_STOP
 
 EXPORT_API int connection_get_bt_state(connection_h connection, connection_bt_state_e *state)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TETHERING_BLUETOOTH_FEATURE);
 
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       return _connection_libnet_get_bluetooth_state(state);
+       int rv = _connection_libnet_get_bluetooth_state(connection, state);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get bluetooth state[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
+//LCOV_EXCL_START
 EXPORT_API int connection_set_type_changed_cb(connection_h connection,
                                        connection_type_changed_cb callback, void* user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_type_changed_callback(connection, callback, user_data);
+       __connection_set_type_changed_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_unset_type_changed_cb(connection_h connection)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_type_changed_callback(connection, NULL, NULL);
+       __connection_set_type_changed_callback(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
+//LCOV_EXCL_STOP
 
 EXPORT_API int connection_set_ip_address_changed_cb(connection_h connection,
                                connection_address_changed_cb callback, void* user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_ip_changed_callback(connection, callback, user_data);
-}
+       __connection_set_ip_changed_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
 
 EXPORT_API int connection_unset_ip_address_changed_cb(connection_h connection)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_ip_changed_callback(connection, NULL, NULL);
+       __connection_set_ip_changed_callback(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_set_proxy_address_changed_cb(connection_h connection,
                                connection_address_changed_cb callback, void* user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (callback == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_proxy_changed_callback(connection, callback, user_data);
+       __connection_set_proxy_changed_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_unset_proxy_address_changed_cb(connection_h connection)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __connection_set_proxy_changed_callback(connection, NULL, NULL);
+       __connection_set_proxy_changed_callback(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_set_dhcp_state_changed_cb(connection_h connection,
+               connection_dhcp_state_changed_cb callback, void *user_data)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (callback == NULL || !(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       __connection_set_dhcp_state_changed_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_unset_dhcp_state_changed_cb(connection_h connection)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       __connection_set_dhcp_state_changed_callback(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_set_internet_state_changed_cb(connection_h connection,
+               connection_internet_state_changed_cb callback, void *user_data)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (callback == NULL || !(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       __connection_set_internet_state_changed_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_unset_internet_state_changed_cb(connection_h connection)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       __connection_set_internet_state_changed_callback(connection, NULL, NULL);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_add_profile(connection_h connection, connection_profile_h profile)
 {
        int rv = 0;
-       net_profile_info_t *profile_info = profile;
+       connection_handle_s *conn_handle = (connection_handle_s *)connection;
+       net_profile_info_t *profile_info = (net_profile_info_t *)profile;
+
+       CONN_LOCK;
 
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
            !(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       if (profile_info->ProfileInfo.Pdp.PSModemPath[0] != '/' ||
-                       strlen(profile_info->ProfileInfo.Pdp.PSModemPath) < 2) {
+       if (profile_info->profile_info.pdp.ps_modem_path[0] != '/' ||
+                       strlen(profile_info->profile_info.pdp.ps_modem_path) < 2) {
                CONNECTION_LOG(CONNECTION_ERROR, "Modem object path is NULL"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_add_profile(profile_info->ProfileInfo.Pdp.ServiceType,
-                                                       (net_profile_info_t*)profile);
+       rv = net_add_profile(conn_handle->network_info_handle,
+                               profile_info->profile_info.pdp.service_type, profile_info);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_remove_profile(connection_h connection, connection_profile_h profile)
 {
        int rv = 0;
-       net_profile_info_t *profile_info = profile;
+       connection_handle_s *conn_handle = (connection_handle_s *)connection;
+       net_profile_info_t *profile_info = (net_profile_info_t *)profile;
+
+       CONN_LOCK;
 
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
-                       !(_connection_libnet_check_profile_validity(profile))) {
+               !(_connection_libnet_check_profile_validity(profile))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        if (profile_info->profile_type != NET_DEVICE_CELLULAR &&
+               profile_info->profile_type != NET_DEVICE_MESH &&
            profile_info->profile_type != NET_DEVICE_WIFI) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_delete_profile(profile_info->ProfileName);
+       rv = net_delete_profile(conn_handle->network_info_handle, profile_info->profile_name);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to delete profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_update_profile(connection_h connection, connection_profile_h profile)
 {
        int rv = 0;
-       net_profile_info_t *profile_info = profile;
+       connection_handle_s *conn_handle = (connection_handle_s *)connection;
+       net_profile_info_t *profile_info = (net_profile_info_t *)profile;
+
+       CONN_LOCK;
 
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
            !(_connection_libnet_check_profile_validity(profile))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       rv = net_modify_profile(profile_info->ProfileName, (net_profile_info_t*)profile);
+       rv = net_modify_profile(conn_handle->network_info_handle,
+                       profile_info->profile_name, (net_profile_info_t*)profile);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to modify profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
+       CONN_UNLOCK;
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_profile_iterator(connection_h connection,
-               connection_iterator_type_e type, connection_profile_iterator_hprofile_iterator)
+               connection_iterator_type_e type, connection_profile_iterator_h *profile_iterator)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
@@ -975,187 +1182,432 @@ EXPORT_API int connection_get_profile_iterator(connection_h connection,
             type != CONNECTION_ITERATOR_TYPE_CONNECTED &&
             type != CONNECTION_ITERATOR_TYPE_DEFAULT)) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_get_profile_iterator(type, profile_iterator);
+       int rv = _connection_libnet_get_profile_iterator(connection, type, profile_iterator);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get profile iterator [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_profile_iterator_next(connection_profile_iterator_h profile_iterator,
-                                                       connection_profile_hprofile)
+                                                       connection_profile_h *profile)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
-       return _connection_libnet_get_iterator_next(profile_iterator, profile);
+       int rv = _connection_libnet_get_iterator_next(profile_iterator, profile);
+
+       CONN_UNLOCK;
+       return rv;
 }
 
 EXPORT_API bool connection_profile_iterator_has_next(connection_profile_iterator_h profile_iterator)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
-       return _connection_libnet_iterator_has_next(profile_iterator);
+       int rv = _connection_libnet_iterator_has_next(profile_iterator);
+
+       CONN_UNLOCK;
+       return rv;
 }
 
 EXPORT_API int connection_destroy_profile_iterator(connection_profile_iterator_h profile_iterator)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
-       return _connection_libnet_destroy_iterator(profile_iterator);
+       int rv = _connection_libnet_destroy_iterator(profile_iterator);
+
+       CONN_UNLOCK;
+       return rv;
 }
 
-EXPORT_API int connection_get_current_profile(connection_h connection, connection_profile_hprofile)
+EXPORT_API int connection_get_current_profile(connection_h connection, connection_profile_h *profile)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) || profile == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_get_current_profile(profile);
+       int rv = _connection_libnet_get_current_profile(connection, profile);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get current profile [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_get_default_cellular_service_profile(
                connection_h connection, connection_cellular_service_type_e type,
                connection_profile_h *profile)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) || profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+       }
+
+       int rv = _connection_libnet_get_cellular_service_profile(connection, type, profile);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get default cellular service profile [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
-       return _connection_libnet_get_cellular_service_profile(type, profile);
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_set_default_cellular_service_profile(connection_h connection,
                connection_cellular_service_type_e type, connection_profile_h profile)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) || profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       return _connection_libnet_set_cellular_service_profile_sync(type, profile);
+       int rv = _connection_libnet_set_cellular_service_profile_sync(connection, type, profile);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to set default cellular service profile [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_set_default_cellular_service_profile_async(connection_h connection,
                connection_cellular_service_type_e type, connection_profile_h profile,
                connection_set_default_cb callback, void* user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
+       int rv;
+
        if (!(__connection_check_handle_validity(connection)) ||
            profile == NULL || callback == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_set_cellular_service_profile_async(type, profile, callback, user_data);
+       rv = _connection_libnet_set_cellular_service_profile_async(connection, type, profile);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to set default cellular service profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       __connection_set_default_cellular_service_profile_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_open_profile(connection_h connection, connection_profile_h profile,
                                        connection_opened_cb callback, void* user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
 
+       int rv;
+
        if (!(__connection_check_handle_validity(connection)) ||
            profile == NULL || callback == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_open_profile(profile, callback, user_data);
+       rv = _connection_libnet_open_profile(connection, profile);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to open profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       __connection_open_profile_set_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_close_profile(connection_h connection, connection_profile_h profile,
                                        connection_closed_cb callback, void* user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
 
+       int rv;
+
        if (!(__connection_check_handle_validity(connection)) ||
            profile == NULL || callback == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_close_profile(profile, callback, user_data);
+       rv = _connection_libnet_close_profile(connection, profile);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to close profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       __connection_close_profile_set_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_reset_profile(connection_h connection,
                                connection_reset_option_e type, int id, connection_reset_cb callback, void *user_data)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
 
+       int rv;
+
        if (!(__connection_check_handle_validity(connection))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        if (id < 0 || id > 1) {
                CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       return _connection_libnet_reset_profile(type, id, callback, user_data);
+       rv = _connection_libnet_reset_profile(connection, type, id);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to reset profile[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       __connection_reset_profile_set_callback(connection, callback, user_data);
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_add_route(connection_h connection, const char* interface_name, const char* host_address)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+       CHECK_FEATURE_SUPPORTED(ROUTE_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
            interface_name == NULL || host_address == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_add_route(interface_name, host_address);
+       int rv = _connection_libnet_add_route(connection, interface_name, host_address);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to add route [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_remove_route(connection_h connection, const char* interface_name, const char* host_address)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+       CHECK_FEATURE_SUPPORTED(ROUTE_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
            interface_name == NULL || host_address == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_remove_route(interface_name, host_address);
+       int rv = _connection_libnet_remove_route(connection, interface_name, host_address);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to remove route [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_add_route_ipv6(connection_h connection, const char *interface_name, const char *host_address, const char * gateway)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
+       CHECK_FEATURE_SUPPORTED(ROUTE_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
            interface_name == NULL || host_address == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_add_route_ipv6(interface_name, host_address, gateway);
+       int rv = _connection_libnet_add_route_ipv6(connection, interface_name, host_address, gateway);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to add route ipv6 [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_remove_route_ipv6(connection_h connection, const char *interface_name, const char *host_address, const char * gateway)
 {
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
+       CHECK_FEATURE_SUPPORTED(ROUTE_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection)) ||
+           interface_name == NULL || host_address == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       int rv = _connection_libnet_remove_route_ipv6(connection, interface_name, host_address, gateway);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to remove route ipv6 [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_add_route_entry(connection_h connection,
+               connection_address_family_e address_family,     const char *interface_name,
+               const char *host_address, const char *gateway)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
+       CHECK_FEATURE_SUPPORTED(ROUTE_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection)) ||
+               (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
+            address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
+           interface_name == NULL || host_address == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+               int rv = _connection_libnet_add_route_entry(connection, CONNECTION_ADDRESS_FAMILY_IPV4,
+                                                               interface_name, host_address, gateway);
+               CONN_UNLOCK;
+               return rv;
+       } else {
+               int rv = _connection_libnet_add_route_entry(connection, CONNECTION_ADDRESS_FAMILY_IPV6,
+                                                               interface_name, host_address, gateway);
+               CONN_UNLOCK;
+               return rv;
+       }
+}
+
+EXPORT_API int connection_remove_route_entry(connection_h connection,
+               connection_address_family_e address_family,     const char *interface_name,
+               const char *host_address, const char *gateway)
+{
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, ETHERNET_FEATURE);
+       CHECK_FEATURE_SUPPORTED(ROUTE_FEATURE);
 
        if (!(__connection_check_handle_validity(connection)) ||
+               (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
+            address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            interface_name == NULL || host_address == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return _connection_libnet_remove_route_ipv6(interface_name, host_address, gateway);
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+               int rv = _connection_libnet_remove_route_entry(connection, CONNECTION_ADDRESS_FAMILY_IPV4,
+                                                               interface_name, host_address, gateway);
+               CONN_UNLOCK;
+               return rv;
+       } else {
+               int rv = _connection_libnet_remove_route_entry(connection, CONNECTION_ADDRESS_FAMILY_IPV6,
+                                                               interface_name, host_address, gateway);
+               CONN_UNLOCK;
+               return rv;
+       }
 }
 
-static int __get_cellular_statistic(connection_statistics_type_e statistics_type, long long *llsize)
+static int __get_cellular_statistic(connection_handle_s *conn_handle,
+               connection_statistics_type_e statistics_type, long long *llsize)
 {
        int rv = VCONF_OK, rv1 = VCONF_OK;
        int last_size = 0, size = 0;
@@ -1165,7 +1617,7 @@ static int __get_cellular_statistic(connection_statistics_type_e statistics_type
 
        if (llsize == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        switch (statistics_type) {
@@ -1179,7 +1631,7 @@ static int __get_cellular_statistic(connection_statistics_type_e statistics_type
        }
 
 #if defined TIZEN_DUALSIM_ENABLE
-       rv = vconf_get_int(VCONF_TELEPHONY_DEFAULT_DATA_SERVICE, &sim_id);
+       rv = _connection_vconf_get_int(conn_handle, VCONF_TELEPHONY_DEFAULT_DATA_SERVICE, &sim_id);
        if (rv != VCONF_OK) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to get default subscriber id");
                *llsize = 0;
@@ -1191,18 +1643,18 @@ static int __get_cellular_statistic(connection_statistics_type_e statistics_type
 #endif
                switch (statistics_type) {
                case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT, &last_size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT, &last_size);
                        break;
                case CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV, &last_size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV, &last_size);
                        break;
                case CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT, &last_size);
-                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT, &size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT, &last_size);
+                       rv1 = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT, &size);
                        break;
                case CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV, &last_size);
-                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV, &size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV, &last_size);
+                       rv1 = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV, &size);
                        break;
                }
 #if defined TIZEN_DUALSIM_ENABLE
@@ -1210,18 +1662,18 @@ static int __get_cellular_statistic(connection_statistics_type_e statistics_type
        case 1:
                switch (statistics_type) {
                case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2, &last_size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2, &last_size);
                        break;
                case CONNECTION_STATISTICS_TYPE_LAST_RECEIVED_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2, &last_size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2, &last_size);
                        break;
                case CONNECTION_STATISTICS_TYPE_TOTAL_SENT_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2, &last_size);
-                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2, &size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_SNT2, &last_size);
+                       rv1 = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_SNT2, &size);
                        break;
                case CONNECTION_STATISTICS_TYPE_TOTAL_RECEIVED_DATA:
-                       rv = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2, &last_size);
-                       rv1 = vconf_get_int(VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2, &size);
+                       rv = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_LAST_RCV2, &last_size);
+                       rv1 = _connection_vconf_get_int(conn_handle, VCONFKEY_NETWORK_CELLULAR_PKT_TOTAL_RCV2, &size);
                        break;
                }
                break;
@@ -1243,7 +1695,7 @@ static int __get_cellular_statistic(connection_statistics_type_e statistics_type
        return CONNECTION_ERROR_NONE;
 }
 
-static int __get_statistic(connection_type_e connection_type,
+static int __get_statistic(connection_handle_s *conn_handle, connection_type_e connection_type,
                connection_statistics_type_e statistics_type, long long *llsize)
 {
        int rv, stat_type;
@@ -1251,7 +1703,7 @@ static int __get_statistic(connection_type_e connection_type,
 
        if (llsize == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        rv  = _connection_libnet_check_get_privilege();
@@ -1259,11 +1711,11 @@ static int __get_statistic(connection_type_e connection_type,
                return rv;
        else if (rv != CONNECTION_ERROR_NONE) {
                CONNECTION_LOG(CONNECTION_ERROR, "Failed to get statistics"); //LCOV_EXCL_LINE
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        if (connection_type == CONNECTION_TYPE_CELLULAR)
-               return __get_cellular_statistic(statistics_type, llsize);
+               return __get_cellular_statistic(conn_handle, statistics_type, llsize);
        else if (connection_type == CONNECTION_TYPE_WIFI) {
                switch (statistics_type) {
                case CONNECTION_STATISTICS_TYPE_LAST_SENT_DATA:
@@ -1282,7 +1734,10 @@ static int __get_statistic(connection_type_e connection_type,
                        return CONNECTION_ERROR_INVALID_PARAMETER;
                }
 
-               rv  = _connection_libnet_get_statistics(stat_type, &ull_size);
+               CONNECTION_LOG(CONNECTION_INFO, "connection type[%d] statistics type[%d]",
+                               connection_type, statistics_type);
+
+               rv  = _connection_libnet_get_statistics(conn_handle, stat_type, &ull_size);
                if (rv == CONNECTION_ERROR_PERMISSION_DENIED)
                        return rv;
                else if (rv != CONNECTION_ERROR_NONE) {
@@ -1299,8 +1754,8 @@ static int __get_statistic(connection_type_e connection_type,
        return CONNECTION_ERROR_NONE;
 }
 
-static int __reset_statistic(connection_type_e connection_type,
-               connection_statistics_type_e statistics_type)
+static int __reset_statistic(connection_handle_s *conn_handle,
+                       connection_type_e connection_type, connection_statistics_type_e statistics_type)
 {
        int conn_type;
        int stat_type;
@@ -1330,7 +1785,7 @@ static int __reset_statistic(connection_type_e connection_type,
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       rv = _connection_libnet_set_statistics(conn_type, stat_type);
+       rv = _connection_libnet_set_statistics(conn_handle, conn_type, stat_type);
        if (rv != CONNECTION_ERROR_NONE)
                return rv;
 
@@ -1343,6 +1798,8 @@ EXPORT_API int connection_get_statistics(connection_h connection,
                                connection_type_e connection_type,
                                connection_statistics_type_e statistics_type, long long* size)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
 
        if (connection_type == CONNECTION_TYPE_CELLULAR)
@@ -1352,16 +1809,27 @@ EXPORT_API int connection_get_statistics(connection_h connection,
 
        if (!(__connection_check_handle_validity(connection)) || size == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __get_statistic(connection_type, statistics_type, size);
+       int rv = __get_statistic(connection, connection_type, statistics_type, size);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get statistics [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK;
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_reset_statistics(connection_h connection,
                                connection_type_e connection_type,
                                connection_statistics_type_e statistics_type)
 {
+       CONN_LOCK;
+
        CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
 
        if (connection_type == CONNECTION_TYPE_CELLULAR)
@@ -1371,9 +1839,293 @@ EXPORT_API int connection_reset_statistics(connection_h connection,
 
        if (!__connection_check_handle_validity(connection)) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       return __reset_statistic(connection_type, statistics_type);
+       int rv = __reset_statistic(connection, connection_type, statistics_type);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get statistics [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK;
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
 }
 
+EXPORT_API int connection_foreach_ipv6_address(connection_h connection,
+               connection_type_e connection_type, connection_ipv6_address_cb callback,
+               void *user_data)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE,
+                       TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       GSList *ipv6_address_list = NULL;
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       int rv = CONNECTION_ERROR_NONE;
+
+       switch (connection_type) {
+       case CONNECTION_TYPE_WIFI:
+               rv = net_foreach_ipv6_address(NET_DEVICE_WIFI,
+                               &ipv6_address_list);
+               break;
+       case CONNECTION_TYPE_CELLULAR:
+               rv = net_foreach_ipv6_address(NET_DEVICE_CELLULAR,
+                               &ipv6_address_list);
+               break;
+       case CONNECTION_TYPE_ETHERNET:
+               rv = net_foreach_ipv6_address(NET_DEVICE_ETHERNET,
+                               &ipv6_address_list);
+               break;
+       case CONNECTION_TYPE_BT:
+               rv = net_foreach_ipv6_address(NET_DEVICE_BLUETOOTH,
+                               &ipv6_address_list);
+               break;
+       default:
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "net_get_multiple_id_address" //LCOV_EXCL_LINE
+                               " Failed = %d\n", rv);
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       GSList *list;
+       for (list = ipv6_address_list; list; list = list->next) {
+               rv = callback((char *)list->data, user_data);
+               if (rv == false)
+                       break;
+       }
+
+       g_slist_free_full(ipv6_address_list, g_free);
+       ipv6_address_list = NULL;
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_profile_start_tcpdump(connection_h connection)
+{
+       int ret = 0;
+
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       ret = _connection_libnet_start_tcpdump(connection);
+       if (ret != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to start tcpdump (%d)", ret); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return ret; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_profile_stop_tcpdump(connection_h connection)
+{
+       int ret = 0;
+
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       ret = _connection_libnet_stop_tcpdump(connection);
+       if (ret != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to stop tcpdump (%d)", ret); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return ret; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_profile_get_tcpdump_state(connection_h connection, gboolean *tcpdump_state)
+{
+       int ret = 0;
+
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection)) || !tcpdump_state) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       ret = _connection_libnet_get_tcpdump_state(connection, tcpdump_state);
+       if (ret != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get the tcpdump state (%d)", ret); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return ret; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_profile_save_ethernet_eap_config(connection_h connection,
+                                                       connection_profile_h profile)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE);
+
+       int rv;
+
+       if (!__connection_check_handle_validity(connection) ||
+               !_connection_libnet_check_profile_validity(profile)) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       rv = _connection_libnet_profile_save_ethernet_eap_config(connection, profile);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to save ethernet eap config."); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+       return CONNECTION_ERROR_NONE;
+}
+
+//LCOV_EXCL_START
+EXPORT_API int connection_clock_is_updated(connection_h connection, bool *updated)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (!(_connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER;//LCOV_EXCL_LINE
+       }
+
+       int rv = _connection_libnet_get_clock_updated(connection, updated);
+
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get clock update information[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONNECTION_LOG(CONNECTION_INFO, "Clock updated: %s", *updated ? "true" : "false");
+       CONN_UNLOCK;
+
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_get_ntp_server(connection_h connection, char **ntp_server)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (ntp_server == NULL || !(_connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER;//LCOV_EXCL_LINE
+       }
+
+       char *server = NULL;
+
+       int rv = _connection_libnet_get_ntp_server(connection, &server);
+
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get ntp server [%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       if (server) {
+               *ntp_server = strdup(server);
+               g_free(server);
+       }
+
+       CONNECTION_LOG(CONNECTION_INFO, "NTP SERVER:  %s", *ntp_server);
+       CONN_UNLOCK;
+
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_set_ntp_server(connection_h connection, const char *ntp_server)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE, ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection)) || ntp_server == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       int rv = _connection_libnet_set_ntp_server(connection, ntp_server);
+
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to set NTP server[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_clear_ntp_server(connection_h connection)
+{
+       CONN_LOCK;
+
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE, ETHERNET_FEATURE);
+
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               CONN_UNLOCK;
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       int rv = _connection_libnet_clear_ntp_server(connection);
+
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to clear NTP server[%d]", rv); //LCOV_EXCL_LINE
+               CONN_UNLOCK; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
+       }
+
+       CONN_UNLOCK;
+
+       return CONNECTION_ERROR_NONE;
+}
+//LCOV_EXCL_STOP