projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
When compare address, ignoring the case of the characters
[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-telephony.c
diff --git a/bt-api/bt-telephony.c b/bt-api/bt-telephony.c
index 673e787..8ae305d 100644 (file)
--- a/bt-api/bt-telephony.c
+++ b/bt-api/bt-telephony.c
@@ -49,8 +49,8 @@ typedef struct {
 } bt_telephony_info_t;
 
 
-char *src_addr = NULL;
-
+static char *src_addr = NULL;
+static guint owner_id = 0;
 
 #define BLUETOOTH_TELEPHONY_ERROR (__bluetooth_telephony_error_quark())
 
@@ -141,8 +141,6 @@ static void __bluetooth_telephony_event_filter(GDBusConnection *connection,
                                                 GVariant *parameters,
                                                 gpointer user_data);
 
-static int __bluetooth_telephony_proxy_init(void);
-static void __bluetooth_telephony_proxy_deinit(void);
 static int __bluetooth_telephony_register(void);
 static int __bluetooth_telephony_unregister(void);
 
@@ -492,18 +490,7 @@ static void __bluetooth_telephony_event_filter(GDBusConnection *connection,
 {
        BT_DBG("+");
 
-       if (strcasecmp(interface_name, HFP_AGENT_SERVICE) == 0) {
-               if (strcasecmp(signal_name, HFP_NREC_STATUS_CHANGE) == 0)
-                       __bluetooth_handle_nrec_status_change(parameters);
-               else if (strcasecmp(signal_name, HFP_ANSWER_CALL) == 0)
-                       __bluetooth_telephony_answer_call(parameters);
-               else if (strcasecmp(signal_name, HFP_REJECT_CALL) == 0)
-                       __bluetooth_telephony_reject_call(parameters);
-               else if (strcasecmp(signal_name, HFP_RELEASE_CALL) == 0)
-                       __bluetooth_telephony_release_call(parameters);
-               else if (strcasecmp(signal_name, HFP_THREEWAY_CALL) == 0)
-                       __bluetooth_telephony_threeway_call(parameters);
-       } else if (strcasecmp(interface_name, BLUEZ_HEADSET_INTERFACE) == 0) {
+       if (strcasecmp(interface_name, BLUEZ_HEADSET_INTERFACE) == 0) {
                if (strcasecmp(signal_name, "PropertyChanged") == 0) {
                        GVariant *values;
                        gchar *property;
@@ -628,7 +615,16 @@ static void __bluetooth_telephony_event_filter(GDBusConnection *connection,
                        }
 
                        g_variant_unref(values);
-               }
+               } else if (strcasecmp(signal_name, HFP_NREC_STATUS_CHANGE) == 0)
+                       __bluetooth_handle_nrec_status_change(parameters);
+               else if (strcasecmp(signal_name, HFP_ANSWER_CALL) == 0)
+                       __bluetooth_telephony_answer_call(parameters);
+               else if (strcasecmp(signal_name, HFP_REJECT_CALL) == 0)
+                       __bluetooth_telephony_reject_call(parameters);
+               else if (strcasecmp(signal_name, HFP_RELEASE_CALL) == 0)
+                       __bluetooth_telephony_release_call(parameters);
+               else if (strcasecmp(signal_name, HFP_THREEWAY_CALL) == 0)
+                       __bluetooth_telephony_threeway_call(parameters);
        }
        BT_DBG("-");
 }
@@ -691,6 +687,15 @@ static int __bluetooth_telephony_proxy_init(void)
 {
        FN_START;
        GDBusNodeInfo *node_info;
+       gchar *name;
+
+       name = g_strdup_printf("org.tizen.csd.Call.Instance.p%d", getpid());
+       BT_DBG("well-known name: %s", name);
+
+       owner_id = g_bus_own_name_on_connection(telephony_dbus_info.conn,
+                               name, G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL);
+       BT_DBG("owner_id: %d", owner_id);
+       g_free(name);
 
        node_info = __bt_telephony_create_method_node_info(
                                bt_telephony_introspection_xml);
@@ -715,9 +720,9 @@ static void __bluetooth_telephony_proxy_deinit(void)
        FN_START;
 
        __bluetooth_telephony_register_object(FALSE, NULL);
+       g_bus_unown_name(owner_id);
 
        FN_END;
-       return;
 }
 
 static int __bluetooth_telephony_register(void)
@@ -924,7 +929,7 @@ static int __bluetooth_telephony_get_connected_device(void)
        int ret = BLUETOOTH_TELEPHONY_ERROR_NONE;
 
        FN_START;
-       conn = _bt_gdbus_get_system_gconn();
+       conn = _bt_get_system_private_conn();
        retv_if(conn == NULL, BLUETOOTH_TELEPHONY_ERROR_INTERNAL);
 
        manager_proxy = g_dbus_proxy_new_sync(
@@ -1202,89 +1207,22 @@ int __bt_telephony_event_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static guint subscribe_event1_id = 0;
-       static guint subscribe_event2_id = 0;
-       static guint subscribe_event3_id = 0;
-       static guint subscribe_event4_id = 0;
-       static guint subscribe_event5_id = 0;
-       static guint subscribe_event6_id = 0;
+       static guint event_id = 0;
 
        if (subscribe == TRUE) {
-               if (subscribe_event1_id == 0) {
-                       subscribe_event1_id = g_dbus_connection_signal_subscribe(conn,
+               if (event_id == 0) {
+                       event_id = g_dbus_connection_signal_subscribe(conn,
                                        NULL, BLUEZ_HEADSET_INTERFACE,
-                                       "PropertyChanged", NULL, NULL, 0,
-                                       __bluetooth_telephony_event_filter,
-                                       NULL, NULL);
-               }
-               if (subscribe_event2_id == 0) {
-                       subscribe_event2_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, HFP_AGENT_SERVICE,
-                                       HFP_NREC_STATUS_CHANGE, NULL, NULL, 0,
+                                       NULL, NULL, NULL, 0,
                                        __bluetooth_telephony_event_filter,
                                        NULL, NULL);
                }
-
-               if (subscribe_event3_id == 0) {
-                       subscribe_event3_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, HFP_AGENT_SERVICE,
-                                       HFP_ANSWER_CALL, NULL, NULL, 0,
-                                       __bluetooth_telephony_event_filter,
-                                       NULL, NULL);
-               }
-               if (subscribe_event4_id == 0) {
-                       subscribe_event4_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, HFP_AGENT_SERVICE,
-                                       HFP_REJECT_CALL, NULL, NULL, 0,
-                                       __bluetooth_telephony_event_filter,
-                                       NULL, NULL);
-               }
-               if (subscribe_event5_id == 0) {
-                       subscribe_event5_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, HFP_AGENT_SERVICE,
-                                       HFP_RELEASE_CALL, NULL, NULL, 0,
-                                       __bluetooth_telephony_event_filter,
-                                       NULL, NULL);
-               }
-               if (subscribe_event6_id == 0) {
-                       subscribe_event6_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, HFP_AGENT_SERVICE,
-                                       HFP_THREEWAY_CALL, NULL, NULL, 0,
-                                       __bluetooth_telephony_event_filter,
-                                       NULL, NULL);
-               }
-
                return BLUETOOTH_TELEPHONY_ERROR_NONE;
        } else {
-               if (subscribe_event1_id > 0) {
-                       g_dbus_connection_signal_unsubscribe(conn,
-                                       subscribe_event1_id);
-                       subscribe_event1_id = 0;
-               }
-               if (subscribe_event2_id > 0) {
-                       g_dbus_connection_signal_unsubscribe(conn,
-                                       subscribe_event2_id);
-                       subscribe_event2_id = 0;
-               }
-               if (subscribe_event3_id > 0) {
-                       g_dbus_connection_signal_unsubscribe(conn,
-                                       subscribe_event3_id);
-                       subscribe_event3_id = 0;
-               }
-               if (subscribe_event4_id > 0) {
-                       g_dbus_connection_signal_unsubscribe(conn,
-                                       subscribe_event4_id);
-                       subscribe_event4_id = 0;
-               }
-               if (subscribe_event5_id > 0) {
-                       g_dbus_connection_signal_unsubscribe(conn,
-                                       subscribe_event5_id);
-                       subscribe_event5_id = 0;
-               }
-               if (subscribe_event6_id > 0) {
+               if (event_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
-                                       subscribe_event6_id);
-                       subscribe_event6_id = 0;
+                                       event_id);
+                       event_id = 0;
                }
                return BLUETOOTH_TELEPHONY_ERROR_NONE;
        }
@@ -1307,7 +1245,10 @@ BT_EXPORT_API int bluetooth_telephony_init(bt_telephony_func_ptr cb,
 
        is_initialized = TRUE;
 
-       telephony_dbus_info.conn = _bt_gdbus_init_system_gconn();
+       /* As a result of discussion with system team, private connection is not
+        * suitable in here. It is better to use shared connection. */
+       //telephony_dbus_info.conn = _bt_gdbus_init_system_gconn();
+       telephony_dbus_info.conn = _bt_get_system_shared_conn();
        if (!telephony_dbus_info.conn) {
                is_initialized = FALSE;
                BT_ERR("Could not get DBus Connection");
@@ -1749,7 +1690,7 @@ BT_EXPORT_API int bluetooth_telephony_audio_open(void)
                return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
        }
 
-       conn = _bt_gdbus_get_system_gconn();
+       conn = _bt_get_system_private_conn();
        if (!conn) {
                BT_DBG("No System Bus found\n");
                return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
@@ -1822,7 +1763,7 @@ BT_EXPORT_API int bluetooth_telephony_audio_close(void)
                return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
        }
 
-       conn = _bt_gdbus_get_system_gconn();
+       conn = _bt_get_system_private_conn();
        if (!conn) {
                BT_DBG("No System Bus found\n");
                return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
@@ -2328,7 +2269,7 @@ static void __bt_telephony_adapter_filter(GDBusConnection *connection,
                        return;
                }
 
-               BT_INFO("Adapter Path = [%s]", path);
+               BT_DBG("Adapter Path = [%s]", path);
                if (strcasecmp(path, DEFAULT_ADAPTER_OBJECT_PATH) == 0) {
                        if (__bt_telephony_get_src_addr(optional_param))
                                BT_ERR("Fail to get the local adapter address");
Domain: Network & Connectivity / Bluetooth;