" </interface>"
"</node>";
-GDBusNodeInfo *node_info = NULL;
+static gboolean name_acquired = FALSE;
static char *current_sender_playing = NULL;
}
}
- BT_DBG("SERVICE TYPE [%d] SERVICE FUNC [%d]",
- service_type, service_function);
+ BT_DBG("Service type = %d, fn = %s (0x%x)",
+ service_type, _bt_convert_service_function_to_string(service_function),
+ service_function);
switch (service_type) {
case BT_BLUEZ_SERVICE:
result = __bt_bluez_request(service_function,
FN_END;
return;
fail:
- BT_ERR_C("Request is failed [%s] [%x]",
+ BT_ERR_C("Request is failed [%s] [0x%x]",
_bt_convert_error_to_string(result), result);
out_var = g_variant_new_from_data((const GVariantType *)"ay",
break;
}
case BT_LE_CONN_UPDATE: {
+ char *sender = NULL;
bluetooth_device_address_t local_address = { {0} };
bluetooth_le_connection_param_t parameters = {0};
+ sender = (char *)g_dbus_method_invocation_get_sender(context);
+
__bt_service_get_parameters(in_param1, &local_address,
sizeof(bluetooth_device_address_t));
__bt_service_get_parameters(in_param2, ¶meters,
sizeof(bluetooth_le_connection_param_t));
- result = _bt_le_conn_update(local_address.addr,
+ result = _bt_le_conn_update(sender,
+ local_address.addr,
parameters.interval_min,
parameters.interval_max,
parameters.latency,
break;
}
case BT_UPDATE_LE_CONNECTION_MODE: {
+ char *sender = NULL;
bluetooth_device_address_t remote_address = { { 0 } };
bluetooth_le_connection_param_t param = { 0 };
bluetooth_le_connection_mode_t mode = BLUETOOTH_LE_CONNECTION_MODE_BALANCED;
if (result != BLUETOOTH_ERROR_NONE)
break;
- result = _bt_le_conn_update(remote_address.addr,
+ sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+ result = _bt_le_conn_update(sender,
+ remote_address.addr,
param.interval_min,
param.interval_max,
param.latency,
&address, response, tds_data.data, tds_data.length);
break;
}
+ case BT_TDS_READ_TRANSPORT_DATA: {
+ char *handle;
+ char *data = NULL;
+ guint data_len = 0;
+
+ char *sender = NULL;
+ sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+ bluetooth_device_address_t address = { {0} };
+ __bt_service_get_parameters(in_param2,
+ &address, sizeof(bluetooth_device_address_t));
+
+ data_len = g_variant_get_size(in_param1);
+ data = (char *)g_variant_get_data(in_param1);
+
+ handle = g_strndup(data, data_len);
+ BT_DBG("Read TDS Transport Block [%s]", handle);
+
+ result = _bt_tds_read_transport_data(request_id, sender, &address, handle);
+
+ if (result != BLUETOOTH_ERROR_NONE) {
+ BT_ERR("Reading TDS Transport data failed result [%d]", result);
+ g_array_append_vals(*out_param1, &address,
+ sizeof(bluetooth_device_address_t));
+ }
+ if (handle)
+ g_free(handle);
+ break;
+ }
+ case BT_TDS_ENABLE_CONTROL_POINT: {
+ char *handle;
+ char *data = NULL;
+ guint data_len = 0;
+ bluetooth_device_address_t address = { {0} };
+
+ char *sender = NULL;
+ sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+ data_len = g_variant_get_size(in_param1);
+ data = (char *)g_variant_get_data(in_param1);
+ __bt_service_get_parameters(in_param2,
+ &address, sizeof(bluetooth_device_address_t));
+
+ handle = g_strndup(data, data_len);
+ BT_DBG("TDS Control point CCCD handle [%s]", handle);
+
+ result = _bt_tds_enable_control_point(request_id, sender, &address, handle);
+
+ if (result != BLUETOOTH_ERROR_NONE) {
+ BT_ERR("Enabling TDS CCCD failed result [%d]", result);
+ g_array_append_vals(*out_param1, &address,
+ sizeof(bluetooth_device_address_t));
+ }
+ if (handle)
+ g_free(handle);
+ break;
+ }
+ case BT_TDS_ACTIVATE_CONTROL_POINT: {
+ char *handle;
+ char *data = NULL;
+ guint data_len = 0;
+ bluetooth_control_point_data_t tds_data;
+ char *sender = NULL;
+
+ sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+ bluetooth_device_address_t address = { {0} };
+
+ data_len = g_variant_get_size(in_param1);
+ data = (char *)g_variant_get_data(in_param1);
+
+ __bt_service_get_parameters(in_param2,
+ &address, sizeof(bluetooth_device_address_t));
+
+ __bt_service_get_parameters(in_param3,
+ &tds_data, sizeof(bluetooth_control_point_data_t));
+
+ handle = g_strndup(data, data_len);
+ BT_DBG("TDS Activate Control point handle [%s]", handle);
+
+ result = _bt_tds_activate_control_point(request_id, sender, &address, handle,
+ tds_data.data, tds_data.length);
+
+ if (result != BLUETOOTH_ERROR_NONE) {
+ BT_ERR("Activating TDS Control Point request failed result [%d]", result);
+ g_array_append_vals(*out_param1, &address,
+ sizeof(bluetooth_device_address_t));
+ }
+ if (handle)
+ g_free(handle);
+ break;
+ }
default:
result = BLUETOOTH_ERROR_INTERNAL;
break;
case BT_RFCOMM_REJECT_CONNECTION:
case BT_RFCOMM_LISTEN:
+ case BT_HID_ENABLE_BARCODE_FEATURE:
+
case BT_AVRCP_CONTROL_GET_PROPERTY:
case BT_AVRCP_GET_TRACK_INFO:
case BT_PXP_REPORTER_UNREGISTER:
case BT_PXP_REPORTER_GET_PROPERTY:
+ /* TDS */
case BT_TDS_PROVIDER_REGISTER:
case BT_TDS_PROVIDER_UNREGISTER:
case BT_TDS_PROVIDER_SET_MANUF_DATA:
case BT_TDS_PROVIDER_DESTROY:
case BT_TDS_PROVIDER_SET_TRANSPORT_DATA:
case BT_TDS_SEND_ACTIVATION_RESPONSE:
+ case BT_TDS_READ_TRANSPORT_DATA:
+ case BT_TDS_ENABLE_CONTROL_POINT:
+ case BT_TDS_ACTIVATE_CONTROL_POINT:
case BT_MAP_CREATE_SESSION:
case BT_MAP_DESTROY_SESSION:
return 0;
}
+static void __bt_service_bus_acquired_handler(GDBusConnection *connection,
+ const gchar *name, gpointer user_data)
+{
+ GDBusNodeInfo *node_info = NULL;
+
+ BT_INFO("bus acquired");
+
+ ret_if(connection == NULL);
+
+ node_info = __bt_service_create_method_node_info(
+ bt_service_introspection_xml);
+ ret_if(node_info == NULL);
+
+ __bt_service_register_object(connection, node_info, TRUE);
+ g_dbus_node_info_unref(node_info);
+
+ bt_service_conn = connection;
+}
+
+static void __bt_service_name_acquired_handler(GDBusConnection *connection,
+ const gchar *name, gpointer user_data)
+{
+ BT_INFO("name acquired");
+ name_acquired = TRUE;
+}
+
+static void __bt_service_name_lost_handler(GDBusConnection *connection,
+ const gchar *name, gpointer user_data)
+{
+ BT_INFO("name lost");
+ name_acquired = FALSE;
+}
+
+gboolean _is_name_acquired(void)
+{
+ return name_acquired;
+}
+
int _bt_service_register(void)
{
GDBusConnection *conn;
GError *err = NULL;
- int result;
conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+ bt_service_conn = conn;
owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
BT_SERVICE_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
- NULL, NULL, NULL,
+ __bt_service_bus_acquired_handler,
+ __bt_service_name_acquired_handler,
+ __bt_service_name_lost_handler,
NULL, NULL);
BT_DBG("owner_id is [%d]", owner_id);
if (owner_id == 0)
goto fail;
- node_info = __bt_service_create_method_node_info(
- bt_service_introspection_xml);
-
- if (node_info == NULL)
- goto fail;
-
- result = __bt_service_register_object(conn, node_info, TRUE);
- g_dbus_node_info_unref(node_info);
- node_info = NULL;
-
- if (result != BLUETOOTH_ERROR_NONE)
- goto fail;
-
- bt_service_conn = conn;
-
return BLUETOOTH_ERROR_NONE;
fail:
g_object_unref(bt_service_conn);
bt_service_conn = NULL;
}
- if (node_info) {
- g_dbus_node_info_unref(node_info);
- node_info = NULL;
- }
if (owner_id > 0) {
g_bus_unown_name(owner_id);
owner_id = 0;
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff