X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-network.c;h=3e643b7e984bc37abe57459159289220ce89a1d1;hb=058d1c9bffbd8b4be2f16e8d55796afc7f8c4704;hp=04b018aeb24393d9a37a62417de7d2a445fcfc5c;hpb=449d38c6b737be52e1e166ed281bf8c778847e62;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-service/bt-service-network.c b/bt-service/bt-service-network.c
old mode 100755
new mode 100644
index 04b018a..3e643b7
--- a/bt-service/bt-service-network.c
+++ b/bt-service/bt-service-network.c
@@ -20,9 +20,7 @@
 #include <dlog.h>
 #include <string.h>
 #include <stdio.h>
-#if !defined(LIBNOTIFY_SUPPORT) && !defined(LIBNOTIFICATION_SUPPORT)
 #include <syspopup_caller.h>
-#endif
 #include <net_connection.h>
 
 #include "bluetooth-api.h"
@@ -121,7 +119,7 @@ int _bt_is_network_connected(void *connection, unsigned char *address,
 	handle = __bt_get_net_profile(connection,
 				CONNECTION_ITERATOR_TYPE_CONNECTED,
 				address);
-	if(handle)
+	if (handle)
 		*is_connected = TRUE;
 	else
 		*is_connected = FALSE;
@@ -252,11 +250,12 @@ int _bt_network_activate(void)
 {
 	int ret = BLUETOOTH_ERROR_NONE;
 	char *adapter_path;
+	GVariant *result = NULL;
 	GError *err = NULL;
 	GDBusConnection *conn;
 	GDBusProxy *server_proxy;
 
-	conn = _bt_get_system_gconn();
+	conn = _bt_gdbus_get_system_gconn();
 	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
 	adapter_path = _bt_get_adapter_path();
@@ -272,22 +271,27 @@ int _bt_network_activate(void)
 		return BLUETOOTH_ERROR_INTERNAL;
 	}
 
-	g_dbus_proxy_call_sync(server_proxy, "Register",
+	result = g_dbus_proxy_call_sync(server_proxy, "Register",
 				 g_variant_new("(ss)", NAP_UUID_NAME, NET_BRIDGE_INTERFACE),
 				 G_DBUS_CALL_FLAGS_NONE,
 				 -1,
 				 NULL,
 				 &err);
-	if (err != NULL) {
-		g_dbus_error_strip_remote_error(err);
-		BT_ERR("Network server register Error: %s\n", err->message);
-		if (g_strcmp0(err->message, "Already Exists") == 0) {
-			ret = BLUETOOTH_ERROR_ALREADY_INITIALIZED;
-		} else {
-			ret = BLUETOOTH_ERROR_INTERNAL;
+	if (result == NULL) {
+		if (err != NULL) {
+			g_dbus_error_strip_remote_error(err);
+			BT_ERR("Network server register Error: %s\n", err->message);
+			if (g_strcmp0(err->message, "Already Exists") == 0)
+				ret = BLUETOOTH_ERROR_ALREADY_INITIALIZED;
+			else
+				ret = BLUETOOTH_ERROR_INTERNAL;
+
+			g_error_free(err);
 		}
-		g_error_free(err);
+	} else {
+		g_variant_unref(result);
 	}
+
 	g_object_unref(server_proxy);
 
 	return ret;
@@ -296,12 +300,13 @@ int _bt_network_activate(void)
 int _bt_network_deactivate(void)
 {
 	char *adapter_path;
+	GVariant *result = NULL;
 	GError *err = NULL;
 	GDBusConnection *conn;
 	GDBusProxy *server_proxy;
 	int ret = BLUETOOTH_ERROR_NONE;
 
-	conn = _bt_get_system_gconn();
+	conn = _bt_gdbus_get_system_gconn();
 	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
 	adapter_path = _bt_get_adapter_path();
@@ -317,23 +322,28 @@ int _bt_network_deactivate(void)
 		return BLUETOOTH_ERROR_INTERNAL;
 	}
 
-	g_dbus_proxy_call_sync(server_proxy, "Unregister",
+	result = g_dbus_proxy_call_sync(server_proxy, "Unregister",
 				 g_variant_new("(s)", NAP_UUID_NAME),
 				 G_DBUS_CALL_FLAGS_NONE,
 				 -1,
 				 NULL,
 				 &err);
-	if (err != NULL) {
-		g_dbus_error_strip_remote_error(err);
-		BT_ERR("Network server unregister Error: %s\n", err->message);
-		if (g_strcmp0(err->message,
-				"Operation currently not available") == 0) {
-			ret = BLUETOOTH_ERROR_ALREADY_DEACTIVATED;
-		} else {
-			ret = BLUETOOTH_ERROR_INTERNAL;
+	if (result == NULL) {
+		if (err != NULL) {
+			g_dbus_error_strip_remote_error(err);
+			BT_ERR("Network server unregister Error: %s\n", err->message);
+			if (g_strcmp0(err->message,
+					"Operation currently not available") == 0) {
+				ret = BLUETOOTH_ERROR_ALREADY_DEACTIVATED;
+			} else {
+				ret = BLUETOOTH_ERROR_INTERNAL;
+			}
+			g_error_free(err);
 		}
-		g_error_free(err);
+	} else {
+		g_variant_unref(result);
 	}
+
 	g_object_unref(server_proxy);
 
 	return ret;
@@ -374,7 +384,7 @@ int _bt_network_connect(int request_id, int role,
 	adapter_proxy = _bt_get_adapter_proxy();
 	retv_if(adapter_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-	conn = _bt_get_system_gconn();
+	conn = _bt_gdbus_get_system_gconn();
 	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
 	_bt_convert_addr_type_to_string(address, device_address->addr);
@@ -406,6 +416,7 @@ int _bt_network_connect(int request_id, int role,
 	g_variant_unref(result);
 	retv_if(profile_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 	func_data = g_malloc0(sizeof(bt_function_data_t));
+	retv_if(func_data == NULL, BLUETOOTH_ERROR_MEMORY_ALLOCATION);
 
 	func_data->address = g_strdup(address);
 	func_data->req_id = request_id;
@@ -438,7 +449,7 @@ int _bt_network_disconnect(int request_id,
 	adapter_proxy = _bt_get_adapter_proxy();
 	retv_if(adapter_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-	conn = _bt_get_system_gconn();
+	conn = _bt_gdbus_get_system_gconn();
 	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
 	_bt_convert_addr_type_to_string(address, device_address->addr);
@@ -459,6 +470,7 @@ int _bt_network_disconnect(int request_id,
 	device_path =  g_variant_get_string(result, NULL);
 	if (device_path == NULL) {
 		BT_ERR("No paired device");
+		g_variant_unref(result);
 		return BLUETOOTH_ERROR_NOT_PAIRED;
 	}
 
@@ -469,6 +481,7 @@ int _bt_network_disconnect(int request_id,
 	g_variant_unref(result);
 	retv_if(profile_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 	func_data = g_malloc0(sizeof(bt_function_data_t));
+	retv_if(func_data == NULL, BLUETOOTH_ERROR_MEMORY_ALLOCATION);
 
 	func_data->address = g_strdup(address);
 	func_data->req_id = request_id;
@@ -495,7 +508,7 @@ int _bt_network_server_disconnect(int request_id,
 
 	BT_CHECK_PARAMETER(device_address, return);
 
-	conn = _bt_get_system_gconn();
+	conn = _bt_gdbus_get_system_gconn();
 	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
 	adapter_path = _bt_get_adapter_path();