#include <sys/types.h>
#include <stdlib.h>
#include <sys/socket.h>
-
+#include<stdio.h>
#include <gio/gunixfdlist.h>
#include "bluetooth-gatt-server-api.h"
#endif
+#ifdef TIZEN_GATT_CLIENT
+#include "bluetooth-gatt-client-api.h"
+#endif
+
#include "bt-common.h"
#include "bt-request-sender.h"
#include "bt-event-handler.h"
#include "bt-dpm.h"
#endif
-
static bt_user_info_t user_info[BT_MAX_USER_INFO];
-static GDBusConnection *system_gdbus_conn = NULL;
-
+static GDBusConnection *system_shared_conn = NULL;
+static GDBusConnection *system_private_conn = NULL;
static guint bus_id;
-static GDBusConnection *system_gconn = NULL;
-
static gboolean bt_enabled = FALSE;
#define DBUS_TIMEOUT 20 * 1000 /* 20 Seconds */
-GDBusConnection *g_bus_get_private_conn(void)
+static GDBusConnection *g_bus_get_private_conn(void)
{
GError *error = NULL;
char *address;
NULL, /* GDBusAuthObserver */
NULL,
&error);
+ g_free(address);
if (!private_gconn) {
if (error) {
BT_ERR("Unable to connect to dbus: %s", error->message);
return private_gconn;
}
-GDBusConnection *_bt_gdbus_init_system_gconn(void)
+GDBusConnection *_bt_get_system_private_conn(void)
{
- if (system_gconn != NULL)
- return system_gconn;
+ if (system_private_conn == NULL)
+ system_private_conn = g_bus_get_private_conn();
+ else if (g_dbus_connection_is_closed(system_private_conn))
+ system_private_conn = g_bus_get_private_conn();
- system_gconn = g_bus_get_private_conn();
-
- return system_gconn;
+ return system_private_conn;
}
-GDBusConnection *_bt_gdbus_get_system_gconn(void)
+GDBusConnection *_bt_get_system_shared_conn(void)
{
- if (system_gconn == NULL)
- system_gconn = _bt_gdbus_init_system_gconn();
- else if (g_dbus_connection_is_closed(system_gconn))
- system_gconn = g_bus_get_private_conn();
-
- return system_gconn;
+ if (system_shared_conn == NULL) {
+ GError *error = NULL;
+ system_shared_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+ if (error) {
+ BT_ERR("GDBus connection Error : %s \n", error->message);
+ g_clear_error(&error);
+ return NULL;
+ }
+ }
+ return system_shared_conn;
}
void _bt_print_device_address_t(const bluetooth_device_address_t *addr)
return &user_info[type];
}
+int _bt_common_send_rfcomm_rx_details(bluetooth_rfcomm_received_data_t *data)
+{
+ uid_t uid = getuid();
+ pid_t pid = getpid();
+ int size = data->buffer_size;
+ int ret = BLUETOOTH_ERROR_NONE;
+
+ BT_INFO("+");
+ BT_INIT_PARAMS();
+ BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+ g_array_append_vals(in_param1, &uid, sizeof(uid_t));
+ g_array_append_vals(in_param2, &pid, sizeof(pid_t));
+ g_array_append_vals(in_param3, &size, sizeof(int));
+
+ ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SEND_RX_DETAILS,
+ in_param1, in_param2, in_param3, in_param4, &out_param);
+
+ BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+ BT_INFO("-");
+ return ret;
+}
+
+int _bt_common_send_rfcomm_tx_details(int len)
+{
+ uid_t uid = getuid();
+ pid_t pid = getpid();
+ int size = len;
+ int ret = BLUETOOTH_ERROR_NONE;
+
+ BT_INFO("+");
+ BT_INIT_PARAMS();
+ BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+ g_array_append_vals(in_param1, &uid, sizeof(uid_t));
+ g_array_append_vals(in_param2, &pid, sizeof(pid_t));
+ g_array_append_vals(in_param3, &size, sizeof(int));
+
+ ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SEND_TX_DETAILS,
+ in_param1, in_param2, in_param3, in_param4, &out_param);
+
+ BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+ BT_DBG("-");
+ return ret;
+}
+
void _bt_common_event_cb(int event, int result, void *param,
void *callback, void *user_data)
{
+ BT_DBG("+");
bluetooth_event_param_t bt_event = { 0, };
bt_event.event = event;
bt_event.result = result;
user_data);
}
+#ifdef TIZEN_GATT_CLIENT
+void _bt_gatt_client_event_cb(int event, int result, void *param,
+ void *callback, void *user_data)
+{
+ BT_DBG("__bt_gatt_client_event_cb");
+ gatt_client_event_param_t bt_event = { 0, 0, NULL, NULL };
+ bt_event.event = event;
+ bt_event.result = result;
+ bt_event.param_data = param;
+ if (callback) {
+ BT_DBG("GATT Client event callback is registered");
+ ((gatt_client_cb_func_ptr)callback)(bt_event.event, &bt_event,
+ user_data);
+ } else {
+ BT_ERR("GATT Client event callback is not registered!!!");
+ }
+}
+#endif
+
#ifndef GATT_DIRECT
void _bt_gatt_server_event_cb(int event, int result, void *param,
void *callback, void *user_data)
}
}
+void _bt_convert_uuid_type_to_string(char *str, const unsigned char *uuid)
+{
+ if (!str) {
+ BT_ERR("str == NULL");
+ return;
+ }
+
+ if (!uuid) {
+ BT_ERR("uuid == NULL");
+ return;
+ }
+
+ snprintf(str, 37,
+ "%2.2X%2.2X%2.2X%2.2X-%2.2X%2.2X-%2.2X%2.2X-%2.2X%2.2X-%2.2X%2.2X%2.2X%2.2X%2.2X%2.2X",
+ uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7],
+ uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]);
+}
+
void _bt_convert_addr_string_to_secure_string(char *addr, const char *address)
{
int len;
strncpy(addr, address, len);
addr[len] = '\0';
- addr[len-1] = 'X';
- addr[len-2] = 'X';
+ addr[len-7] = 'X';
+ addr[len-8] = 'X';
+ addr[len-10] = 'X';
+ addr[len-11] = 'X';
+ addr[len-13] = 'X';
+ addr[len-14] = 'X';
+ addr[len-16] = 'X';
+ addr[len-17] = 'X';
return;
}
ret_if(addr == NULL);
g_snprintf(address, BT_ADDRESS_STRING_SIZE,
- "%2.2X:%2.2X:%2.2X:%2.2X:XX:XX",
- addr[0], addr[1], addr[2], addr[3]);
+ "XX:XX:XX:XX:%2.2X:%2.2X", addr[4], addr[5]);
}
const char *_bt_convert_error_to_string(int error)
return "NOT_INITIALIZED";
case BLUETOOTH_ERROR_AUTHENTICATION_REJECTED:
return "AUTHENTICATION REJECTED";
+ case BLUETOOTH_ERROR_AUTHORIZATION_REJECTED:
+ return "AUTHORIZATION REJECTED";
default:
return "UNKNOWN";
}
{BT_GET_ADVERTISING_DATA, "BT_GET_ADVERTISING_DATA"},
{BT_SET_ADVERTISING_DATA, "BT_SET_ADVERTISING_DATA"},
{BT_SET_SCAN_PARAMETERS, "BT_SET_SCAN_PARAMETERS"},
+ {BT_SET_SCAN_TYPE, "BT_SET_SCAN_TYPE"},
{BT_GET_SCAN_RESPONSE_DATA, "BT_GET_SCAN_RESPONSE_DATA"},
{BT_SET_SCAN_RESPONSE_DATA, "BT_SET_SCAN_RESPONSE_DATA"},
{BT_IS_ADVERTISING, "BT_IS_ADVERTISING"},
{BT_REMOVE_WHITE_LIST, "BT_REMOVE_WHITE_LIST"},
{BT_CLEAR_WHITE_LIST, "BT_CLEAR_WHITE_LIST"},
{BT_REGISTER_SCAN_FILTER, "BT_REGISTER_SCAN_FILTER"},
- {BT_UNREGISTER_SCAN_FILTER, "BT_UNREGISTER_SCAN_FILTER"},
- {BT_UNREGISTER_ALL_SCAN_FILTERS, "BT_UNREGISTER_ALL_SCAN_FILTERS"},
{BT_IS_SCAN_FILTER_SUPPORTED, "BT_IS_SCAN_FILTER_SUPPORTED"},
{BT_GET_PROFILE_CONNECTED_DEVICES, "BT_GET_PROFILE_CONNECTED_DEVICES"},
{BT_ENABLE_FORCE_HCI_DUMP, "BT_ENABLE_FORCE_HCI_DUMP"},
{BT_UPDATE_LE_CONNECTION_MODE, "BT_UPDATE_LE_CONNECTION_MODE"},
{BT_SET_PROFILE_TRUSTED, "BT_SET_PROFILE_TRUSTED"},
{BT_GET_PROFILE_TRUSTED, "BT_GET_PROFILE_TRUSTED"},
+ {BT_DISCONNECT_DEVICE, "BT_DISCONNECT_DEVICE"},
{BT_HID_CONNECT, "BT_HID_CONNECT"},
{BT_HID_DISCONNECT, "BT_HID_DISCONNECT"},
{BT_HID_DEVICE_ACTIVATE, "BT_HID_DEVICE_ACTIVATE"},
{BT_OOB_READ_LOCAL_DATA, "BT_OOB_READ_LOCAL_DATA"},
{BT_OOB_ADD_REMOTE_DATA, "BT_OOB_ADD_REMOTE_DATA"},
{BT_OOB_REMOVE_REMOTE_DATA, "BT_OOB_REMOVE_REMOTE_DATA"},
+ {BT_LE_OOB_READ_LOCAL_DATA, "BT_LE_OOB_READ_LOCAL_DATA"},
+ {BT_LE_OOB_ADD_REMOTE_DATA, "BT_LE_OOB_ADD_REMOTE_DATA"},
{BT_AVRCP_SET_TRACK_INFO, "BT_AVRCP_SET_TRACK_INFO"},
{BT_AVRCP_SET_PROPERTY, "BT_AVRCP_SET_PROPERTY"},
{BT_AVRCP_SET_PROPERTIES, "BT_AVRCP_SET_PROPERTIES"},
{BT_AVRCP_TARGET_CONNECT, "BT_AVRCP_TARGET_CONNECT"},
{BT_AVRCP_TARGET_DISCONNECT, "BT_AVRCP_TARGET_DISCONNECT"},
{BT_AVRCP_HANDLE_CONTROL, "BT_AVRCP_HANDLE_CONTROL"},
+ {BT_AVRCP_HANDLE_CONTROL_TO_DEST, "BT_AVRCP_HANDLE_CONTROL_TO_DEST"},
{BT_AVRCP_CONTROL_SET_PROPERTY, "BT_AVRCP_CONTROL_SET_PROPERTY"},
{BT_AVRCP_CONTROL_GET_PROPERTY, "BT_AVRCP_CONTROL_GET_PROPERTY"},
{BT_AVRCP_GET_TRACK_INFO, "BT_AVRCP_GET_TRACK_INFO"},
{BT_RFCOMM_SOCKET_WRITE, "BT_RFCOMM_SOCKET_WRITE"},
{BT_RFCOMM_CREATE_SOCKET, "BT_RFCOMM_CREATE_SOCKET"},
{BT_RFCOMM_REMOVE_SOCKET, "BT_RFCOMM_REMOVE_SOCKET"},
+ {BT_RFCOMM_LISTEN_AND_ACCEPT, "BT_RFCOMM_LISTEN_AND_ACCEPT"},
{BT_RFCOMM_LISTEN, "BT_RFCOMM_LISTEN"},
{BT_RFCOMM_IS_UUID_AVAILABLE, "BT_RFCOMM_IS_UUID_AVAILABLE"},
{BT_RFCOMM_ACCEPT_CONNECTION, "BT_RFCOMM_ACCEPT_CONNECTION"},
{BT_SET_LE_PRIVACY, "BT_SET_LE_PRIVACY"},
{BT_REQ_ATT_MTU, "BT_REQ_ATT_MTU"},
{BT_GET_ATT_MTU, "BT_GET_ATT_MTU"},
+ {BT_GATT_ACQUIRE_WRITE, "BT_GATT_ACQUIRE_WRITE"},
{BT_GET_DEVICE_IDA, "BT_GET_DEVICE_IDA"},
{BT_SET_LE_STATIC_RANDOM_ADDRESS, "BT_SET_LE_STATIC_RANDOM_ADDRESS"},
{BT_HDP_CONNECT, "BT_HDP_CONNECT"},
return TRUE;
}
-
static GDBusProxy *profile_gproxy;
-static GDBusConnection *gconn;
static int latest_id = -1;
#define BT_RFCOMM_ID_MAX 245
static gboolean id_used[BT_RFCOMM_ID_MAX];
latest_id = id - 1;
}
-static GDBusConnection *__get_gdbus_connection()
-{
- if (gconn == NULL)
- gconn = g_bus_get_private_conn();
-
- return gconn;
-}
-
static GDBusProxy *__bt_gdbus_get_profile_proxy(void)
{
GDBusConnection *gconn;
if (profile_gproxy)
return profile_gproxy;
- gconn = __get_gdbus_connection();
+ /* Shared connection should be used because rfcomm interface was registered
+ * on shared connection not private. Otherwise, dbus rejection is occured
+ * because dbus policy is only applied on shared connection not private. */
+ gconn = _bt_get_system_shared_conn();
if (gconn == NULL)
return NULL;
- profile_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE,
+ profile_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL, BT_BLUEZ_NAME,
"/org/bluez",
"org.bluez.ProfileManager1",
GError *err = NULL;
GDBusProxy *device_gproxy;
- gconn = __get_gdbus_connection();
+ gconn = _bt_get_system_private_conn();
if (gconn == NULL)
return NULL;
- device_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE,
+ device_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL, BT_BLUEZ_NAME,
object_path,
BT_DEVICE_INTERFACE,
{
GDBusConnection *gconn;
- gconn = __get_gdbus_connection();
+ gconn = _bt_get_system_shared_conn();
if (gconn == NULL)
return;
g_dbus_connection_unregister_object(gconn, object_id);
+
+ /* TODO: bus_id needs to be un-owned if all of path is unregistered */
+}
+
+static GDBusNodeInfo *_bt_get_gdbus_node(GDBusConnection *gconn, const gchar *xml_data, const char *bus_name)
+{
+ if (bus_id == 0) {
+ char *name = g_strdup(bus_name);
+ BT_DBG("well-known name: %s", name);
+ bus_id = g_bus_own_name_on_connection(gconn,
+ name, G_BUS_NAME_OWNER_FLAGS_NONE,
+ NULL, NULL, NULL, NULL);
+ BT_DBG("Got bus id %d", bus_id);
+ g_free(name);
+ }
+
+ return g_dbus_node_info_new_for_xml(xml_data, NULL);
}
int _bt_register_new_conn(const char *path, bt_new_connection_cb cb)
GDBusNodeInfo *node_info;
int id;
GError *error = NULL;
+ char *bus_name;
- gconn = __get_gdbus_connection();
+ gconn = _bt_get_system_shared_conn();
if (gconn == NULL)
return -1;
- node_info = _bt_get_gdbus_node(rfcomm_agent_xml);
- if (node_info == NULL)
+ bus_name = g_strdup_printf("org.bt.frwk.p%d", getpid());
+
+ node_info = _bt_get_gdbus_node(gconn, rfcomm_agent_xml, bus_name);
+ if (node_info == NULL) {
+ g_free(bus_name);
return -1;
+ }
+ g_free(bus_name);
id = g_dbus_connection_register_object(gconn, path,
node_info->interfaces[0],
GVariant *result = NULL;
char *adapter_path = NULL;
- conn = __get_gdbus_connection();
+ conn = _bt_get_system_private_conn();
retv_if(conn == NULL, NULL);
manager_proxy = g_dbus_proxy_new_sync(conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME,
BT_MANAGER_PATH,
BT_MANAGER_INTERFACE,
BT_INFO("Adapter Path %s", adapter_path);
adapter_proxy = g_dbus_proxy_new_sync(conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME,
adapter_path,
BT_ADAPTER_INTERFACE,
int id;
GError *error = NULL;
- gconn = __get_gdbus_connection();
+ gconn = _bt_get_system_shared_conn();
if (gconn == NULL)
return -1;
- node_info = _bt_get_gdbus_node_ex(rfcomm_agent_xml, bus_name);
-
+ node_info = _bt_get_gdbus_node(gconn, rfcomm_agent_xml, bus_name);
if (node_info == NULL)
return -1;
NULL, &err);
if (err) {
g_dbus_error_strip_remote_error(err);
- BT_ERR("RegisterProfile failed: %s", err->message);
+ BT_ERR("RegisterProfile2 failed: %s", err->message);
if (g_strrstr(err->message, BT_ACCESS_DENIED_MSG))
result = BLUETOOTH_ERROR_ACCESS_DENIED;
if (err) {
g_dbus_error_strip_remote_error(err);
- BT_ERR("RegisterProfile failed: %s", err->message);
+ BT_ERR("RegisterProfile1 failed: %s", err->message);
if (g_strrstr(err->message, BT_ACCESS_DENIED_MSG))
result = BLUETOOTH_ERROR_ACCESS_DENIED;
return;
}
-GDBusNodeInfo * _bt_get_gdbus_node(const gchar *xml_data)
+void _bt_print_api_caller_name(void)
{
- if (bus_id == 0) {
- char *name = g_strdup_printf("org.bt.frwk%d", getpid());
-
- bus_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
- name,
- G_BUS_NAME_OWNER_FLAGS_NONE,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
- BT_DBG("Got bus id %d", bus_id);
- g_free(name);
+ FILE *fp = NULL;
+ char *path = NULL;
+ char buf[256] = {0, };
+ char **str_list = NULL;
+
+ path = g_strdup_printf("/proc/%d/cmdline", getpid());
+ fp = fopen(path, "r");
+ if (fp == NULL) {
+ g_free(path);
+ return;
}
- return g_dbus_node_info_new_for_xml(xml_data, NULL);
-}
-
-GDBusNodeInfo * _bt_get_gdbus_node_ex(const gchar *xml_data, const char *bus_name)
-{
- if (bus_id == 0) {
- char *name = g_strdup(bus_name);
- bus_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
- name,
- G_BUS_NAME_OWNER_FLAGS_NONE,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
- BT_DBG("Got bus id %d", bus_id);
- g_free(name);
+ if (fgets(buf, 256, fp) != NULL) {
+ str_list = g_strsplit(buf, " ", -1);
+ if (str_list[0] != NULL)
+ BT_INFO("Caller : %s", str_list[0]);
+ g_strfreev(str_list);
}
- return g_dbus_node_info_new_for_xml(xml_data, NULL);
+ fclose(fp);
+ g_free(path);
+ return;
}
int _bt_connect_profile(char *address, char *uuid, void *cb,
DBUS_TIMEOUT, NULL,
(GAsyncReadyCallback)cb,
func_data);
+ if (cb == NULL)
+ g_object_unref(proxy);
BT_DBG("-");
return BLUETOOTH_ERROR_NONE;
}
DBUS_TIMEOUT, NULL,
(GAsyncReadyCallback)cb,
func_data);
+ if (cb == NULL)
+ g_object_unref(proxy);
BT_DBG("-");
return BLUETOOTH_ERROR_NONE;
}
int result = BLUETOOTH_ERROR_INTERNAL;
BT_INFO("+");
retv_if(remote_uuid == NULL, BLUETOOTH_ERROR_INTERNAL);
- gconn = __get_gdbus_connection();
+ gconn = _bt_get_system_private_conn();
retv_if(gconn == NULL, BLUETOOTH_ERROR_INTERNAL);
object_path = _bt_get_device_object_path(address);
retv_if(object_path == NULL, BLUETOOTH_ERROR_INTERNAL);
- proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE, NULL,
+ proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME, object_path, BT_PROPERTIES_INTERFACE, NULL,
&err);
-
g_free(object_path);
-
- retv_if(proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
- if (err) {
- BT_ERR("DBus Error: [%s]", err->message);
- g_clear_error(&err);
+ if (proxy == NULL) {
+ if (err) {
+ BT_ERR("DBus Error: [%s]", err->message);
+ g_clear_error(&err);
+ }
+ return BLUETOOTH_ERROR_INTERNAL;
}
ret = g_dbus_proxy_call_sync(proxy, "Get",
g_variant_new("(ss)", BT_DEVICE_INTERFACE, "UUIDs"),
} else {
g_variant_get(ret, "(v)", &value);
uuid_value = (char **)g_variant_get_strv(value, &size);
- BT_DBG("Size items %d", size);
+ BT_DBG("Size items %zd", size);
}
if (uuid_value) {
GVariant *value = NULL;
GVariant *result = NULL;
unsigned int class = 0x00;
- int ret = BLUETOOTH_ERROR_INTERNAL;
+ int ret = BLUETOOTH_ERROR_NONE;
- gconn = __get_gdbus_connection();
+ gconn = _bt_get_system_private_conn();
retv_if(gconn == NULL, BLUETOOTH_ERROR_INTERNAL);
- object_path = _bt_get_device_object_path(address);
+ object_path = _bt_get_device_object_path(address);
retv_if(object_path == NULL, BLUETOOTH_ERROR_INTERNAL);
- proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE, NULL,
+ proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME, object_path, BT_PROPERTIES_INTERFACE, NULL,
&err);
-
- g_free(object_path);
-
- retv_if(proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
- if (err) {
- BT_ERR("DBus Error: [%s]", err->message);
- g_clear_error(&err);
+ if (proxy == NULL) {
+ ret = BLUETOOTH_ERROR_INTERNAL;
+ if (err) {
+ BT_ERR("DBus Error: [%s]", err->message);
+ g_clear_error(&err);
+ }
+ goto done;
}
result = g_dbus_proxy_call_sync(proxy, "Get",
}
done:
+ g_free(object_path);
if (proxy)
g_object_unref(proxy);
DBUS_TIMEOUT, NULL,
(GAsyncReadyCallback)cb,
func_data);
+ if (cb == NULL)
+ g_object_unref(proxy);
BT_DBG("-");
return BLUETOOTH_ERROR_NONE;
}
g_variant_new("(o)", path),
G_DBUS_CALL_FLAGS_NONE,
DBUS_TIMEOUT, NULL, NULL, NULL);
+ g_object_unref(proxy);
BT_DBG("-");
return BLUETOOTH_ERROR_NONE;
}
retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
manager_proxy = g_dbus_proxy_new_sync(conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME,
BT_MANAGER_PATH,
BT_MANAGER_INTERFACE,
GDBusConnection *conn = NULL;
char *object_path = NULL;
- conn = _bt_gdbus_get_system_gconn();
+ conn = _bt_get_system_private_conn();
retv_if(conn == NULL, NULL);
proxy = g_dbus_proxy_new_sync(conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME,
BT_MANAGER_PATH,
BT_MANAGER_INTERFACE,
return object_path;
}
-GDBusConnection *_bt_init_system_gdbus_conn(void)
-{
- GError *error = NULL;
- if (system_gdbus_conn == NULL) {
- system_gdbus_conn =
- g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
- if (error) {
- BT_ERR("GDBus connection Error : %s \n",
- error->message);
- g_clear_error(&error);
- return NULL;
- }
- }
- return system_gdbus_conn;
-}
-
-
int _bt_register_osp_server_in_agent(int type, char *uuid, char *path, int fd)
{
int ret;
BT_DBG("+");
- g_conn = _bt_gdbus_get_system_gconn();
+ g_conn = _bt_get_system_private_conn();
retv_if(g_conn == NULL, NULL);
manager_proxy = g_dbus_proxy_new_sync(g_conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_BLUEZ_NAME,
BT_MANAGER_PATH,
BT_MANAGER_INTERFACE,
NULL, &error);
- if (manager_proxy == NULL && error) {
+ if (error) {
BT_ERR("Unable to create proxy: %s", error->message);
g_clear_error(&error);
+ if (manager_proxy)
+ g_object_unref(manager_proxy);
return NULL;
}
+ if (!manager_proxy)
+ return NULL;
+
result = g_dbus_proxy_call_sync(manager_proxy,
"GetManagedObjects", NULL,
G_DBUS_CALL_FLAGS_NONE, -1,
BT_EXPORT_API int bluetooth_get_uuid_name(const char *uuid, char **name)
{
- int i;
+#define SHORT_UUID_COUNT 199
+#define LONG_UUID_COUNT 17
+
int offset = 0;
int uuid_len = 4;
- static struct {
+ typedef struct {
const char *uuid;
const char *specification_name;
- } bt_uuid_name[] = {
+ } uuid_name_s;
+ static uuid_name_s short_uuid_name[SHORT_UUID_COUNT] = {
+ // List should be sorted by UUID
/* BT Classic Services */
{"1101", "Serial Port Service"},
{"1102", "LAN Access Using PPP Service"},
{"181D", "Weight Scale"},
{"181E", "Bond Management"},
{"181F", "Continuous Glucose Monitoring"},
+ {"1820", "Internet Protocol Support Service"},
+ {"1821", "Indoor Positioning"},
+ {"1822", "Pulse Oximeter Service"},
+ {"1823", "HTTP Proxy"},
+ {"1824", "Transport Discovery"},
+ {"1825", "Object Transfer Service"},
+ {"1826", "Fitness Machine"},
+ {"1827", "Mesh Provisioning Service"},
+ {"1828", "Mesh Proxy Service"},
+ {"1829", "Reconnection Configuration"},
+ {"183A", "Insulin Delivery"},
/* GATT Declarations */
{"2800", "Primary Service Declaration"},
{"2A68", "Navigation"},
{"2A6D", "Pressure"},
{"2A6E", "Temperature"},
-
+ {"2A8E", "Height"},
+ {"2A90", "Last Name"},
+ {"2A91", "Maximum Recommended Heart Rate"},
+ {"2A92", "Resting Heart Rate"},
+ {"2A98", "Weight"},
+ {"2A9B", "Body Composition Feature"},
+ {"2A9C", "Body Composition Measurement"},
+ {"2A9D", "Weight Measurement"},
+ {"2AA2", "Language"},
+ {"2AA4", "Bond Management Control Point"},
+ {"2AA5", "Bond Management Features"},
+ {"2AA6", "Central Address Resolution"},
+ {"2AAD", "Indoor Positioning Configuration"},
+ {"2AB5", "Location Name"},
+ {"2AB6", "URI"},
+ {"2ABC", "TDS Control Point"},
+ {"2AC9", "Resolvable Private Address Only"},
+ {"2ACC", "Fitness Machine Feature"},
+ {"2ACE", "Cross Trainer Data"},
+ {"2AD3", "Training Status"},
+ {"2AD7", "Supported Heart Rate Range"},
+ {"2AD9", "Fitness Machine Control Point"},
+ {"2ADA", "Fitness Machine Status"},
+ {"2B1D", "RC Feature"},
+ {"2B1E", "RC Settings"},
+ {"2B1F", "Reconnection Configuration Control Point"},
+ };
+ static uuid_name_s long_uuid_name[LONG_UUID_COUNT] = {
+ // List should be sorted by UUID
/* Custom uuids */
- {"7905F431-B5CE-4E99-A40F-4B1E122D00D0", "Apple Notification Center Service"},
- {"9FBF120D-6301-42D9-8C58-25E699A21DBD", "Notifications Source"},
- {"69D1D8F3-45E1-49A8-9821-9BBDFDAAD9D9", "Control Point"},
+ {"1AB7C24D-185A-45B9-90D4-F7AB1A71949A", "Samsung Health Service"},
{"22EAC6E9-24D6-4BB5-BE44-B36ACE7C7BFB", "Data Source"},
+ {"2F7CABCE-808D-411F-9A0C-BB92BA96C102", "Entity Update"},
+ {"32D1955A-E5AA-4A96-9A49-08538DA8B8F6", "Samsung Gear Fit Manager Service"},
+ {"69D1D8F3-45E1-49A8-9821-9BBDFDAAD9D9", "Control Point"},
+ {"7905F431-B5CE-4E99-A40F-4B1E122D00D0", "Apple Notification Center Service"},
{"89D3502B-0F36-433A-8EF4-C502AD55F8DC", "Apple Media Service"},
+ {"9A3F68E0-86CE-11E5-A309-0002A5D5C51B", "Samsung Gear Manager Service"},
{"9B3C81D8-57B1-4A8A-B8DF-0E56F7CA51C2", "Remote Command"},
- {"2F7CABCE-808D-411F-9A0C-BB92BA96C102", "Entity Update"},
+ {"9FBF120D-6301-42D9-8C58-25E699A21DBD", "Notifications Source"},
+ {"A49EB41E-CB06-495C-9F4F-BB80A90CDF00", "Samsung Gear Manager Service"},
+ {"ADE3D529-C784-4F63-A987-EB69F70EE816", "IoT OIC Service"},
+ {"C2051EE0-804D-4D50-A12C-15E243852100", "Notifications Source"},
+ {"C2F2CC0F-C085-4DD4-BE5A-ACA3074BBC72", "Control Point"},
{"C6B2F38C-23AB-46D8-A6AB-A3A870BBD5D7", "Entity Attribute"},
- {"9A3F68E0-86CE-11E5-A309-0002A5D5C51B", "Samsung Gear Manager Service"},
- {"c2f2cc0f-c085-4dd4-be5a-aca3074bbc72", "Control Point"},
- {"cece518b-28d7-4171-92d5-76a1e249a3b9", "Notifications Source"},
- {"32D1955A-E5AA-4A96-9A49-08538DA8B8F6", "Samsung Gear Fit Manager Service"},
+ {"CECE518B-28D7-4171-92D5-76A1E249A3B9", "Notifications Source"},
{"FE53FF98-B259-4337-B56A-0EC9F82C6BAD", "Control Point"},
- {"C2051EE0-804D-4D50-A12C-15E243852100", "Notifications Source"},
- {"1ab7c24d-185a-45b9-90d4-f7ab1a71949a", "Samsung Health Service"},
- {NULL, NULL}
};
+ const uuid_name_s *uuid_name = short_uuid_name;
+ int start = 0;
+ int end = SHORT_UUID_COUNT - 1;
+ int p;
+ int ret;
if (!uuid || !name)
return BLUETOOTH_ERROR_INVALID_PARAM;
else {
offset = 0;
uuid_len = 36;
+ end = LONG_UUID_COUNT - 1;
+ uuid_name = long_uuid_name;
}
} else if (strlen(uuid) >= 8)
offset = 4;
- for (i = 0; bt_uuid_name[i].uuid; i++) {
- if (!g_ascii_strncasecmp(uuid + offset, bt_uuid_name[i].uuid, uuid_len)) {
- *name = g_strdup(bt_uuid_name[i].specification_name);
+ while (start <= end) {
+ p = start + (end - start) / 2;
+ ret = g_ascii_strncasecmp(uuid + offset, uuid_name[p].uuid, uuid_len);
+ if (ret == 0) {
+ *name = g_strdup(uuid_name[p].specification_name);
return BLUETOOTH_ERROR_NONE;
- }
+ } else if (ret < 0)
+ end = p - 1;
+ else
+ start = p + 1;
}
*name = g_strdup("Unknown");
{
int ret;
- _bt_gdbus_init_system_gconn();
+ _bt_get_system_private_conn();
ret = _bt_init_event_handler();
if (ret != BLUETOOTH_ERROR_NONE &&
{
int ret;
-
ret = _bt_deinit_event_handler();
if (ret != BLUETOOTH_ERROR_NONE)
BT_ERR("Fail to deinit the event handler");
_bt_gdbus_deinit_proxys();
- if (system_gconn) {
- g_object_unref(system_gconn);
- system_gconn = NULL;
+ if (profile_gproxy) {
+ g_object_unref(profile_gproxy);
+ profile_gproxy = NULL;
+ }
+
+ if (system_private_conn) {
+ g_object_unref(system_private_conn);
+ system_private_conn = NULL;
}
return BLUETOOTH_ERROR_NONE;
}
-