X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-request-handler.c;h=53de4ba87cbae91e2f3b96e7727e3982c4d74dc6;hb=470c135b7eaf623f2dae9e80c1d4b820068247de;hp=fbd0d079d2938f8bbe4350a9dd704e489a669d24;hpb=0571628caff05a8a62926837db59e8ca95329e96;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-service/bt-request-handler.c b/bt-service/bt-request-handler.c index fbd0d07..53de4ba 100644 --- a/bt-service/bt-request-handler.c +++ b/bt-service/bt-request-handler.c @@ -43,6 +43,7 @@ #include "bt-service-pbap.h" #include "bt-service-dpm.h" #include "bt-service-agent.h" +#include "bt-service-proximity.h" static GDBusConnection *bt_service_conn; static guint owner_id = 0; @@ -69,7 +70,7 @@ static const gchar bt_service_introspection_xml[] = " " ""; -GDBusNodeInfo *node_info = NULL; +static gboolean name_acquired = FALSE; static char *current_sender_playing = NULL; @@ -152,6 +153,7 @@ static void __bt_service_method(GDBusConnection *connection, gpointer user_data) { FN_START; + BT_DBG("Method[%s] Object Path[%s] Interface Name[%s]", method_name, object_path, interface_name); @@ -201,8 +203,8 @@ static void __bt_service_method(GDBusConnection *connection, } } - BT_DBG("SERVICE TYPE [%d] SERVICE FUNC [%d]", - service_type, service_function); + BT_DBG("Service type = %s, fn = %s (0x%x)", __bt_convert_service_type_to_string(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, @@ -238,9 +240,8 @@ static void __bt_service_method(GDBusConnection *connection, goto fail; } - if (result != BLUETOOTH_ERROR_NONE) { + if (result != BLUETOOTH_ERROR_NONE) goto fail; - } if ((request_type == BT_ASYNC_REQ || service_function == BT_OBEX_SERVER_ACCEPT_CONNECTION) && @@ -258,22 +259,19 @@ static void __bt_service_method(GDBusConnection *connection, GVariant *temp = g_variant_new("(iv)", result, out_var); g_dbus_method_invocation_return_value(invocation, temp); - - g_array_free(out_param1, TRUE); - out_param1 = NULL; } } + g_array_free(out_param1, TRUE); g_variant_unref(param1); g_variant_unref(param2); g_variant_unref(param3); g_variant_unref(param4); g_variant_unref(param5); -// g_free(sender); 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", @@ -294,7 +292,6 @@ fail: g_variant_unref(param3); g_variant_unref(param4); g_variant_unref(param5); -// g_free(sender); } FN_END; @@ -515,9 +512,8 @@ int __bt_bluez_request(int function_name, case BT_IS_SCAN_FILTER_SUPPORTED:{ int is_supported = 0; - if (_bt_is_scan_filter_supported() == TRUE) { + if (_bt_is_scan_filter_supported() == TRUE) is_supported = 1; - } g_array_append_vals(*out_param1, &is_supported, sizeof(int)); @@ -629,9 +625,9 @@ int __bt_bluez_request(int function_name, int length = 0; result = _bt_get_advertising_data(&adv, &length); - if (result == BLUETOOTH_ERROR_NONE) { + if (result == BLUETOOTH_ERROR_NONE) g_array_append_vals(*out_param1, adv.data, length); - } + break; } case BT_SET_ADVERTISING_DATA: { @@ -661,9 +657,8 @@ int __bt_bluez_request(int function_name, int length = 0; result = _bt_get_scan_response_data(&rsp, &length); - if (result == BLUETOOTH_ERROR_NONE) { + if (result == BLUETOOTH_ERROR_NONE) g_array_append_vals(*out_param1, rsp.data, length); - } break; } @@ -711,15 +706,19 @@ int __bt_bluez_request(int function_name, 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, @@ -812,6 +811,17 @@ int __bt_bluez_request(int function_name, break; } + case BT_DISCONNECT_DEVICE: { + bluetooth_device_address_t addr = { {0} }; + char address[BLUETOOTH_ADDRESS_STRING_LENGTH + 1]; + + __bt_service_get_parameters(in_param1, + &addr, sizeof(bluetooth_device_address_t)); + _bt_convert_addr_type_to_string(address, addr.addr); + + result = _bt_disconnect_all(address); + break; + } case BT_BOND_DEVICE: { bluetooth_device_address_t address = { {0} }; @@ -964,6 +974,7 @@ int __bt_bluez_request(int function_name, 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; @@ -977,7 +988,10 @@ int __bt_bluez_request(int function_name, 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, @@ -1322,6 +1336,17 @@ int __bt_bluez_request(int function_name, meta_data.number = data.number; meta_data.duration = (int64_t) data.duration; + if (meta_data.title) + BT_INFO("title [%s]", meta_data.title); + if (meta_data.artist) + BT_INFO("artist [%s]", meta_data.artist); + if (meta_data.album) + BT_INFO("album [%s]", meta_data.album); + if (meta_data.genre) + BT_INFO("genre [%s]", meta_data.genre); + BT_INFO("total_tracks[%d], number[%d], duration[%d]", + meta_data.total_tracks, meta_data.number, meta_data.duration); + result = _bt_avrcp_set_track_info(&meta_data); g_free((gpointer)meta_data.title); @@ -1455,7 +1480,7 @@ int __bt_bluez_request(int function_name, break; } case BT_RFCOMM_CLIENT_CONNECT: { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT result = BLUETOOTH_ERROR_NONE; #else bluetooth_device_address_t address = { {0} }; @@ -1495,7 +1520,7 @@ int __bt_bluez_request(int function_name, break; } case BT_RFCOMM_SOCKET_DISCONNECT: { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT result = BLUETOOTH_ERROR_NONE; #else int socket_fd; @@ -1507,7 +1532,7 @@ int __bt_bluez_request(int function_name, break; } case BT_RFCOMM_SOCKET_WRITE: { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT result = BLUETOOTH_ERROR_NONE; #else int socket_fd; @@ -1523,7 +1548,7 @@ int __bt_bluez_request(int function_name, break; } case BT_RFCOMM_CREATE_SOCKET: { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT result = BLUETOOTH_ERROR_NONE; #else char *sender; @@ -1547,7 +1572,7 @@ int __bt_bluez_request(int function_name, break; } case BT_RFCOMM_REMOVE_SOCKET: { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT result = BLUETOOTH_ERROR_NONE; #else int socket_fd; @@ -2110,6 +2135,60 @@ int __bt_bluez_request(int function_name, break; } + case BT_PXP_SET_PROPERTY: { + bluetooth_device_address_t address = { {0} }; + unsigned int property = 0; + unsigned int value = 0; + + __bt_service_get_parameters(in_param1, + &address, sizeof(bluetooth_device_address_t)); + __bt_service_get_parameters(in_param2, + &property, sizeof(int)); + __bt_service_get_parameters(in_param3, + &value, sizeof(int)); + + result = bt_set_proximity_property(&address, property, value); + break; + } + case BT_PXP_GET_PROPERTY: { + bluetooth_device_address_t address = { {0} }; + unsigned int property = 0; + int value = 0; + + __bt_service_get_parameters(in_param1, + &address, sizeof(bluetooth_device_address_t)); + __bt_service_get_parameters(in_param2, + &property, sizeof(unsigned int)); + + result = bt_get_proximity_property(&address, property, &value); + if (result == BLUETOOTH_ERROR_NONE) { + g_array_append_vals(*out_param1, &value, + sizeof(int)); + } + break; + } + case BT_PXP_GET_SUPPORTED_SERIVCES: { + bluetooth_device_address_t address = { {0} }; + unsigned int property = 0; + + __bt_service_get_parameters(in_param1, + &address, sizeof(bluetooth_device_address_t)); + + result = bt_get_proximity_supported_services(&address, &property); + if (result == BLUETOOTH_ERROR_NONE) { + g_array_append_vals(*out_param1, &property, + sizeof(int)); + } + break; + } + case BT_PXP_REGISTER_REPORTER: { + result = bt_register_proximity_reporter(); + break; + } + case BT_PXP_UNREGISTER_REPORTER: { + result = bt_unregister_proximity_reporter(); + break; + } default: result = BLUETOOTH_ERROR_INTERNAL; break; @@ -2139,7 +2218,7 @@ int __bt_obexd_request(int function_name, BT_DBG("BT_OPP_PUSH_FILES"); int i; bluetooth_device_address_t address = { {0} }; - bt_file_path_t path; + bt_file_path_t *path; char **file_path; int file_count; GArray *param2; @@ -2155,17 +2234,17 @@ int __bt_obexd_request(int function_name, __bt_fill_garray_from_variant(in_param2, param2); for (i = 0; i < file_count; i++) { - path = g_array_index(param2, bt_file_path_t, i); - file_path[i] = g_strdup(path.path); + path = &g_array_index(param2, bt_file_path_t, i); + file_path[i] = g_strdup(path->path); } BT_DBG("_bt_opp_client_push_files"); result = _bt_opp_client_push_files(request_id, context, &address, file_path, file_count); - for (i = 0; i < file_count; i++) { + for (i = 0; i < file_count; i++) g_free(file_path[i]); - } + g_free(file_path); g_array_free(param2, TRUE); @@ -2564,310 +2643,336 @@ gboolean __bt_service_check_privilege(int function_name, int service_type, const char *unique_name) { - int ret_val; - gboolean result = TRUE; - char *client_creds = NULL; - char *user_creds = NULL; - char *client_session = ""; - enum cynara_client_creds client_creds_method = CLIENT_METHOD_SMACK; - enum cynara_user_creds user_creds_method = USER_METHOD_UID; - char err_msg[256] = {0, }; - - retv_if(unique_name == NULL, FALSE); - - BT_DBG("unique_name: %s", unique_name); - - retv_if(bt_service_conn == NULL, FALSE); - - ret_val = cynara_creds_get_default_client_method(&client_creds_method); - if (ret_val != CYNARA_API_SUCCESS) { - cynara_strerror(ret_val, err_msg, sizeof(err_msg)); - BT_ERR("Fail to get default client method: %s", err_msg); - return FALSE; - } - - ret_val = cynara_creds_get_default_user_method(&user_creds_method); - if (ret_val != CYNARA_API_SUCCESS) { - cynara_strerror(ret_val, err_msg, sizeof(err_msg)); - BT_ERR("Fail to get default user method: %s", err_msg); - return FALSE; - } - - ret_val = cynara_creds_gdbus_get_client(bt_service_conn, unique_name, client_creds_method, &client_creds); - if (ret_val != CYNARA_API_SUCCESS) { - cynara_strerror(ret_val, err_msg, sizeof(err_msg)); - BT_ERR("Fail to get client credential: %s", err_msg); - return FALSE; - } - - BT_DBG("client_creds: %s", client_creds); - - ret_val = cynara_creds_gdbus_get_user(bt_service_conn, unique_name, user_creds_method, &user_creds); - if (ret_val != CYNARA_API_SUCCESS) { - cynara_strerror(ret_val, err_msg, sizeof(err_msg)); - BT_ERR("Fail to get user credential: %s", err_msg); - if (client_creds) - free(client_creds); - return FALSE; - } - - BT_DBG("user_creds: %s", user_creds); - - switch (function_name) { - case BT_SET_LOCAL_NAME: - case BT_START_DISCOVERY: - case BT_START_CUSTOM_DISCOVERY: - case BT_CANCEL_DISCOVERY: - case BT_OOB_ADD_REMOTE_DATA: - case BT_OOB_REMOVE_REMOTE_DATA: - case BT_SET_ADVERTISING: - case BT_SET_CUSTOM_ADVERTISING: - case BT_SET_ADVERTISING_PARAMETERS: - case BT_START_LE_DISCOVERY: - case BT_STOP_LE_DISCOVERY: - case BT_SET_SCAN_PARAMETERS: - - case BT_BOND_DEVICE: - case BT_CANCEL_BONDING: - case BT_UNBOND_DEVICE: - case BT_SET_ALIAS: - case BT_SET_AUTHORIZATION: - case BT_UNSET_AUTHORIZATION: - case BT_SEARCH_SERVICE: - - case BT_RFCOMM_CLIENT_CONNECT: - case BT_RFCOMM_CLIENT_CANCEL_CONNECT: - case BT_RFCOMM_SOCKET_DISCONNECT: - case BT_RFCOMM_SOCKET_WRITE: - case BT_RFCOMM_CREATE_SOCKET: - case BT_RFCOMM_REMOVE_SOCKET: - - case BT_OPP_PUSH_FILES: - case BT_OPP_CANCEL_PUSH: - - case BT_OBEX_SERVER_ACCEPT_CONNECTION: - case BT_OBEX_SERVER_REJECT_CONNECTION: - case BT_OBEX_SERVER_ACCEPT_FILE: - case BT_OBEX_SERVER_REJECT_FILE: - case BT_OBEX_SERVER_SET_PATH: - case BT_OBEX_SERVER_SET_ROOT: - case BT_OBEX_SERVER_CANCEL_TRANSFER: - case BT_OBEX_SERVER_CANCEL_ALL_TRANSFERS: - - case BT_AUDIO_CONNECT: - case BT_AUDIO_DISCONNECT: - case BT_AG_CONNECT: - case BT_AG_DISCONNECT: - case BT_AV_CONNECT: - case BT_AV_DISCONNECT: - case BT_AV_SOURCE_CONNECT: - case BT_AV_SOURCE_DISCONNECT: - case BT_AVRCP_CONTROL_CONNECT: - case BT_AVRCP_CONTROL_DISCONNECT: - case BT_AVRCP_HANDLE_CONTROL: - case BT_AVRCP_SET_TRACK_INFO: - case BT_AVRCP_SET_PROPERTY: - case BT_AVRCP_SET_PROPERTIES: - case BT_AVRCP_CONTROL_SET_PROPERTY: - - case BT_HF_CONNECT: - case BT_HF_DISCONNECT: - - case BT_HID_CONNECT: - case BT_HID_DISCONNECT: - - case BT_HID_DEVICE_ACTIVATE: - case BT_HID_DEVICE_DEACTIVATE: - case BT_HID_DEVICE_CONNECT: - case BT_HID_DEVICE_DISCONNECT: - case BT_HID_DEVICE_SEND_MOUSE_EVENT: - case BT_HID_DEVICE_SEND_KEY_EVENT: - case BT_HID_DEVICE_SEND_REPLY_TO_REPORT: + int ret_val; + gboolean result = TRUE; + char *client_creds = NULL; + char *user_creds = NULL; + char *client_session = ""; + enum cynara_client_creds client_creds_method = CLIENT_METHOD_SMACK; + enum cynara_user_creds user_creds_method = USER_METHOD_UID; + char err_msg[256] = {0, }; + + retv_if(unique_name == NULL, FALSE); + retv_if(bt_service_conn == NULL, FALSE); + + ret_val = cynara_creds_get_default_client_method(&client_creds_method); + if (ret_val != CYNARA_API_SUCCESS) { + cynara_strerror(ret_val, err_msg, sizeof(err_msg)); + BT_ERR("Fail to get default client method: %s", err_msg); + return FALSE; + } + + ret_val = cynara_creds_get_default_user_method(&user_creds_method); + if (ret_val != CYNARA_API_SUCCESS) { + cynara_strerror(ret_val, err_msg, sizeof(err_msg)); + BT_ERR("Fail to get default user method: %s", err_msg); + return FALSE; + } + + ret_val = cynara_creds_gdbus_get_client(bt_service_conn, unique_name, client_creds_method, &client_creds); + if (ret_val != CYNARA_API_SUCCESS) { + cynara_strerror(ret_val, err_msg, sizeof(err_msg)); + BT_ERR("Fail to get client credential: %s", err_msg); + return FALSE; + } + + ret_val = cynara_creds_gdbus_get_user(bt_service_conn, unique_name, user_creds_method, &user_creds); + if (ret_val != CYNARA_API_SUCCESS) { + cynara_strerror(ret_val, err_msg, sizeof(err_msg)); + BT_ERR("Fail to get user credential: %s", err_msg); + if (client_creds) + free(client_creds); + return FALSE; + } + + BT_DBG("%s, %s, %s", unique_name, client_creds, user_creds); + + switch (function_name) { + case BT_SET_LOCAL_NAME: + case BT_START_DISCOVERY: + case BT_START_CUSTOM_DISCOVERY: + case BT_CANCEL_DISCOVERY: + case BT_OOB_ADD_REMOTE_DATA: + case BT_OOB_REMOVE_REMOTE_DATA: + case BT_SET_ADVERTISING: + case BT_SET_CUSTOM_ADVERTISING: + case BT_SET_ADVERTISING_PARAMETERS: + case BT_START_LE_DISCOVERY: + case BT_STOP_LE_DISCOVERY: + case BT_SET_SCAN_PARAMETERS: + + case BT_BOND_DEVICE: + case BT_CANCEL_BONDING: + case BT_UNBOND_DEVICE: + case BT_SET_ALIAS: + case BT_SET_AUTHORIZATION: + case BT_UNSET_AUTHORIZATION: + case BT_SEARCH_SERVICE: + + case BT_RFCOMM_CLIENT_CONNECT: + case BT_RFCOMM_CLIENT_CANCEL_CONNECT: + case BT_RFCOMM_SOCKET_DISCONNECT: + case BT_RFCOMM_SOCKET_WRITE: + case BT_RFCOMM_CREATE_SOCKET: + case BT_RFCOMM_REMOVE_SOCKET: + + case BT_OPP_PUSH_FILES: + case BT_OPP_CANCEL_PUSH: + + case BT_OBEX_SERVER_ACCEPT_CONNECTION: + case BT_OBEX_SERVER_REJECT_CONNECTION: + case BT_OBEX_SERVER_ACCEPT_FILE: + case BT_OBEX_SERVER_REJECT_FILE: + case BT_OBEX_SERVER_SET_PATH: + case BT_OBEX_SERVER_SET_ROOT: + case BT_OBEX_SERVER_CANCEL_TRANSFER: + case BT_OBEX_SERVER_CANCEL_ALL_TRANSFERS: + + case BT_AUDIO_CONNECT: + case BT_AUDIO_DISCONNECT: + case BT_AG_CONNECT: + case BT_AG_DISCONNECT: + case BT_AV_CONNECT: + case BT_AV_DISCONNECT: + case BT_AV_SOURCE_CONNECT: + case BT_AV_SOURCE_DISCONNECT: + case BT_AVRCP_CONTROL_CONNECT: + case BT_AVRCP_CONTROL_DISCONNECT: + case BT_AVRCP_HANDLE_CONTROL: + case BT_AVRCP_SET_TRACK_INFO: + case BT_AVRCP_SET_PROPERTY: + case BT_AVRCP_SET_PROPERTIES: + case BT_AVRCP_CONTROL_SET_PROPERTY: + + case BT_HF_CONNECT: + case BT_HF_DISCONNECT: + + case BT_HID_CONNECT: + case BT_HID_DISCONNECT: + + case BT_HID_DEVICE_ACTIVATE: + case BT_HID_DEVICE_DEACTIVATE: + case BT_HID_DEVICE_CONNECT: + case BT_HID_DEVICE_DISCONNECT: + case BT_HID_DEVICE_SEND_MOUSE_EVENT: + case BT_HID_DEVICE_SEND_KEY_EVENT: + case BT_HID_DEVICE_SEND_REPLY_TO_REPORT: case BT_HID_DEVICE_SEND_CUSTOM_EVENT: - case BT_CONNECT_LE: - case BT_DISCONNECT_LE: - - case BT_SET_ADVERTISING_DATA: - case BT_SET_SCAN_RESPONSE_DATA: - - case BT_HDP_CONNECT: - case BT_HDP_DISCONNECT: - case BT_HDP_SEND_DATA: - case BT_HDP_REGISTER_SINK_APP: - case BT_HDP_UNREGISTER_SINK_APP: - - case BT_DPM_SET_ALLOW_BT_MODE: - case BT_DPM_GET_ALLOW_BT_MODE: - case BT_DPM_SET_DEVICE_RESTRITION: - case BT_DPM_GET_DEVICE_RESTRITION: - case BT_DPM_SET_UUID_RESTRITION: - case BT_DPM_GET_UUID_RESTRITION: - case BT_DPM_ADD_DEVICES_BLACKLIST: - case BT_DPM_ADD_DEVICES_WHITELIST: - case BT_DPM_ADD_UUIDS_BLACKLIST: - case BT_DPM_ADD_UUIDS_WHITELIST: - case BT_DPM_CLEAR_DEVICES_BLACKLIST: - case BT_DPM_CLEAR_DEVICES_WHITELIST: - case BT_DPM_CLEAR_UUIDS_BLACKLIST: - case BT_DPM_CLEAR_UUIDS_WHITELIST: - case BT_DPM_REMOVE_DEVICE_BLACKLIST: - case BT_DPM_REMOVE_DEVICE_WHITELIST: - case BT_DPM_REMOVE_UUID_BLACKLIST: - case BT_DPM_REMOVE_UUID_WHITELIST: - case BT_DPM_GET_DEVICES_BLACKLIST: - case BT_DPM_GET_DEVICES_WHITELIST: - case BT_DPM_GET_UUIDS_BLACKLIST: - case BT_DPM_GET_UUIDS_WHITELIST: - case BT_DPM_SET_ALLOW_OUTGOING_CALL: - case BT_DPM_GET_ALLOW_OUTGOING_CALL: - case BT_DPM_SET_PAIRING_STATE: - case BT_DPM_GET_PAIRING_STATE: - case BT_DPM_SET_PROFILE_STATE: - case BT_DPM_GET_PROFILE_STATE: - case BT_DPM_SET_DESKROP_CONNECTIVITY_STATE: - case BT_DPM_GET_DESKROP_CONNECTIVITY_STATE: - case BT_DPM_SET_DISCOVERABLE_STATE: - case BT_DPM_GET_DISCOVERABLE_STATE: - case BT_DPM_SET_LIMITED_DISCOVERABLE_STATE: - case BT_DPM_GET_LIMITED_DISCOVERABLE_STATE: - case BT_DPM_SET_DATA_TRANSFER_STATE: - case BT_DPM_GET_DATA_TRANSFER_STATE: - - case BT_NETWORK_ACTIVATE: - case BT_NETWORK_DEACTIVATE: - case BT_NETWORK_CONNECT: - case BT_NETWORK_DISCONNECT: - case BT_NETWORK_SERVER_DISCONNECT: - - case BT_GATT_GET_PRIMARY_SERVICES: - case BT_GATT_DISCOVER_CHARACTERISTICS: - case BT_GATT_SET_PROPERTY_REQUEST: - case BT_GATT_READ_CHARACTERISTIC: - case BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR: - case BT_GATT_REGISTER_APPLICATION: - case BT_GATT_REGISTER_SERVICE: - case BT_GATT_SEND_RESPONSE: - case BT_PBAP_CONNECT: - case BT_PBAP_DISCONNECT: - case BT_PBAP_GET_PHONEBOOK_SIZE: - case BT_PBAP_GET_PHONEBOOK: - case BT_PBAP_GET_LIST: - case BT_PBAP_PULL_VCARD: - case BT_PBAP_PHONEBOOK_SEARCH: - - ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds, - BT_PRIVILEGE_PUBLIC); - - if (ret_val != CYNARA_API_ACCESS_ALLOWED) { - BT_ERR("Fail to access: %s", BT_PRIVILEGE_PUBLIC); - result = FALSE; - } - - /* Need to check mediastorage privilege */ - if (function_name == BT_PBAP_GET_PHONEBOOK || - function_name == BT_PBAP_PULL_VCARD) { - ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds, - MEDIASTORAGE_PRIVILEGE); - - if (ret_val != CYNARA_API_ACCESS_ALLOWED) { - BT_ERR("Fail to access: %s", MEDIASTORAGE_PRIVILEGE); - result = FALSE; - } - } - break; - - case BT_ENABLE_ADAPTER: - case BT_DISABLE_ADAPTER: - case BT_RESET_ADAPTER: - case BT_RECOVER_ADAPTER: - case BT_ENABLE_ADAPTER_LE: - case BT_DISABLE_ADAPTER_LE: - case BT_SET_CONNECTABLE: - case BT_SET_DISCOVERABLE_MODE: - case BT_ADD_WHITE_LIST: - case BT_REMOVE_WHITE_LIST: - case BT_CLEAR_WHITE_LIST: - case BT_SET_MANUFACTURER_DATA: - case BT_SET_PROFILE_RESTRICTED: - - case BT_CANCEL_SEARCH_SERVICE: - case BT_ENABLE_RSSI: - - case BT_RFCOMM_ACCEPT_CONNECTION: - case BT_RFCOMM_REJECT_CONNECTION: - case BT_RFCOMM_LISTEN: - - case BT_AVRCP_CONTROL_GET_PROPERTY: - case BT_AVRCP_GET_TRACK_INFO: - - case BT_SET_CONTENT_PROTECT: - case BT_BOND_DEVICE_BY_TYPE: - case BT_SET_LE_PRIVACY: - case BT_LE_CONN_UPDATE: - case BT_LE_READ_MAXIMUM_DATA_LENGTH: - case BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH: - case BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH: - case BT_LE_SET_DATA_LENGTH: - - case BT_GET_ATT_MTU: - - case BT_LE_IPSP_INIT: - case BT_LE_IPSP_DEINIT: - case BT_LE_IPSP_CONNECT: - case BT_LE_IPSP_DISCONNECT: - ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds, - BT_PRIVILEGE_PLATFORM); - - if (ret_val != CYNARA_API_ACCESS_ALLOWED) { - BT_ERR("Fail to access: %s", BT_PRIVILEGE_PLATFORM); - result = FALSE; - } - break; - - case BT_CHECK_ADAPTER: - case BT_GET_RSSI: - - case BT_GET_LOCAL_NAME: - case BT_GET_LOCAL_ADDRESS: - case BT_GET_LOCAL_VERSION: - case BT_IS_SERVICE_USED: - case BT_GET_DISCOVERABLE_MODE: - case BT_GET_DISCOVERABLE_TIME: - case BT_IS_DISCOVERYING: - case BT_IS_LE_DISCOVERYING: - case BT_IS_CONNECTABLE: - case BT_GET_BONDED_DEVICES: - case BT_GET_BONDED_DEVICE: + case BT_CONNECT_LE: + case BT_DISCONNECT_LE: + + case BT_SET_ADVERTISING_DATA: + case BT_SET_SCAN_RESPONSE_DATA: + + case BT_HDP_CONNECT: + case BT_HDP_DISCONNECT: + case BT_HDP_SEND_DATA: + case BT_HDP_REGISTER_SINK_APP: + case BT_HDP_UNREGISTER_SINK_APP: + + case BT_DPM_SET_ALLOW_BT_MODE: + case BT_DPM_GET_ALLOW_BT_MODE: + case BT_DPM_SET_DEVICE_RESTRITION: + case BT_DPM_GET_DEVICE_RESTRITION: + case BT_DPM_SET_UUID_RESTRITION: + case BT_DPM_GET_UUID_RESTRITION: + case BT_DPM_ADD_DEVICES_BLACKLIST: + case BT_DPM_ADD_DEVICES_WHITELIST: + case BT_DPM_ADD_UUIDS_BLACKLIST: + case BT_DPM_ADD_UUIDS_WHITELIST: + case BT_DPM_CLEAR_DEVICES_BLACKLIST: + case BT_DPM_CLEAR_DEVICES_WHITELIST: + case BT_DPM_CLEAR_UUIDS_BLACKLIST: + case BT_DPM_CLEAR_UUIDS_WHITELIST: + case BT_DPM_REMOVE_DEVICE_BLACKLIST: + case BT_DPM_REMOVE_DEVICE_WHITELIST: + case BT_DPM_REMOVE_UUID_BLACKLIST: + case BT_DPM_REMOVE_UUID_WHITELIST: + case BT_DPM_GET_DEVICES_BLACKLIST: + case BT_DPM_GET_DEVICES_WHITELIST: + case BT_DPM_GET_UUIDS_BLACKLIST: + case BT_DPM_GET_UUIDS_WHITELIST: + case BT_DPM_SET_ALLOW_OUTGOING_CALL: + case BT_DPM_GET_ALLOW_OUTGOING_CALL: + case BT_DPM_SET_PAIRING_STATE: + case BT_DPM_GET_PAIRING_STATE: + case BT_DPM_SET_PROFILE_STATE: + case BT_DPM_GET_PROFILE_STATE: + case BT_DPM_SET_DESKROP_CONNECTIVITY_STATE: + case BT_DPM_GET_DESKROP_CONNECTIVITY_STATE: + case BT_DPM_SET_DISCOVERABLE_STATE: + case BT_DPM_GET_DISCOVERABLE_STATE: + case BT_DPM_SET_LIMITED_DISCOVERABLE_STATE: + case BT_DPM_GET_LIMITED_DISCOVERABLE_STATE: + case BT_DPM_SET_DATA_TRANSFER_STATE: + case BT_DPM_GET_DATA_TRANSFER_STATE: + + case BT_NETWORK_ACTIVATE: + case BT_NETWORK_DEACTIVATE: + case BT_NETWORK_CONNECT: + case BT_NETWORK_DISCONNECT: + case BT_NETWORK_SERVER_DISCONNECT: + + case BT_GATT_GET_PRIMARY_SERVICES: + case BT_GATT_DISCOVER_CHARACTERISTICS: + case BT_GATT_SET_PROPERTY_REQUEST: + case BT_GATT_READ_CHARACTERISTIC: + case BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR: + case BT_GATT_REGISTER_APPLICATION: + case BT_GATT_REGISTER_SERVICE: + case BT_GATT_SEND_RESPONSE: + + case BT_REQ_ATT_MTU: + case BT_PBAP_CONNECT: + case BT_PBAP_DISCONNECT: + case BT_PBAP_GET_PHONEBOOK_SIZE: + case BT_PBAP_GET_PHONEBOOK: + case BT_PBAP_GET_LIST: + case BT_PBAP_PULL_VCARD: + case BT_PBAP_PHONEBOOK_SEARCH: + case BT_AUDIO_SELECT_ROLE: + + ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds, + BT_PRIVILEGE_PUBLIC); + + if (ret_val != CYNARA_API_ACCESS_ALLOWED) { + BT_ERR("Fail to access: %s", BT_PRIVILEGE_PUBLIC); + result = FALSE; + } + + /* Need to check mediastorage privilege */ + if (function_name == BT_PBAP_GET_PHONEBOOK || + function_name == BT_PBAP_PULL_VCARD) { + ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds, + MEDIASTORAGE_PRIVILEGE); + + if (ret_val != CYNARA_API_ACCESS_ALLOWED) { + BT_ERR("Fail to access: %s", MEDIASTORAGE_PRIVILEGE); + result = FALSE; + } + } + break; + + case BT_ENABLE_ADAPTER: + case BT_DISABLE_ADAPTER: + case BT_RESET_ADAPTER: + case BT_RECOVER_ADAPTER: + case BT_ENABLE_ADAPTER_LE: + case BT_DISABLE_ADAPTER_LE: + case BT_SET_CONNECTABLE: + case BT_SET_DISCOVERABLE_MODE: + case BT_ADD_WHITE_LIST: + case BT_REMOVE_WHITE_LIST: + case BT_CLEAR_WHITE_LIST: + case BT_SET_MANUFACTURER_DATA: + case BT_SET_PASSKEY_NOTIFICATION: + case BT_SET_PROFILE_RESTRICTED: + + case BT_DISCONNECT_DEVICE: + case BT_CANCEL_SEARCH_SERVICE: + case BT_ENABLE_RSSI: + + case BT_RFCOMM_ACCEPT_CONNECTION: + case BT_RFCOMM_REJECT_CONNECTION: + case BT_RFCOMM_LISTEN: + case BT_RFCOMM_CREATE_SOCKET_EX: + case BT_RFCOMM_REMOVE_SOCKET_EX: + + case BT_HID_ENABLE_BARCODE_FEATURE: + + case BT_AVRCP_CONTROL_GET_PROPERTY: + case BT_AVRCP_GET_TRACK_INFO: + case BT_AVRCP_TRANSPORT_SET_PROPERTY: + + + case BT_SET_CONTENT_PROTECT: + case BT_BOND_DEVICE_BY_TYPE: + case BT_SET_LE_PRIVACY: + case BT_SET_LE_STATIC_RANDOM_ADDRESS: + case BT_LE_CONN_UPDATE: + case BT_UPDATE_LE_CONNECTION_MODE: + case BT_GET_DEVICE_IDA: + case BT_ENABLE_FORCE_HCI_DUMP: + case BT_LE_READ_MAXIMUM_DATA_LENGTH: + case BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH: + case BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH: + case BT_LE_SET_DATA_LENGTH: + + case BT_LE_IPSP_INIT: + case BT_LE_IPSP_DEINIT: + case BT_LE_IPSP_CONNECT: + case BT_LE_IPSP_DISCONNECT: + case BT_PXP_SET_PROPERTY: + case BT_PXP_GET_PROPERTY: + case BT_PXP_GET_SUPPORTED_SERIVCES: + case BT_PXP_REGISTER_REPORTER: + case BT_PXP_UNREGISTER_REPORTER: + ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds, + BT_PRIVILEGE_PLATFORM); + + if (ret_val != CYNARA_API_ACCESS_ALLOWED) { + BT_ERR("Fail to access: %s", BT_PRIVILEGE_PLATFORM); + result = FALSE; + } + break; + + case BT_CHECK_ADAPTER: + case BT_GET_RSSI: + + case BT_GET_LOCAL_NAME: + case BT_GET_LOCAL_ADDRESS: + case BT_GET_LOCAL_VERSION: + case BT_IS_SERVICE_USED: + case BT_GET_DISCOVERABLE_MODE: + case BT_GET_DISCOVERABLE_TIME: + case BT_IS_DISCOVERYING: + case BT_IS_LE_DISCOVERYING: + case BT_IS_CONNECTABLE: + case BT_GET_BONDED_DEVICES: + case BT_GET_PROFILE_CONNECTED_DEVICES: + case BT_GET_BONDED_DEVICE: + case BT_PASSKEY_REPLY: + case BT_PASSKEY_CONFIRMATION_REPLY: case BT_GET_IS_ALIAS_SET: - case BT_IS_DEVICE_CONNECTED: - case BT_GET_SPEAKER_GAIN: - case BT_SET_SPEAKER_GAIN: - case BT_OOB_READ_LOCAL_DATA: - case BT_RFCOMM_CLIENT_IS_CONNECTED: - case BT_RFCOMM_IS_UUID_AVAILABLE: - case BT_GET_ADVERTISING_DATA: - case BT_GET_SCAN_RESPONSE_DATA: - case BT_IS_ADVERTISING: - case BT_GET_PROFILE_RESTRICTED: - - case BT_OBEX_SERVER_ALLOCATE: - case BT_OBEX_SERVER_DEALLOCATE: - /* Non-privilege control */ - break; - default: - BT_ERR("Unknown function!"); - result = FALSE; - break; - } - - if (client_creds) - free(client_creds); - - if (user_creds) - free(user_creds); - - return result; + case BT_IS_DEVICE_CONNECTED: + case BT_GET_CONNECTED_LINK_TYPE: + case BT_SET_PROFILE_TRUSTED: + case BT_GET_PROFILE_TRUSTED: + case BT_GET_SPEAKER_GAIN: + case BT_SET_SPEAKER_GAIN: + case BT_OOB_READ_LOCAL_DATA: + case BT_RFCOMM_CLIENT_IS_CONNECTED: + case BT_RFCOMM_IS_UUID_AVAILABLE: + case BT_GET_ADVERTISING_DATA: + case BT_GET_SCAN_RESPONSE_DATA: + case BT_IS_ADVERTISING: + case BT_REGISTER_SCAN_FILTER: + case BT_UNREGISTER_SCAN_FILTER: + case BT_UNREGISTER_ALL_SCAN_FILTERS: + case BT_IS_SCAN_FILTER_SUPPORTED: + case BT_GET_PROFILE_RESTRICTED: + case BT_GET_ATT_MTU: + + case BT_OBEX_SERVER_ALLOCATE: + case BT_OBEX_SERVER_DEALLOCATE: + case BT_OBEX_SERVER_IS_ACTIVATED: + case BT_OPP_GET_TRANSFER_PROGRESS: + /* Non-privilege control */ + break; + default: + BT_ERR("Unknown function!"); + result = FALSE; + break; + } + + if (client_creds) + free(client_creds); + + if (user_creds) + free(user_creds); + + return result; } GDBusNodeInfo *__bt_service_create_method_node_info @@ -2918,39 +3023,64 @@ int __bt_service_register_object(GDBusConnection *conn, 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: @@ -2970,10 +3100,6 @@ void _bt_service_unregister(void) 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; @@ -2983,38 +3109,38 @@ void _bt_service_unregister(void) int _bt_service_cynara_init(void) { - int result; - char err_msg[256] = {0, }; + int result; + char err_msg[256] = {0, }; - retv_if(p_cynara != NULL, BLUETOOTH_ERROR_ALREADY_INITIALIZED); + retv_if(p_cynara != NULL, BLUETOOTH_ERROR_ALREADY_INITIALIZED); - result = cynara_initialize(&p_cynara, conf); + result = cynara_initialize(&p_cynara, conf); - if (result != CYNARA_API_SUCCESS) { - cynara_strerror(result, err_msg, sizeof(err_msg)); - BT_ERR("Fail to initialize cynara: [%s]", err_msg); - return BLUETOOTH_ERROR_INTERNAL; - } + if (result != CYNARA_API_SUCCESS) { + cynara_strerror(result, err_msg, sizeof(err_msg)); + BT_ERR("Fail to initialize cynara: [%s]", err_msg); + return BLUETOOTH_ERROR_INTERNAL; + } - return BLUETOOTH_ERROR_NONE; + return BLUETOOTH_ERROR_NONE; } void _bt_service_cynara_deinit(void) { - int result; - char err_msg[256] = {0, }; + int result; + char err_msg[256] = {0, }; - ret_if(p_cynara == NULL); + ret_if(p_cynara == NULL); - result = cynara_finish(p_cynara); + result = cynara_finish(p_cynara); - if (result != CYNARA_API_SUCCESS) { - cynara_strerror(result, err_msg, sizeof(err_msg)); - BT_ERR("Fail to finish cynara: [%s]", err_msg); - return; - } + if (result != CYNARA_API_SUCCESS) { + cynara_strerror(result, err_msg, sizeof(err_msg)); + BT_ERR("Fail to finish cynara: [%s]", err_msg); + return; + } - p_cynara = NULL; - conf = NULL; + p_cynara = NULL; + conf = NULL; }