X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flibnetwork.c;h=4788660bb31abdecc3e4310f5f44df63bf781b9f;hb=d3201196ee636106d265a889671ad23b93174c95;hp=7839ab585448aa07931d9b461b4b668b29f05d85;hpb=8e6cc65427f1196fd08d4353e84970d1df5553b6;p=platform%2Fcore%2Fapi%2Fconnection.git

diff --git a/src/libnetwork.c b/src/libnetwork.c
index 7839ab5..4788660 100755
--- a/src/libnetwork.c
+++ b/src/libnetwork.c
@@ -24,8 +24,10 @@
 
 #include "net_connection_private.h"
 
-static __thread GSList *prof_handle_list = NULL;
-static __thread GHashTable *profile_cb_table = NULL;
+static GSList *prof_handle_list = NULL;
+static GHashTable *profile_cb_table = NULL;
+static pthread_mutex_t g_conn_thread_mutex = PTHREAD_MUTEX_INITIALIZER;
+static __thread int g_conn_thread_mutex_ref = 0;
 
 struct _profile_cb_s {
 	connection_profile_state_changed_cb callback;
@@ -34,51 +36,14 @@ struct _profile_cb_s {
 };
 
 struct _profile_list_s {
-	int count;
 	int next;
+	int count;
 	net_profile_info_t *profiles;
 };
 
-struct _libnet_s {
-	connection_opened_cb opened_cb;
-	connection_closed_cb closed_cb;
-	connection_set_default_cb set_default_cb;
-	connection_reset_cb reset_profile_cb;
-	libnet_ethernet_cable_state_changed_cb ethernet_cable_state_changed_cb;
-	void *opened_user_data;
-	void *closed_user_data;
-	void *set_default_user_data;
-	void *reset_profile_user_data;
-	bool is_created;
-};
-
-struct _state_notify {
-	connection_profile_state_changed_cb callback;
-	connection_profile_state_e state;
-	void *user_data;
-};
-
-struct managed_idle_data {
-	GSourceFunc func;
-	gpointer user_data;
-	guint id;
-};
-
-static __thread struct _profile_list_s profile_iterator = {0, 0, NULL};
-static __thread struct _libnet_s libnet = {NULL, NULL, NULL, NULL, NULL, NULL, false};
-static __thread GSList *managed_idler_list = NULL;
-static __thread bool connection_is_feature_checked[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
-static __thread bool connection_feature_supported[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
-
-bool _connection_is_created(void)
-{
-	return libnet.is_created;
-}
-
-static void __connection_set_created(bool tag)
-{
-	libnet.is_created = tag;
-}
+static struct _profile_list_s profile_iterator = {0, 0, NULL};
+static bool connection_is_feature_checked[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
+static bool connection_feature_supported[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
 
 //LCOV_EXCL_START
 static connection_error_e __libnet_convert_to_cp_error_type(net_err_t err_type)
@@ -146,6 +111,10 @@ static const char *__libnet_convert_cp_error_type_to_string(connection_error_e e
 		return "PERMISSION_DENIED";
 	case CONNECTION_ERROR_NOT_SUPPORTED:
 		return "NOT_SUPPORTED";
+	case CONNECTION_ERROR_ALREADY_INITIALIZED:
+		return "ALREADY_INITIALIZED";
+	case CONNECTION_ERROR_NOT_INITIALIZED:
+		return "NOT_INITIALIZED";
 	}
 
 	return "UNKNOWN";
@@ -167,178 +136,10 @@ static const char *__libnet_convert_cp_state_to_string(connection_profile_state_
 	}
 }
 
-static void __libnet_set_reset_profile_cb(connection_opened_cb user_cb, void *user_data)
-{
-	if (user_cb != NULL) {
-		libnet.reset_profile_cb = user_cb;
-		libnet.reset_profile_user_data = user_data;
-	}
-}
-
-static gboolean __libnet_reset_profile_cb_idle(gpointer data)
-{
-	connection_error_e result = (connection_error_e)data;
-
-	if (libnet.reset_profile_cb != NULL)
-		libnet.reset_profile_cb(result, libnet.reset_profile_user_data);
-
-	libnet.reset_profile_cb = NULL;
-	libnet.reset_profile_user_data = NULL;
-
-	return FALSE;
-}
-
-static void __libnet_reset_profile_cb(connection_error_e result)
-{
-	if (_connection_is_created() != true) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-				"If multi-threaded, thread integrity be broken.");
-		return;
-	}
-
-	if (libnet.reset_profile_cb != NULL)
-		_connection_callback_add(__libnet_reset_profile_cb_idle, (gpointer)result);
-}
-
-static void __libnet_set_opened_cb(connection_opened_cb user_cb, void *user_data)
-{
-	if (user_cb != NULL) {
-		libnet.opened_cb = user_cb;
-		libnet.opened_user_data = user_data;
-	}
-}
-
-static gboolean __libnet_opened_cb_idle(gpointer data)
-{
-	connection_error_e result = (connection_error_e)data;
-
-	if (libnet.opened_cb != NULL)
-		libnet.opened_cb(result, libnet.opened_user_data);
-
-	libnet.opened_cb = NULL;
-	libnet.opened_user_data = NULL;
-
-	return FALSE;
-}
-
-static void __libnet_opened_cb(connection_error_e result)
-{
-	if (_connection_is_created() != true) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-				"If multi-threaded, thread integrity be broken.");
-		return;
-	}
-
-	if (libnet.opened_cb != NULL)
-		_connection_callback_add(__libnet_opened_cb_idle, (gpointer)result);
-}
-
-static void __libnet_set_closed_cb(connection_closed_cb user_cb, void *user_data)
-{
-	if (user_cb != NULL) {
-		libnet.closed_cb = user_cb;
-		libnet.closed_user_data = user_data;
-	}
-}
-
-static gboolean __libnet_closed_cb_idle(gpointer data)
-{
-	connection_error_e result = (connection_error_e)data;
-
-	if (libnet.closed_cb != NULL)
-		libnet.closed_cb(result, libnet.closed_user_data);
-
-	libnet.closed_cb = NULL;
-	libnet.closed_user_data = NULL;
-
-	return FALSE;
-}
-
-static void __libnet_closed_cb(connection_error_e result)
-{
-	if (_connection_is_created() != true) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-				"If multi-threaded, thread integrity be broken.");
-		return;
-	}
-
-	if (libnet.closed_cb != NULL)
-		_connection_callback_add(__libnet_closed_cb_idle, (gpointer)result);
-}
-
-static void __libnet_set_default_cb(connection_set_default_cb user_cb, void *user_data)
-{
-	if (user_cb != NULL) {
-		libnet.set_default_cb = user_cb;
-		libnet.set_default_user_data = user_data;
-	}
-}
-
-static gboolean __libnet_default_cb_idle(gpointer data)
-{
-	connection_error_e result = (connection_error_e)data;
-
-	if (libnet.set_default_cb != NULL)
-		libnet.set_default_cb(result, libnet.set_default_user_data);
-
-	libnet.set_default_cb = NULL;
-	libnet.set_default_user_data = NULL;
-
-	return FALSE;
-}
-
-static void __libnet_default_cb(connection_error_e result)
-{
-	if (_connection_is_created() != true) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-				"If multi-threaded, thread integrity be broken.");
-		return;
-	}
-
-	if (libnet.set_default_cb != NULL)
-		_connection_callback_add(__libnet_default_cb_idle, (gpointer)result);
-}
-
-static void __libnet_set_ethernet_cable_state_changed_cb(
-		libnet_ethernet_cable_state_changed_cb user_cb)
-{
-	libnet.ethernet_cable_state_changed_cb = user_cb;
-}
-
-static void __libnet_ethernet_cable_state_changed_cb(
-		connection_ethernet_cable_state_e state)
-{
-	if (libnet.ethernet_cable_state_changed_cb)
-		libnet.ethernet_cable_state_changed_cb(state);
-}
-
-static gboolean __libnet_state_changed_cb_idle(gpointer data)
-{
-	struct _state_notify *notify = (struct _state_notify *)data;
-
-	if (notify == NULL)
-		return FALSE;
-
-	if (notify->callback != NULL)
-		notify->callback(notify->state, notify->user_data);
-
-	g_free(notify);
-
-	return FALSE;
-}
-
 static void __libnet_state_changed_cb(char *profile_name, connection_profile_state_e state)
 {
-	guint id;
-	struct _state_notify *notify;
 	struct _profile_cb_s *cb_info;
 
-	if (_connection_is_created() != true) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
-				"If multi-threaded, thread integrity be broken.");
-		return;
-	}
-
 	if (profile_name == NULL)
 		return;
 
@@ -354,18 +155,7 @@ static void __libnet_state_changed_cb(char *profile_name, connection_profile_sta
 	if (state < 0 || cb_info->callback == NULL)
 		return;
 
-	notify = g_try_new0(struct _state_notify, 1);
-	if (notify == NULL)
-		return;
-
-	notify->callback = cb_info->callback;
-	notify->state = state;
-	notify->user_data = cb_info->user_data;
-
-	id = _connection_callback_add(__libnet_state_changed_cb_idle,
-			(gpointer)notify);
-	if (!id)
-		g_free(notify);
+	cb_info->callback(cb_info->state, cb_info->user_data);
 }
 
 static void __libnet_clear_profile_list(struct _profile_list_s *profile_list)
@@ -380,10 +170,18 @@ static void __libnet_clear_profile_list(struct _profile_list_s *profile_list)
 
 static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
 {
+	CONN_LOCK;
 	bool is_requested = false;
 	connection_error_e result = CONNECTION_ERROR_NONE;
+	connection_handle_s *conn_handle = (connection_handle_s *)user_data;
+
+	if (!_connection_check_handle_validity(conn_handle)) {
+		CONNECTION_LOG(CONNECTION_INFO, "Invalid handle");
+		CONN_UNLOCK;
+		return;
+	}
 
-	switch (event_cb->Event) {
+	switch (event_cb->event) {
 	case NET_EVENT_OPEN_RSP:
 		is_requested = true;
 		/* fall through */
@@ -393,22 +191,30 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
 					(is_requested) ? "RSP" : "IND",
 					__libnet_convert_cp_error_type_to_string(result));
 
-		if (is_requested)
-			__libnet_opened_cb(result);
+		if (is_requested) {
+			if (conn_handle->opened_callback) {
+				conn_handle->opened_callback(result,
+					conn_handle->opened_user_data);
+
+				conn_handle->opened_callback = NULL;
+				conn_handle->opened_user_data = NULL;
+			}
+		}
 
 		switch (event_cb->Error) {
 		case NET_ERR_NONE:
 		case NET_ERR_ACTIVE_CONNECTION_EXISTS:
 			CONNECTION_LOG(CONNECTION_INFO, "Successfully open connection");
 
-			__libnet_state_changed_cb(event_cb->ProfileName, CONNECTION_PROFILE_STATE_CONNECTED);
+			__libnet_state_changed_cb(event_cb->profile_name, CONNECTION_PROFILE_STATE_CONNECTED);
+			CONN_UNLOCK;
 			return;
 		default:
 			CONNECTION_LOG(CONNECTION_ERROR, "Failed to open connection[%s]",
 						__libnet_convert_cp_error_type_to_string(result));
 		}
 
-		__libnet_state_changed_cb(event_cb->ProfileName, CONNECTION_PROFILE_STATE_DISCONNECTED);
+		__libnet_state_changed_cb(event_cb->profile_name, CONNECTION_PROFILE_STATE_DISCONNECTED);
 
 		break;
 	case NET_EVENT_CLOSE_RSP:
@@ -420,14 +226,22 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
 					(is_requested) ? "RSP" : "IND",
 					__libnet_convert_cp_error_type_to_string(result));
 
-		if (is_requested)
-			__libnet_closed_cb(result);
+		if (is_requested) {
+			if (conn_handle->closed_callback) {
+				conn_handle->closed_callback(result,
+					conn_handle->closed_user_data);
+
+				conn_handle->closed_callback = NULL;
+				conn_handle->closed_user_data = NULL;
+			}
+		}
 
 		switch (event_cb->Error) {
 		case NET_ERR_NONE:
 			CONNECTION_LOG(CONNECTION_INFO, "Successfully closed connection");
 
-			__libnet_state_changed_cb(event_cb->ProfileName, CONNECTION_PROFILE_STATE_DISCONNECTED);
+			__libnet_state_changed_cb(event_cb->profile_name, CONNECTION_PROFILE_STATE_DISCONNECTED);
+			CONN_UNLOCK;
 			return;
 		default:
 			CONNECTION_LOG(CONNECTION_ERROR, "Failed to close connection[%s]",
@@ -438,77 +252,202 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
 	case NET_EVENT_NET_STATE_IND:
 		CONNECTION_LOG(CONNECTION_INFO, "State changed IND");
 
-		if (event_cb->Datalength != sizeof(net_state_type_t))
+		if (event_cb->datalength != sizeof(net_state_type_t)) {
+			CONN_UNLOCK;
 			return;
+		}
 
-		net_state_type_t *profile_state = (net_state_type_t *)event_cb->Data;
+		net_state_type_t *profile_state = (net_state_type_t *)event_cb->data;
 		connection_profile_state_e cp_state = _profile_convert_to_cp_state(*profile_state);
 
 		CONNECTION_LOG(CONNECTION_INFO, "state: %s", __libnet_convert_cp_state_to_string(cp_state));
-		SECURE_CONNECTION_LOG(CONNECTION_INFO, "profile name: %s", event_cb->ProfileName);
+		SECURE_CONNECTION_LOG(CONNECTION_INFO, "profile name: %s", event_cb->profile_name);
 
-		__libnet_state_changed_cb(event_cb->ProfileName, cp_state);
+		__libnet_state_changed_cb(event_cb->profile_name, cp_state);
 
 		break;
 	case NET_EVENT_CELLULAR_SET_DEFAULT_RSP:
 		result = __libnet_convert_to_cp_error_type(event_cb->Error);
 		CONNECTION_LOG(CONNECTION_INFO, "Got set default profile RSP %d", result);
-		__libnet_default_cb(result);
-		break;
+		if (conn_handle->set_default_callback) {
+			conn_handle->set_default_callback(result,
+				conn_handle->set_default_user_data);
 
+			conn_handle->set_default_callback = NULL;
+			conn_handle->set_default_user_data = NULL;
+		}
+		break;
 	case NET_EVENT_CELLULAR_RESET_DEFAULT_RSP:
 		result = __libnet_convert_to_cp_error_type(event_cb->Error);
 		CONNECTION_LOG(CONNECTION_INFO, "Got reset default profile RSP %d", result);
-		__libnet_reset_profile_cb(result);
+		if (conn_handle->reset_callback) {
+			conn_handle->reset_callback(result,
+				conn_handle->reset_user_data);
+
+			conn_handle->reset_callback = NULL;
+			conn_handle->reset_user_data = NULL;
+		}
 		break;
 	case NET_EVENT_ETHERNET_CABLE_ATTACHED:
 		CONNECTION_LOG(CONNECTION_INFO, "Got Ethernet cable Attached Indication\n");
-		__libnet_ethernet_cable_state_changed_cb(CONNECTION_ETHERNET_CABLE_ATTACHED);
+		if (conn_handle->ethernet_cable_state_changed_callback) {
+			conn_handle->ethernet_cable_state_changed_callback(CONNECTION_ETHERNET_CABLE_ATTACHED,
+				conn_handle->ethernet_cable_state_changed_user_data);
+		}
 		break;
 	case NET_EVENT_ETHERNET_CABLE_DETACHED:
 		CONNECTION_LOG(CONNECTION_INFO, "Got Ethernet cable detached Indication\n");
-		__libnet_ethernet_cable_state_changed_cb(CONNECTION_ETHERNET_CABLE_DETACHED);
+		if (conn_handle->ethernet_cable_state_changed_callback) {
+			conn_handle->ethernet_cable_state_changed_callback(CONNECTION_ETHERNET_CABLE_DETACHED,
+				conn_handle->ethernet_cable_state_changed_user_data);
+		}
 		break;
+	case NET_EVENT_NETWORK_TYPE_CHANGED:
+		CONNECTION_LOG(CONNECTION_INFO, "Got Network Type Changed Indication");
+		int *state = (int *) event_cb->data;
+		if (conn_handle->type_changed_callback) {
+			int type = CONNECTION_TYPE_DISCONNECTED;
+
+			switch (*state) {
+			case VCONFKEY_NETWORK_CELLULAR:
+				type = CONNECTION_TYPE_CELLULAR;
+				break;
+			case VCONFKEY_NETWORK_WIFI:
+				type = CONNECTION_TYPE_WIFI;
+				break;
+			case VCONFKEY_NETWORK_ETHERNET:
+				type = CONNECTION_TYPE_ETHERNET;
+				break;
+			case VCONFKEY_NETWORK_BLUETOOTH:
+				type = CONNECTION_TYPE_BT;
+				break;
+			case VCONFKEY_NETWORK_DEFAULT_PROXY:
+				type = CONNECTION_TYPE_NET_PROXY;
+				break;
+			default:
+				type = CONNECTION_TYPE_DISCONNECTED;
+				break;
+			}
 
-	default:
+			conn_handle->type_changed_callback(type,
+				conn_handle->type_changed_user_data);
+		}
 		break;
-	}
-}
-//LCOV_EXCL_STOP
+	case NET_EVENT_IPV4_ADDRESS_CHANGED:
+		CONNECTION_LOG(CONNECTION_INFO, "Got IPv4 Address Changed Indication");
+		if (conn_handle->ip_changed_callback) {
+			char *ipv4_addr = NULL;
+			char *ipv6_addr = NULL;
+			char *addr = (char *)event_cb->data;
+
+			ipv4_addr = g_strdup(addr);
+			ipv6_addr = vconf_get_str(VCONFKEY_NETWORK_IP6);
+			if (ipv6_addr == NULL)
+				CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+						"vconf_get_str(VCONFKEY_NETWORK_IP6) failed");
+
+			conn_handle->ip_changed_callback(ipv4_addr, ipv6_addr,
+				conn_handle->ip_changed_user_data);
+
+			g_free(ipv4_addr);
+			g_free(ipv6_addr);
+		}
+		break;
+	case NET_EVENT_IPV6_ADDRESS_CHANGED:
+		CONNECTION_LOG(CONNECTION_INFO, "Got IPv6 Address Changed Indication");
+		if (conn_handle->ip_changed_callback) {
+			char *ipv4_addr = NULL;
+			char *ipv6_addr = NULL;
+			char *addr = (char *)event_cb->data;
+
+			ipv6_addr = g_strdup(addr);
+			ipv4_addr = vconf_get_str(VCONFKEY_NETWORK_IP);
+			if (ipv4_addr == NULL)
+				CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+						"vconf_get_str(VCONFKEY_NETWORK_IP) failed");
+
+			conn_handle->ip_changed_callback(ipv4_addr, ipv6_addr,
+				conn_handle->ip_changed_user_data);
+
+			g_free(ipv4_addr);
+			g_free(ipv6_addr);
+		}
+		break;
+	case NET_EVENT_PROXY_ADDRESS_CHANGED:
+		CONNECTION_LOG(CONNECTION_INFO, "Got Proxy Changed Indication");
+		char *proxy_addr = (char *)event_cb->data;
 
-static int __libnet_check_address_type(int address_family, const char *address)
-{
-	struct in6_addr buf;
-	int err = 0;
+		if (conn_handle->proxy_changed_callback) {
+			conn_handle->proxy_changed_callback(proxy_addr, NULL,
+				conn_handle->proxy_changed_user_data);
+		}
+		break;
+	case NET_EVENT_INTERNET_ONLINE_IND:
+	case NET_EVENT_INTERNET_OFFLINE_IND:
+		CONNECTION_LOG(CONNECTION_INFO, "Got Internet State Changed Indication: %s",
+				event_cb->event == NET_EVENT_INTERNET_ONLINE_IND ? "Online" : "Offline");
+		net_device_t *device_type = (net_device_t *) event_cb->data;
+
+		if (conn_handle->internet_state_changed_callback) {
+			net_profile_info_t active_profile;
+			int rv;
 
-	err = inet_pton(address_family, address, &buf);
-	if (err > 0)
-		return 1;
+			rv = net_get_active_net_info(conn_handle->network_info_handle, &active_profile);
+
+			if (rv == NET_ERR_NO_SERVICE && event_cb->event == NET_EVENT_INTERNET_OFFLINE_IND) {
+				conn_handle->internet_state_changed_callback(CONNECTION_INTERNET_STATE_OFFLINE,
+					conn_handle->internet_state_changed_user_data); //LCOV_EXCL_LINE
+				break;
+			} else if (rv == NET_ERR_ACCESS_DENIED) {
+				CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+				break;
+			} else if (rv != NET_ERR_NONE) {
+				CONNECTION_LOG(CONNECTION_ERROR, "Unable to get Default profile handle"); //LCOV_EXCL_LINE
+				break; //LCOV_EXCL_LINE
+			}
+
+			if (event_cb->event == NET_EVENT_INTERNET_ONLINE_IND) {
+				if (active_profile.profile_state == NET_STATE_TYPE_ONLINE &&
+						active_profile.profile_type == *device_type)
+					conn_handle->internet_state_changed_callback(CONNECTION_INTERNET_STATE_ONLINE,
+							conn_handle->internet_state_changed_user_data);
+			} else {
+				if (active_profile.profile_state != NET_STATE_TYPE_ONLINE)
+					conn_handle->internet_state_changed_callback(CONNECTION_INTERNET_STATE_OFFLINE,
+							conn_handle->internet_state_changed_user_data);
+			}
+		}
+		break;
+
+	default:
+		break;
+	}
 
-	return 0;
+	CONN_UNLOCK;
 }
+//LCOV_EXCL_STOP
 
-int __libnet_get_connected_count(struct _profile_list_s *profile_list)
+static int __libnet_get_connected_count(struct _profile_list_s *profile_list)
 {
 	int count = 0;
 	int i = 0;
 
 	for (; i < profile_list->count; i++) {
-		if (profile_list->profiles[i].ProfileState == NET_STATE_TYPE_ONLINE ||
-		    profile_list->profiles[i].ProfileState == NET_STATE_TYPE_READY)
+		if (profile_list->profiles[i].profile_state == NET_STATE_TYPE_ONLINE ||
+		    profile_list->profiles[i].profile_state == NET_STATE_TYPE_READY)
 			count++;
 	}
 
 	return count;
 }
 
-void __libnet_copy_connected_profile(net_profile_info_t **dest, struct _profile_list_s *source)
+static void __libnet_copy_connected_profile(net_profile_info_t **dest, struct _profile_list_s *source)
 {
 	int i = 0;
 
 	for (; i < source->count; i++) {
-		if (source->profiles[i].ProfileState == NET_STATE_TYPE_ONLINE ||
-		    source->profiles[i].ProfileState == NET_STATE_TYPE_READY) {
+		if (source->profiles[i].profile_state == NET_STATE_TYPE_ONLINE ||
+		    source->profiles[i].profile_state == NET_STATE_TYPE_READY) {
 			memcpy(*dest, &source->profiles[i], sizeof(net_profile_info_t));
 			(*dest)++;
 		}
@@ -516,58 +455,56 @@ void __libnet_copy_connected_profile(net_profile_info_t **dest, struct _profile_
 }
 
 //LCOV_EXCL_START
-int __libnet_get_default_count(struct _profile_list_s *profile_list)
+static int __libnet_get_default_count(struct _profile_list_s *profile_list)
 {
 	int count = 0;
 	int i = 0;
 
 	for (; i < profile_list->count; i++) {
-		if (profile_list->profiles[i].ProfileInfo.Pdp.DefaultConn == TRUE)
-			count++;
+		if (profile_list->profiles[i].profile_type == NET_DEVICE_CELLULAR) {
+			if (profile_list->profiles[i].profile_info.pdp.default_conn == TRUE)
+				count++;
+		}
 	}
 
 	return count;
 }
 
-void __libnet_copy_default_profile(net_profile_info_t **dest, struct _profile_list_s *source)
+static void __libnet_copy_default_profile(net_profile_info_t **dest, struct _profile_list_s *source)
 {
 	int i = 0;
 
 	for (; i < source->count; i++) {
-		if (source->profiles[i].ProfileInfo.Pdp.DefaultConn == TRUE) {
-			memcpy(*dest, &source->profiles[i], sizeof(net_profile_info_t));
-			(*dest)++;
+		if (source->profiles[i].profile_type == NET_DEVICE_CELLULAR) {
+			if (source->profiles[i].profile_info.pdp.default_conn == TRUE) {
+				memcpy(*dest, &source->profiles[i], sizeof(net_profile_info_t));
+				(*dest)++;
+			}
 		}
 	}
 }
 //LCOV_EXCL_STOP
 
-int _connection_libnet_init(void)
+int _connection_libnet_init(connection_handle_s *conn_handle)
 {
 	int rv;
 
-	if (_connection_is_created() != true) {
-		rv = net_register_client_ext((net_event_cb_t)__libnet_evt_cb, NET_DEVICE_DEFAULT, NULL);
-		if (rv != NET_ERR_NONE)
-			return rv;
-
-		__connection_set_created(true);
+	rv = net_register_client(&(conn_handle->network_info_handle),
+				(net_event_cb_t)__libnet_evt_cb, conn_handle);
+	if (rv != NET_ERR_NONE)
+		return rv;
 
-		if (profile_cb_table == NULL)
-			profile_cb_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	}
+	if (profile_cb_table == NULL)
+		profile_cb_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
 	return NET_ERR_NONE;
 }
 
-bool _connection_libnet_deinit(void)
+bool _connection_libnet_deinit(connection_handle_s *conn_handle, bool is_empty)
 {
-	if (_connection_is_created() == true) {
-		if (net_deregister_client_ext(NET_DEVICE_DEFAULT) != NET_ERR_NONE)
-			return false;
-
-		__connection_set_created(false);
+	net_deregister_client(conn_handle->network_info_handle);
 
+	if (is_empty) {
 		if (profile_cb_table) {
 			g_hash_table_destroy(profile_cb_table);
 			profile_cb_table = NULL;
@@ -584,6 +521,18 @@ bool _connection_libnet_deinit(void)
 	return true;
 }
 
+//LCOV_EXCL_START
+void _connection_set_cs_tid(int tid, connection_handle_s *conn_handle)
+{
+	net_set_cs_tid(tid, conn_handle->network_info_handle);
+}
+
+void _connection_unset_cs_tid(int tid, connection_handle_s *conn_handle)
+{
+	net_unset_cs_tid(tid, conn_handle->network_info_handle);
+}
+//LCOV_EXCL_STOP
+
 bool _connection_libnet_check_profile_validity(connection_profile_h profile)
 {
 	GSList *list;
@@ -601,29 +550,33 @@ bool _connection_libnet_check_profile_validity(connection_profile_h profile)
 	return false;
 }
 
-//LCOV_EXCL_START
-bool _connection_libnet_check_profile_cb_validity(connection_profile_h profile)
+int _connection_libnet_get_metered_state(connection_handle_s *conn_handle, bool* is_metered)
 {
-	struct _profile_cb_s *cb_info;
-	net_profile_info_t *profile_info = profile;
-
-	if (profile == NULL)
-		return false;
+	int rv = 0;
+	int status = 0;
 
-	cb_info = g_hash_table_lookup(profile_cb_table, profile_info->ProfileName);
-	if (cb_info != NULL)
-		return true;
+	rv = net_get_metered_state(conn_handle->network_info_handle, &status);
+	if (rv == NET_ERR_ACCESS_DENIED) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+	} else if (rv != NET_ERR_NONE) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Failed to get metered state[%d]", rv); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+	}
 
-	return false;
+	if (status == 1)
+		*is_metered = true;
+	else
+		*is_metered = false;
+	return CONNECTION_ERROR_NONE;
 }
-//LCOV_EXCL_STOP
 
-int _connection_libnet_get_wifi_state(connection_wifi_state_e *state)
+int _connection_libnet_get_wifi_state(connection_handle_s *conn_handle, connection_wifi_state_e *state)
 {
 	int rv;
 	net_wifi_state_t wlan_state;
 
-	rv = net_get_wifi_state(&wlan_state);
+	rv = net_get_wifi_state(conn_handle->network_info_handle, &wlan_state);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -654,11 +607,14 @@ int _connection_libnet_get_wifi_state(connection_wifi_state_e *state)
 }
 
 //LCOV_EXCL_START
-int _connection_libnet_get_ethernet_state(connection_ethernet_state_e* state)
+int _connection_libnet_get_ethernet_state(connection_handle_s *conn_handle,
+			connection_ethernet_state_e *state)
 {
 	int rv;
 	struct _profile_list_s ethernet_profiles = {0, 0, NULL};
-	rv = net_get_profile_list(NET_DEVICE_ETHERNET, &ethernet_profiles.profiles, &ethernet_profiles.count);
+	rv = net_get_profile_list(conn_handle->network_info_handle,
+			NET_DEVICE_ETHERNET, &ethernet_profiles.profiles,
+			&ethernet_profiles.count);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
 		return CONNECTION_ERROR_PERMISSION_DENIED;
@@ -669,7 +625,7 @@ int _connection_libnet_get_ethernet_state(connection_ethernet_state_e* state)
 		return CONNECTION_ERROR_NONE;
 	}
 
-	switch (ethernet_profiles.profiles->ProfileState) {
+	switch (ethernet_profiles.profiles->profile_state) {
 	case NET_STATE_TYPE_ONLINE:
 	case NET_STATE_TYPE_READY:
 		*state = CONNECTION_ETHERNET_STATE_CONNECTED;
@@ -691,12 +647,13 @@ int _connection_libnet_get_ethernet_state(connection_ethernet_state_e* state)
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_ethernet_cable_state(connection_ethernet_cable_state_e* state)
+int _connection_libnet_get_ethernet_cable_state(connection_handle_s *conn_handle,
+			connection_ethernet_cable_state_e* state)
 {
 	int rv = 0;
 	int status = 0;
 
-	rv = net_get_ethernet_cable_state(&status);
+	rv = net_get_ethernet_cable_state(conn_handle->network_info_handle, &status);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
 		return CONNECTION_ERROR_PERMISSION_DENIED;
@@ -711,22 +668,16 @@ int _connection_libnet_get_ethernet_cable_state(connection_ethernet_cable_state_
 		*state = CONNECTION_ETHERNET_CABLE_DETACHED;
 	return CONNECTION_ERROR_NONE;
 }
-
-int _connection_libnet_set_ethernet_cable_state_changed_cb(
-		libnet_ethernet_cable_state_changed_cb callback)
-{
-	__libnet_set_ethernet_cable_state_changed_cb(callback);
-
-	return CONNECTION_ERROR_NONE;
-}
 //LCOV_EXCL_STOP
 
-int _connection_libnet_get_bluetooth_state(connection_bt_state_e* state)
+int _connection_libnet_get_bluetooth_state(connection_handle_s *conn_handle, connection_bt_state_e *state)
 {
 	int i = 0;
 	int rv = 0;
 	struct _profile_list_s bluetooth_profiles = {0, 0, NULL};
-	rv = net_get_profile_list(NET_DEVICE_BLUETOOTH, &bluetooth_profiles.profiles, &bluetooth_profiles.count);
+	rv = net_get_profile_list(conn_handle->network_info_handle,
+			NET_DEVICE_BLUETOOTH, &bluetooth_profiles.profiles,
+			&bluetooth_profiles.count);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -739,7 +690,7 @@ int _connection_libnet_get_bluetooth_state(connection_bt_state_e* state)
 
 	//LCOV_EXCL_START
 	for (; i < bluetooth_profiles.count; i++) {
-		switch (bluetooth_profiles.profiles[i].ProfileState) {
+		switch (bluetooth_profiles.profiles[i].profile_state) {
 		case NET_STATE_TYPE_ONLINE:
 		case NET_STATE_TYPE_READY:
 			*state = CONNECTION_BT_STATE_CONNECTED;
@@ -764,169 +715,82 @@ done:
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, connection_profile_iterator_h* profile_iter_h)
+int _connection_libnet_get_profile_iterator(connection_handle_s *conn_handle,
+			connection_iterator_type_e type, connection_profile_iterator_h* profile_iter_h)
 {
 	int count = 0;
-	int rv1, rv2, rv3, rv4;
+	int rv;
 	net_profile_info_t *profiles = NULL;
 
-	struct _profile_list_s wifi_profiles = {0, 0, NULL};
-	struct _profile_list_s cellular_profiles = {0, 0, NULL};
-	struct _profile_list_s ethernet_profiles = {0, 0, NULL};
-	struct _profile_list_s bluetooth_profiles = {0, 0, NULL};
+	struct _profile_list_s profile_list = {0, 0, NULL};
 
 	__libnet_clear_profile_list(&profile_iterator);
 
-	rv1 = net_get_profile_list(NET_DEVICE_WIFI, &wifi_profiles.profiles, &wifi_profiles.count);
-	if (rv1 == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
-		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv1 != NET_ERR_NO_SERVICE && rv1 != NET_ERR_NONE)
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-
-	CONNECTION_LOG(CONNECTION_INFO, "Wi-Fi profile count: %d", wifi_profiles.count);
-
-	rv2 = net_get_profile_list(NET_DEVICE_CELLULAR, &cellular_profiles.profiles, &cellular_profiles.count);
-	if (rv2 == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
-		__libnet_clear_profile_list(&wifi_profiles);
-		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv2 != NET_ERR_NO_SERVICE && rv2 != NET_ERR_NONE) {
-		__libnet_clear_profile_list(&wifi_profiles);
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-	}
-	CONNECTION_LOG(CONNECTION_INFO, "Cellular profile count: %d", cellular_profiles.count);
-
-	rv3 = net_get_profile_list(NET_DEVICE_ETHERNET, &ethernet_profiles.profiles, &ethernet_profiles.count);
-	if (rv3 == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
-		__libnet_clear_profile_list(&wifi_profiles);
-		__libnet_clear_profile_list(&cellular_profiles);
-		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv3 != NET_ERR_NO_SERVICE && rv3 != NET_ERR_NONE) {
-		__libnet_clear_profile_list(&wifi_profiles);
-		__libnet_clear_profile_list(&cellular_profiles);
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-	}
-	CONNECTION_LOG(CONNECTION_INFO, "Ethernet profile count : %d", ethernet_profiles.count);
-
-	rv4 = net_get_profile_list(NET_DEVICE_BLUETOOTH, &bluetooth_profiles.profiles, &bluetooth_profiles.count);
-	if (rv4 == NET_ERR_ACCESS_DENIED) {
+	rv = net_get_all_profile_list(conn_handle->network_info_handle,
+			&profile_list.profiles, &profile_list.count);
+	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
-		__libnet_clear_profile_list(&wifi_profiles);
-		__libnet_clear_profile_list(&cellular_profiles);
-		__libnet_clear_profile_list(&ethernet_profiles);
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv4 != NET_ERR_NO_SERVICE && rv4 != NET_ERR_NONE) {
-		__libnet_clear_profile_list(&wifi_profiles);
-		__libnet_clear_profile_list(&cellular_profiles);
-		__libnet_clear_profile_list(&ethernet_profiles);
+	} else if (rv != NET_ERR_NO_SERVICE && rv != NET_ERR_NONE)
 		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-	}
-	CONNECTION_LOG(CONNECTION_INFO, "Bluetooth profile count : %d", bluetooth_profiles.count);
 
 	*profile_iter_h = &profile_iterator;
 
 	switch (type) {
 	case CONNECTION_ITERATOR_TYPE_REGISTERED:
-		count = wifi_profiles.count + cellular_profiles.count + ethernet_profiles.count + bluetooth_profiles.count;
+		count = profile_list.count;
 		CONNECTION_LOG(CONNECTION_INFO, "Total profile count : %d", count);
 		if (count == 0)
 			return CONNECTION_ERROR_NONE;
 
 		profiles = g_try_new0(net_profile_info_t, count);
 		if (profiles == NULL) {
-			__libnet_clear_profile_list(&wifi_profiles);
-			__libnet_clear_profile_list(&cellular_profiles);
-			__libnet_clear_profile_list(&ethernet_profiles);
-			__libnet_clear_profile_list(&bluetooth_profiles);
+			__libnet_clear_profile_list(&profile_list); //LCOV_EXCL_LINE
 			return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
 		}
 
 		profile_iterator.profiles = profiles;
 
-		if (wifi_profiles.count > 0) {
-			memcpy(profiles, wifi_profiles.profiles,
-					sizeof(net_profile_info_t) * wifi_profiles.count);
-			profiles += wifi_profiles.count;
-		}
-
-		if (cellular_profiles.count > 0) {
-			memcpy(profiles, cellular_profiles.profiles,
-					sizeof(net_profile_info_t) * cellular_profiles.count);
-			profiles += cellular_profiles.count;
-		}
-
-		if (ethernet_profiles.count > 0) {
-			memcpy(profiles, ethernet_profiles.profiles,
-					sizeof(net_profile_info_t) * ethernet_profiles.count);
-			profiles += ethernet_profiles.count;
-		}
-
-		if (bluetooth_profiles.count > 0)
-			memcpy(profiles, bluetooth_profiles.profiles,
-					sizeof(net_profile_info_t) * bluetooth_profiles.count);
+		memcpy(profiles, profile_list.profiles, sizeof(net_profile_info_t) * count);
 
 		break;
 	case CONNECTION_ITERATOR_TYPE_CONNECTED:
-		count = __libnet_get_connected_count(&wifi_profiles);
-		count += __libnet_get_connected_count(&cellular_profiles);
-		count += __libnet_get_connected_count(&ethernet_profiles);
-		count += __libnet_get_connected_count(&bluetooth_profiles);
+		count = __libnet_get_connected_count(&profile_list);
 		CONNECTION_LOG(CONNECTION_INFO, "Total connected profile count : %d", count);
 		if (count == 0)
 			return CONNECTION_ERROR_NONE;
 
 		profiles = g_try_new0(net_profile_info_t, count);
 		if (profiles == NULL) {
-			__libnet_clear_profile_list(&wifi_profiles);
-			__libnet_clear_profile_list(&cellular_profiles);
-			__libnet_clear_profile_list(&ethernet_profiles);
-			__libnet_clear_profile_list(&bluetooth_profiles);
+			__libnet_clear_profile_list(&profile_list); //LCOV_EXCL_LINE
 			return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
 		}
 
 		profile_iterator.profiles = profiles;
 
-		if (wifi_profiles.count > 0)
-			__libnet_copy_connected_profile(&profiles, &wifi_profiles);
-
-		if (cellular_profiles.count > 0)
-			__libnet_copy_connected_profile(&profiles, &cellular_profiles);
-
-		if (ethernet_profiles.count > 0)
-			__libnet_copy_connected_profile(&profiles, &ethernet_profiles);
-
-		if (bluetooth_profiles.count > 0)
-			__libnet_copy_connected_profile(&profiles, &bluetooth_profiles);
+		__libnet_copy_connected_profile(&profiles, &profile_list);
 
 		break;
 	case CONNECTION_ITERATOR_TYPE_DEFAULT:
-		count = __libnet_get_default_count(&cellular_profiles);
+		count = __libnet_get_default_count(&profile_list);
 		CONNECTION_LOG(CONNECTION_INFO, "Total default profile count : %d", count); //LCOV_EXCL_LINE
 		if (count == 0)
 			return CONNECTION_ERROR_NONE;
 
 		profiles = g_try_new0(net_profile_info_t, count);
 		if (profiles == NULL) {
-			__libnet_clear_profile_list(&wifi_profiles);
-			__libnet_clear_profile_list(&cellular_profiles);
-			__libnet_clear_profile_list(&ethernet_profiles);
-			__libnet_clear_profile_list(&bluetooth_profiles);
+			__libnet_clear_profile_list(&profile_list);
 			return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
 		}
 
 		profile_iterator.profiles = profiles;
 
-		if (cellular_profiles.count > 0)
-			__libnet_copy_default_profile(&profiles, &cellular_profiles);
+		__libnet_copy_default_profile(&profiles, &profile_list);
+
 		break;
 	}
 
-	__libnet_clear_profile_list(&wifi_profiles);
-	__libnet_clear_profile_list(&cellular_profiles);
-	__libnet_clear_profile_list(&ethernet_profiles);
-	__libnet_clear_profile_list(&bluetooth_profiles);
+	__libnet_clear_profile_list(&profile_list);
 
 	profile_iterator.count = count;
 
@@ -968,12 +832,13 @@ int _connection_libnet_destroy_iterator(connection_profile_iterator_h profile_it
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_current_profile(connection_profile_h *profile)
+int _connection_libnet_get_current_profile(connection_handle_s *conn_handle,
+			connection_profile_h *profile)
 {
 	net_profile_info_t active_profile;
 	int rv;
 
-	rv = net_get_active_net_info(&active_profile);
+	rv = net_get_active_net_info(conn_handle->network_info_handle, &active_profile);
 	if (rv == NET_ERR_NO_SERVICE)
 		return CONNECTION_ERROR_NO_CONNECTION; //LCOV_EXCL_LINE
 	else if (rv == NET_ERR_ACCESS_DENIED) {
@@ -992,27 +857,22 @@ int _connection_libnet_get_current_profile(connection_profile_h *profile)
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_reset_profile(connection_reset_option_e type,
-		connection_cellular_subscriber_id_e id, connection_reset_cb callback, void *user_data)
+int _connection_libnet_reset_profile(connection_handle_s *conn_handle,
+		connection_reset_option_e type, connection_cellular_subscriber_id_e id)
 {
 	int rv;
 
-	rv = net_reset_profile(type, id);
-	if (rv == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+	rv = net_reset_profile(conn_handle->network_info_handle, type, id);
+	if (rv == NET_ERR_ACCESS_DENIED)
 		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
+	else if (rv != NET_ERR_NONE)
 		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-	}
-
-	__libnet_set_reset_profile_cb(callback, user_data);
 
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_open_profile(connection_profile_h profile,
-		connection_opened_cb callback, void* user_data)
+int _connection_libnet_open_profile(connection_handle_s *conn_handle,
+			connection_profile_h profile)
 {
 	int rv;
 
@@ -1023,19 +883,22 @@ int _connection_libnet_open_profile(connection_profile_h profile,
 
 	net_profile_info_t *profile_info = profile;
 
-	rv = net_open_connection_with_profile(profile_info->ProfileName);
-	if (rv == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+	if (profile_info->profile_type == NET_DEVICE_MESH)
+		rv = net_open_mesh_connection_with_profile(conn_handle->network_info_handle, //LCOV_EXCL_LINE
+				profile_info->profile_name);
+	else
+		rv = net_open_connection_with_profile(conn_handle->network_info_handle,
+				profile_info->profile_name);
+
+	if (rv == NET_ERR_ACCESS_DENIED)
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv != NET_ERR_NONE)
+	else if (rv != NET_ERR_NONE)
 		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
-	__libnet_set_opened_cb(callback, user_data);
-
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_cellular_service_profile(
+int _connection_libnet_get_cellular_service_profile(connection_handle_s *conn_handle,
 		connection_cellular_service_type_e type, connection_profile_h *profile)
 {
 	int i = 0, j = 0;
@@ -1048,7 +911,9 @@ int _connection_libnet_get_cellular_service_profile(
 	struct _profile_list_s cellular_profiles = { 0, 0, NULL };
 	net_service_type_t service_type = _connection_profile_convert_to_libnet_cellular_service_type(type);
 
-	rv = net_get_profile_list(NET_DEVICE_CELLULAR, &cellular_profiles.profiles, &cellular_profiles.count);
+	rv = net_get_profile_list(conn_handle->network_info_handle,
+			NET_DEVICE_CELLULAR, &cellular_profiles.profiles,
+			&cellular_profiles.count);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1070,10 +935,10 @@ int _connection_libnet_get_cellular_service_profile(
 #endif
 
 	for (i = 0; i < cellular_profiles.count; i++)
-		if (cellular_profiles.profiles[i].ProfileInfo.Pdp.ServiceType == service_type)
+		if (cellular_profiles.profiles[i].profile_info.pdp.service_type == service_type)
 #if defined TIZEN_DUALSIM_ENABLE
 			if (g_str_has_suffix(
-					cellular_profiles.profiles[i].ProfileInfo.Pdp.PSModemPath,
+					cellular_profiles.profiles[i].profile_info.pdp.ps_modem_path,
 					subscriber_id) == TRUE)
 #endif
 				break;
@@ -1091,7 +956,7 @@ int _connection_libnet_get_cellular_service_profile(
 
 	memcpy(*profile, &cellular_profiles.profiles[i], sizeof(net_profile_info_t));
 
-	if (cellular_profiles.profiles[i].ProfileInfo.Pdp.DefaultConn)
+	if (cellular_profiles.profiles[i].profile_info.pdp.default_conn)
 		goto done;
 
 	//LCOV_EXCL_START
@@ -1103,10 +968,10 @@ int _connection_libnet_get_cellular_service_profile(
 		if (i == j)
 			continue;
 
-		if (cellular_profiles.profiles[j].ProfileInfo.Pdp.ServiceType != service_type)
+		if (cellular_profiles.profiles[j].profile_info.pdp.service_type != service_type)
 			continue;
 
-		if (cellular_profiles.profiles[j].ProfileInfo.Pdp.DefaultConn) {
+		if (cellular_profiles.profiles[j].profile_info.pdp.default_conn) {
 			memcpy(*profile, &cellular_profiles.profiles[j], sizeof(net_profile_info_t));
 			goto done;
 		}
@@ -1120,7 +985,8 @@ done:
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_service_type_e type, connection_profile_h profile)
+int _connection_libnet_set_cellular_service_profile_sync(connection_handle_s *conn_handle,
+			connection_cellular_service_type_e type, connection_profile_h profile)
 {
 	int rv;
 
@@ -1132,12 +998,13 @@ int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_ser
 	net_profile_info_t *profile_info = profile;
 	connection_cellular_service_type_e service_type;
 
-	service_type = _profile_convert_to_connection_cellular_service_type(profile_info->ProfileInfo.Pdp.ServiceType);
+	service_type = _profile_convert_to_connection_cellular_service_type(profile_info->profile_info.pdp.service_type);
 
 	if (service_type != type)
 		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
-	rv = net_set_default_cellular_service_profile(profile_info->ProfileName);
+	rv = net_set_default_cellular_service_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
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1147,8 +1014,8 @@ int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_ser
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_set_cellular_service_profile_async(connection_cellular_service_type_e type,
-			connection_profile_h profile, connection_set_default_cb callback, void* user_data)
+int _connection_libnet_set_cellular_service_profile_async(connection_handle_s *conn_handle,
+			connection_cellular_service_type_e type, connection_profile_h profile)
 {
 	int rv;
 
@@ -1160,24 +1027,22 @@ int _connection_libnet_set_cellular_service_profile_async(connection_cellular_se
 	net_profile_info_t *profile_info = profile;
 	connection_cellular_service_type_e service_type;
 
-	service_type = _profile_convert_to_connection_cellular_service_type(profile_info->ProfileInfo.Pdp.ServiceType);
+	service_type = _profile_convert_to_connection_cellular_service_type(profile_info->profile_info.pdp.service_type);
 
 	if (service_type != type)
 		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
-	rv = net_set_default_cellular_service_profile_async(profile_info->ProfileName);
+	rv = net_set_default_cellular_service_profile_async(conn_handle->network_info_handle,
+				profile_info->profile_name);
 	if (rv == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
 	} else if (rv != NET_ERR_NONE)
 		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
-	__libnet_set_default_cb(callback, user_data);
-
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_close_profile(connection_profile_h profile, connection_closed_cb callback, void *user_data)
+int _connection_libnet_close_profile(connection_handle_s *conn_handle, connection_profile_h profile)
 {
 	int rv;
 
@@ -1188,45 +1053,39 @@ int _connection_libnet_close_profile(connection_profile_h profile, connection_cl
 
 	net_profile_info_t *profile_info = profile;
 
-	rv = net_close_connection(profile_info->ProfileName);
-	if (rv == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+	if (profile_info->profile_type == NET_DEVICE_MESH)
+		rv = net_close_mesh_connection(conn_handle->network_info_handle, profile_info->profile_name); //LCOV_EXCL_LINE
+	else
+		rv = net_close_connection(conn_handle->network_info_handle, profile_info->profile_name);
+
+	if (rv == NET_ERR_ACCESS_DENIED)
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv != NET_ERR_NONE)
+	else if (rv != NET_ERR_NONE)
 		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
-	__libnet_set_closed_cb(callback, user_data);
-
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_add_route(const char *interface_name, const char *host_address)
+int _connection_libnet_add_route(connection_handle_s *conn_handle,
+			const char *interface_name, const char *host_address)
 {
 	int rv;
 	char *endstr = NULL;
 	int address_family = 0;
 
-	if (__libnet_check_address_type(AF_INET, host_address))
-		address_family = AF_INET;
-	else
-		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+	address_family = AF_INET;
 
-	switch (address_family) {
-	case AF_INET:
-		endstr = strrchr(host_address, '.');
-		if (endstr == NULL ||
-				strcmp(endstr, ".0") == 0 ||
-				strncmp(host_address, "0.", 2) == 0 ||
-				strstr(host_address, "255") != NULL) {
-			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
-			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-		}
-		break;
-	default:
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+	endstr = strrchr(host_address, '.');
+	if (endstr == NULL ||
+			strcmp(endstr, ".0") == 0 ||
+			strncmp(host_address, "0.", 2) == 0 ||
+			strstr(host_address, "255") != NULL) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 	}
 
-	rv = net_add_route(host_address, interface_name, address_family);
+	rv = net_add_route(conn_handle->network_info_handle,
+				host_address, interface_name, address_family);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1236,33 +1095,26 @@ int _connection_libnet_add_route(const char *interface_name, const char *host_ad
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_remove_route(const char *interface_name, const char *host_address)
+int _connection_libnet_remove_route(connection_handle_s *conn_handle,
+			const char *interface_name, const char *host_address)
 {
 	int rv;
 	char *endstr = strrchr(host_address, '.');
 	int address_family = 0;
 
-	if (__libnet_check_address_type(AF_INET, host_address))
-		address_family = AF_INET;
-	else
-		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+	address_family = AF_INET;
 
-	switch (address_family) {
-	case AF_INET:
-		endstr = strrchr(host_address, '.');
-		if (endstr == NULL ||
-			strcmp(endstr, ".0") == 0 ||
-			strncmp(host_address, "0.", 2) == 0 ||
-			strstr(host_address, ".0.") != NULL || strstr(host_address, "255") != NULL) {
-			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed"); //LCOV_EXCL_LINE
-			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-		}
-		break;
-	default:
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+	endstr = strrchr(host_address, '.');
+	if (endstr == NULL ||
+		strcmp(endstr, ".0") == 0 ||
+		strncmp(host_address, "0.", 2) == 0 ||
+		strstr(host_address, ".0.") != NULL || strstr(host_address, "255") != NULL) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed"); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 	}
 
-	rv = net_remove_route(host_address, interface_name, address_family);
+	rv = net_remove_route(conn_handle->network_info_handle,
+				host_address, interface_name, address_family);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1272,31 +1124,23 @@ int _connection_libnet_remove_route(const char *interface_name, const char *host
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_add_route_ipv6(const char *interface_name, const char *host_address, const char *gateway)
+int _connection_libnet_add_route_ipv6(connection_handle_s *conn_handle,
+			const char *interface_name, const char *host_address, const char *gateway)
 {
 	int rv;
 	int address_family = 0;
 
 	address_family = AF_INET6;
-/*	if(__libnet_check_address_type(AF_INET6, host_address))
-		address_family = AF_INET6;
-	else
-		return CONNECTION_ERROR_INVALID_PARAMETER;*/
 
-	switch (address_family) {
-	case AF_INET6:
-		if (strncmp(host_address, "fe80:", 5) == 0 ||
-			strncmp(host_address, "ff00:", 5) == 0 ||
-			strncmp(host_address, "::", 2) == 0) {
-			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
-			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-		}
-		break;
-	default:
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+	if (strncmp(host_address, "fe80:", 5) == 0 ||
+		strncmp(host_address, "ff00:", 5) == 0 ||
+		strncmp(host_address, "::", 2) == 0) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 	}
 
-	rv = net_add_route_ipv6(host_address, interface_name, address_family, gateway);
+	rv = net_add_route_ipv6(conn_handle->network_info_handle,
+				host_address, interface_name, address_family, gateway);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1306,36 +1150,133 @@ int _connection_libnet_add_route_ipv6(const char *interface_name, const char *ho
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_remove_route_ipv6(const char *interface_name, const char *host_address, const char *gateway)
+int _connection_libnet_remove_route_ipv6(connection_handle_s *conn_handle,
+			const char *interface_name, const char *host_address, const char *gateway)
 {
 	int rv;
 	int address_family = 0;
 
 	address_family = AF_INET6;
-/*	if (__libnet_check_address_type(AF_INET6, host_address))
-		address_family = AF_INET6;
+
+	if (strncmp(host_address, "fe80:", 5) == 0 ||
+		strncmp(host_address, "ff00:", 5) == 0 ||
+		strncmp(host_address, "::", 2) == 0) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+	}
+
+	rv = net_remove_route_ipv6(conn_handle->network_info_handle,
+				host_address, interface_name, address_family, gateway);
+	if (rv == NET_ERR_ACCESS_DENIED) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+	} else if (rv != NET_ERR_NONE)
+		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+
+	return CONNECTION_ERROR_NONE;
+}
+
+int _connection_libnet_add_route_entry(connection_handle_s *conn_handle,
+		connection_address_family_e address_family, const char *interface_name,
+		const char *host_address, const char *gateway)
+{
+	int rv;
+	char *endstr = NULL;
+	int address_family_type = 0;
+
+	if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4)
+		address_family_type = AF_INET;
 	else
-		return CONNECTION_ERROR_INVALID_PARAMETER;*/
+		address_family_type = AF_INET6;
+
+	if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+
+		endstr = strrchr(host_address, '.');
+		if (endstr == NULL ||
+				strcmp(endstr, ".0") == 0 ||
+				strncmp(host_address, "0.", 2) == 0 ||
+				strstr(host_address, "255") != NULL) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+		}
+
+		rv = net_add_route_entry(conn_handle->network_info_handle,
+				host_address, interface_name, address_family_type, gateway);
+		if (rv == NET_ERR_ACCESS_DENIED) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+		} else if (rv != NET_ERR_NONE)
+			return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+
+	} else {
 
-	switch (address_family) {
-	case AF_INET6:
 		if (strncmp(host_address, "fe80:", 5) == 0 ||
 			strncmp(host_address, "ff00:", 5) == 0 ||
 			strncmp(host_address, "::", 2) == 0) {
 			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
 			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 		}
-		break;
-	default:
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+
+		rv = net_add_route_ipv6(conn_handle->network_info_handle,
+				host_address, interface_name, address_family_type, gateway);
+		if (rv == NET_ERR_ACCESS_DENIED) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+		} else if (rv != NET_ERR_NONE)
+			return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 	}
 
-	rv = net_remove_route_ipv6(host_address, interface_name, address_family, gateway);
-	if (rv == NET_ERR_ACCESS_DENIED) {
-		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
-		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-	} else if (rv != NET_ERR_NONE)
-		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+	return CONNECTION_ERROR_NONE;
+}
+
+int _connection_libnet_remove_route_entry(connection_handle_s *conn_handle,
+		connection_address_family_e address_family, const char *interface_name,
+		const char *host_address, const char *gateway)
+{
+	int rv;
+	char *endstr = strrchr(host_address, '.');
+	int address_family_type = 0;
+
+	if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4)
+		address_family_type = AF_INET;
+	else
+		address_family_type = AF_INET6;
+
+	if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+		endstr = strrchr(host_address, '.');
+		if (endstr == NULL ||
+			strcmp(endstr, ".0") == 0 ||
+			strncmp(host_address, "0.", 2) == 0 ||
+			strstr(host_address, ".0.") != NULL || strstr(host_address, "255") != NULL) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+		}
+
+		rv = net_remove_route_entry(conn_handle->network_info_handle, host_address,
+					interface_name, address_family_type, gateway);
+		if (rv == NET_ERR_ACCESS_DENIED) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+		} else if (rv != NET_ERR_NONE)
+			return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+
+	} else {
+
+		if (strncmp(host_address, "fe80:", 5) == 0 ||
+			strncmp(host_address, "ff00:", 5) == 0 ||
+			strncmp(host_address, "::", 2) == 0) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+		}
+
+		rv = net_remove_route_ipv6(conn_handle->network_info_handle, host_address,
+					interface_name, address_family_type, gateway);
+		if (rv == NET_ERR_ACCESS_DENIED) {
+			CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+			return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+		} else if (rv != NET_ERR_NONE)
+			return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+	}
 
 	return CONNECTION_ERROR_NONE;
 }
@@ -1355,7 +1296,7 @@ bool _connection_libnet_add_to_profile_cb_list(connection_profile_h profile,
 		connection_profile_state_changed_cb callback, void *user_data)
 {
 	net_profile_info_t *profile_info = profile;
-	char *profile_name = g_strdup(profile_info->ProfileName);
+	char *profile_name = g_strdup(profile_info->profile_name);
 
 	struct _profile_cb_s *profile_cb_info = g_try_malloc0(sizeof(struct _profile_cb_s));
 	if (profile_cb_info == NULL) {
@@ -1365,7 +1306,7 @@ bool _connection_libnet_add_to_profile_cb_list(connection_profile_h profile,
 
 	profile_cb_info->callback = callback;
 	profile_cb_info->user_data = user_data;
-	profile_cb_info->state = _profile_convert_to_cp_state(profile_info->ProfileState);
+	profile_cb_info->state = _profile_convert_to_cp_state(profile_info->profile_state);
 
 	g_hash_table_replace(profile_cb_table, profile_name, profile_cb_info);
 
@@ -1376,16 +1317,18 @@ bool _connection_libnet_remove_from_profile_cb_list(connection_profile_h profile
 {
 	net_profile_info_t *profile_info = profile;
 
-	if (g_hash_table_remove(profile_cb_table, profile_info->ProfileName) == TRUE)
+	if (g_hash_table_remove(profile_cb_table, profile_info->profile_name) == TRUE)
 		return true;
 
 	return false; //LCOV_EXCL_LINE
 }
 
-int _connection_libnet_set_statistics(net_device_t device_type, net_statistics_type_e statistics_type)
+int _connection_libnet_set_statistics(connection_handle_s *conn_handle,
+			net_device_t device_type, net_statistics_type_e statistics_type)
 {
 	int rv;
-	rv = net_set_statistics(device_type, statistics_type);
+	rv = net_set_statistics(conn_handle->network_info_handle,
+				device_type, statistics_type);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1395,10 +1338,12 @@ int _connection_libnet_set_statistics(net_device_t device_type, net_statistics_t
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_statistics(net_statistics_type_e statistics_type, unsigned long long *size)
+int _connection_libnet_get_statistics(connection_handle_s *conn_handle,
+			net_statistics_type_e statistics_type, unsigned long long *size)
 {
 	int rv;
-	rv = net_get_statistics(NET_DEVICE_WIFI, statistics_type, size);
+	rv = net_get_statistics(conn_handle->network_info_handle,
+				NET_DEVICE_WIFI, statistics_type, size);
 	if (rv == NET_ERR_ACCESS_DENIED) {
 		CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
 		return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1424,92 +1369,69 @@ int _connection_libnet_set_cellular_subscriber_id(connection_profile_h profile,
 		return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 	}
 
-	g_strlcpy(profile_info->ProfileInfo.Pdp.PSModemPath, modem_path,
+	g_strlcpy(profile_info->profile_info.pdp.ps_modem_path, modem_path,
 				NET_PROFILE_NAME_LEN_MAX);
 	g_free(modem_path);
 
 	return CONNECTION_ERROR_NONE;
 }
 
-static void __connection_idle_destroy_cb(gpointer data)
+int _connection_libnet_enable_ethernet_eap(bool enable, const char *profilename)
 {
-	if (!data)
-		return;
+	int rv = 0;
 
-	managed_idler_list = g_slist_remove(managed_idler_list, data);
-	g_free(data);
+	rv = net_ethernet_eap_enable(enable, profilename);
+	if (rv == NET_ERR_ACCESS_DENIED) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+		return CONNECTION_ERROR_PERMISSION_DENIED;
+	} else if (rv != NET_ERR_NONE) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Failed to enable EAP over ethernet[%d]", rv);
+		return CONNECTION_ERROR_OPERATION_FAILED;
+	}
+
+	return CONNECTION_ERROR_NONE;
 }
 
-static gboolean __connection_idle_cb(gpointer user_data)
+int _connection_libnet_ethernet_eap_enabled(const char *profilename, bool *enabled)
 {
-	struct managed_idle_data *data = (struct managed_idle_data *)user_data;
+	int rv = 0;
+	gboolean eap_enabled = false;
 
-	if (!data)
-		return FALSE;
+	rv = net_ethernet_eap_enabled(profilename, &eap_enabled);
+	if (rv == NET_ERR_ACCESS_DENIED) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+		return CONNECTION_ERROR_PERMISSION_DENIED;
+	} else if (rv != NET_ERR_NONE) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Failed to enable EAP over ethernet[%d]", rv);
+		return CONNECTION_ERROR_OPERATION_FAILED;
+	}
 
-	return data->func(data->user_data);
+	*enabled = eap_enabled;
+	return CONNECTION_ERROR_NONE;
 }
 
-guint _connection_callback_add(GSourceFunc func, gpointer user_data)
+int _connection_libnet_profile_save_ethernet_eap_config(connection_handle_s *conn_handle,
+			connection_profile_h profile)
 {
-	guint id;
-	struct managed_idle_data *data;
-	GMainContext *context;
-	GSource *src;
-
-	if (!func)
-		return 0;
-
-	data = g_try_new0(struct managed_idle_data, 1);
-	if (!data)
-		return 0;
-
-	data->func = func;
-	data->user_data = user_data;
-
-	context = g_main_context_get_thread_default();
-	src = g_idle_source_new();
-	g_source_set_callback(src, __connection_idle_cb, data,
-		__connection_idle_destroy_cb);
-	id = g_source_attach(src, context);
-	g_source_unref(src);
-	if (!id) {
-		g_free(data);
-		return id;
-	}
-
-	data->id = id;
+	int rv;
 
-	managed_idler_list = g_slist_append(managed_idler_list, data);
+	net_profile_info_t *profile_info = profile;
 
-	return id;
-}
+	rv = net_save_ethernet_eap_config(conn_handle->network_info_handle,
+			&profile_info->profile_info.ethernet.net_info);
 
-void _connection_callback_cleanup(void)
-{
-	GSList *cur = managed_idler_list;
-	GSource *src;
-	struct managed_idle_data *data;
-
-	while (cur) {
-		//LCOV_EXCL_START
-		GSList *next = cur->next;
-		data = (struct managed_idle_data *)cur->data;
-
-		src = g_main_context_find_source_by_id(g_main_context_default(), data->id);
-		if (src) {
-			g_source_destroy(src);
-			cur = managed_idler_list;
-		} else
-			cur = next;
-		//LCOV_EXCL_STOP
+	if (rv == NET_ERR_ACCESS_DENIED) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+		return CONNECTION_ERROR_PERMISSION_DENIED;
+	} else if (rv != NET_ERR_NONE) {
+		CONNECTION_LOG(CONNECTION_ERROR, "Failed to save eap config[%d]", rv);
+		return CONNECTION_ERROR_OPERATION_FAILED;
 	}
 
-	g_slist_free(managed_idler_list);
-	managed_idler_list = NULL;
+	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_check_get_privilege()
+int _connection_libnet_check_get_privilege(void)
 {
 	int rv;
 
@@ -1523,7 +1445,7 @@ int _connection_libnet_check_get_privilege()
 	return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_check_profile_privilege()
+int _connection_libnet_check_profile_privilege(void)
 {
 	int rv;
 
@@ -1584,3 +1506,63 @@ int _connection_check_feature_supported(const char *feature_name, ...)
 	set_last_result(CONNECTION_ERROR_NONE);
 	return CONNECTION_ERROR_NONE;
 }
+
+//LCOV_EXCL_START
+int _connection_libnet_start_tcpdump(connection_handle_s *conn_handle)
+{
+	connection_error_e result = CONNECTION_ERROR_NONE;
+	net_err_t ret = NET_ERR_NONE;
+
+	ret = net_start_tcpdump(conn_handle->network_info_handle);
+	result = __libnet_convert_to_cp_error_type(ret);
+
+	return result;
+}
+
+int _connection_libnet_stop_tcpdump(connection_handle_s *conn_handle)
+{
+	connection_error_e result = CONNECTION_ERROR_NONE;
+	net_err_t ret = NET_ERR_NONE;
+
+	ret = net_stop_tcpdump(conn_handle->network_info_handle);
+	result = __libnet_convert_to_cp_error_type(ret);
+
+	return result;
+}
+
+int _connection_libnet_get_tcpdump_state(connection_handle_s *conn_handle,
+			gboolean *tcpdump_state)
+{
+	connection_error_e result = CONNECTION_ERROR_NONE;
+	net_err_t ret = NET_ERR_NONE;
+
+	ret = net_get_tcpdump_state(conn_handle->network_info_handle, tcpdump_state);
+	result = __libnet_convert_to_cp_error_type(ret);
+
+	return result;
+}
+//LCOV_EXCL_STOP
+
+void _connection_lock(void)
+{
+	if (g_conn_thread_mutex_ref == 0)
+		pthread_mutex_lock(&g_conn_thread_mutex);
+
+	g_conn_thread_mutex_ref++;
+}
+
+void _connection_unlock(void)
+{
+	if (g_conn_thread_mutex_ref == 1)
+		pthread_mutex_unlock(&g_conn_thread_mutex);
+
+	g_conn_thread_mutex_ref--;
+
+//LCOV_EXCL_START
+	if (g_conn_thread_mutex_ref < 0) {
+		CONNECTION_LOG(CONNECTION_ERROR,
+				"Error scenario, thread specific mutex ref is negative !!!");
+		g_conn_thread_mutex_ref = 0;
+	}
+//LCOV_EXCL_STOP
+}