X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-rfcomm-client.c;h=99ad52a53004e34af334e36c89225eb32b5292d5;hb=8a4d6b041afca0b8e0bdc8c3336a3d7d563988fa;hp=06acfdd7f4aca306e63a554289496d8cdcdbe4c9;hpb=c0b9a722d345fbd2c59cccd298bb89a981faa24a;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-rfcomm-client.c b/bt-api/bt-rfcomm-client.c index 06acfdd..99ad52a 100644 --- a/bt-api/bt-rfcomm-client.c +++ b/bt-api/bt-rfcomm-client.c @@ -16,9 +16,10 @@ */ #include -#ifdef RFCOMM_DIRECT -#include #include + +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT +#include #endif #include "bluetooth-api.h" @@ -28,12 +29,20 @@ #include "bt-request-sender.h" #include "bt-event-handler.h" -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM #include "bt-dpm.h" #endif -#ifdef RFCOMM_DIRECT +/* Variable for privilege, only for write API, + before we should reduce time to bt-service dbus calling + -1 : Don't have a permission to access API + 0 : Initial value, not yet check + 1 : Have a permission to access API +*/ +static int privilege_token; + +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT #define BT_TIMEOUT_MESSAGE "Did not receive a reply. Possible causes include: " \ "the remote application did not send a reply, " \ "the message bus security policy blocked the reply, " \ @@ -42,14 +51,6 @@ static GSList *rfcomm_clients; -/* Variable for privilege, only for write API, - before we should reduce time to bt-service dbus calling - -1 : Don't have a permission to access API - 0 : Initial value, not yet check - 1 : Have a permission to access API -*/ -static int privilege_token; - typedef struct { char bt_addr[BT_ADDRESS_STRING_SIZE]; int fd; @@ -322,7 +323,7 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond, GIOStatus status = G_IO_STATUS_NORMAL; GError *err = NULL; int fd; - BT_DBG(""); + BT_DBG("+"); retv_if(info == NULL, FALSE); fd = g_io_channel_unix_get_fd(chan); @@ -390,7 +391,14 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond, result, &data_r, event_info->cb, event_info->user_data); + if (bluetooth_get_battery_monitor_state()) { + int ret = _bt_common_send_rfcomm_rx_details(&data_r); + if (ret != BLUETOOTH_ERROR_NONE) + BT_ERR("RFCOMM received data details not sent to battery monitor frwk"); + } + g_free(buffer); + BT_DBG("-"); return TRUE; } @@ -429,7 +437,38 @@ static void __client_connected_cb(rfcomm_cb_data_t *cb_data, char *dev_address, BT_DBG("-"); } -#endif +void _bt_rfcomm_client_disconnect_all(void) +{ + GSList *client; + GSList *conn; + + BT_INFO_C("### Disconnect all RFCOMM client connections"); + + for (client = rfcomm_clients; client; ) { + rfcomm_cb_data_t *info = client->data; + + for (conn = info->rfcomm_conns; conn; conn = conn->next) { + rfcomm_conn_info_t *conn_info = conn->data; + + if (conn_info == NULL) + continue; + + if (conn_info->watch_id == 0 || conn_info->disconnected) + continue; + + close(conn_info->fd); + conn_info->disconnected = TRUE; + + _bt_disconnect_ext_profile(conn_info->bt_addr, + info->obj_path); + } + + client = client->next; + __rfcomm_client_disconnect(info); + } + + return; +} int new_connection(const char *path, int fd, bluetooth_device_address_t *addr) { @@ -591,13 +630,351 @@ done: if (err) g_clear_error(&err); } +#else +GSList *rfcomm_clients; + +typedef struct { + char *uuid; + char *remote_addr; + int sock_fd; + int watch_id; +} rfcomm_client_conn_info_t; + +static gboolean __is_error_by_disconnect(GError *err) +{ + return !g_strcmp0(err->message, "Connection reset by peer") || + !g_strcmp0(err->message, "Connection timed out") || + !g_strcmp0(err->message, "Software caused connection abort"); +} + +static rfcomm_client_conn_info_t *__find_rfcomm_conn_info_with_fd(int fd) +{ + GSList *l; + + BT_DBG("+"); + + for (l = rfcomm_clients; l != NULL; l = l->next) { + rfcomm_client_conn_info_t *info = l->data; + + if (info && info->sock_fd == fd) { + BT_INFO("Match found"); + return info; + } + } + + BT_DBG("-"); + return NULL; +} + +static void __rfcomm_remove_client_conn_info_t(rfcomm_client_conn_info_t *info) +{ + ret_if(info == NULL); + + rfcomm_clients = g_slist_remove(rfcomm_clients, info); + g_free(info->uuid); + g_free(info->remote_addr); +} + +static void __bt_rfcomm_client_disconnected(rfcomm_client_conn_info_t *conn_info) +{ + + bluetooth_rfcomm_disconnection_t disconn_info; + bt_event_info_t *event_info = NULL; + + ret_if(conn_info == NULL); + + event_info = _bt_event_get_cb_data(BT_RFCOMM_CLIENT_EVENT); + ret_if(event_info == NULL); + + memset(&disconn_info, 0x00, sizeof(bluetooth_rfcomm_disconnection_t)); + disconn_info.device_role = RFCOMM_ROLE_CLIENT; + disconn_info.socket_fd = conn_info->sock_fd; + g_strlcpy(disconn_info.uuid, conn_info->uuid, BLUETOOTH_UUID_STRING_MAX); + _bt_convert_addr_string_to_type(disconn_info.device_addr.addr, + conn_info->remote_addr); + + BT_DBG("Disconnection Result[%d] BT_ADDRESS[%s] UUID[%s] FD[%d]", + BLUETOOTH_ERROR_NONE, conn_info->remote_addr, + conn_info->uuid, conn_info->sock_fd); + _bt_common_event_cb(BLUETOOTH_EVENT_RFCOMM_DISCONNECTED, + BLUETOOTH_ERROR_NONE, &disconn_info, + event_info->cb, event_info->user_data); + + BT_DBG("-"); +} + +static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond, gpointer data) +{ + bt_event_info_t *event_info; + bluetooth_rfcomm_received_data_t data_r; + rfcomm_client_conn_info_t *conn_info; + + int fd; + gsize len = 0; + char *buffer; + GError *err = NULL; + GIOStatus status = G_IO_STATUS_NORMAL; + + BT_DBG("+"); + + fd = g_io_channel_unix_get_fd(chan); + if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) { + BT_ERR_C("RFComm Client disconnected: %d", fd); + goto fail; + } + + buffer = g_malloc0(BT_RFCOMM_BUFFER_LEN + 1); + status = g_io_channel_read_chars(chan, buffer, BT_RFCOMM_BUFFER_LEN, + &len, &err); + if (status != G_IO_STATUS_NORMAL) { + BT_ERR("IO Channel read is failed with %d", status); + g_free(buffer); + if (err) { + BT_ERR("IO Channel read error [%s]", err->message); + if (status == G_IO_STATUS_ERROR && + __is_error_by_disconnect(err)) { + BT_ERR("cond : %d", cond); + g_error_free(err); + goto fail; + } + g_error_free(err); + } + + return TRUE; + } + + if (len == 0) { + BT_ERR("Length is zero, remote end hang up"); + goto fail; + } + + BT_DBG("fd: %d, len: %d, buffer: %s", fd, len, buffer); + + event_info = _bt_event_get_cb_data(BT_RFCOMM_CLIENT_EVENT); + if (event_info == NULL) { + BT_INFO("event_info == NULL"); + g_free(buffer); + return TRUE; + } + + data_r.socket_fd = fd; + data_r.buffer_size = len; + data_r.buffer = buffer; + + _bt_common_event_cb(BLUETOOTH_EVENT_RFCOMM_DATA_RECEIVED, + BLUETOOTH_ERROR_NONE, &data_r, + event_info->cb, event_info->user_data); + + g_free(buffer); + return TRUE; + +fail: + conn_info = __find_rfcomm_conn_info_with_fd(fd); + if (conn_info) { + __bt_rfcomm_client_disconnected(conn_info); + __rfcomm_remove_client_conn_info_t(conn_info); + } else { + BT_ERR("RFCOMM client conn_info not found"); + } + return FALSE; +} + +static void __rfcomm_client_connection_create_watch(rfcomm_client_conn_info_t *conn_info) +{ + GIOChannel *data_io; + + ret_if(NULL == conn_info); + + BT_DBG("+"); + + data_io = g_io_channel_unix_new(conn_info->sock_fd); + g_io_channel_set_encoding(data_io, NULL, NULL); + g_io_channel_set_flags(data_io, G_IO_FLAG_NONBLOCK, NULL); + conn_info->watch_id = g_io_add_watch(data_io, + G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL, + __client_data_received_cb, NULL); + g_io_channel_unref(data_io); + + BT_DBG("-"); +} + +static void __bt_rfcomm_handle_new_client_connection(bluetooth_rfcomm_connection_t *info) +{ + rfcomm_client_conn_info_t *conn_info; + + ret_if(NULL == info); + + BT_DBG("+"); + + conn_info = g_malloc0(sizeof(rfcomm_client_conn_info_t)); + conn_info->remote_addr = g_malloc0(BT_ADDRESS_STRING_SIZE); + _bt_convert_addr_type_to_string( + conn_info->remote_addr, info->device_addr.addr); + conn_info->uuid = g_strdup(info->uuid); + conn_info->sock_fd = info->socket_fd; + + BT_DBG("Address:%s, UUID:%s Socket: %d", + conn_info->remote_addr, conn_info->uuid, conn_info->sock_fd); + + rfcomm_clients = g_slist_append(rfcomm_clients, conn_info); + __rfcomm_client_connection_create_watch(conn_info); + + BT_DBG("-"); +} + +static void __bt_fill_garray_from_variant(GVariant *var, GArray *param) +{ + char *data; + int size; + + size = g_variant_get_size(var); + if (size > 0) { + data = (char *)g_variant_get_data(var); + if (data) + param = g_array_append_vals(param, data, size); + + } +} + + +/* TODO_40 : 4.0 merge */ +/* Don't use this function directly. Instead of it, get the out parameter only */ +static void __bt_get_event_info(int service_function, GArray *output, + int *event, int *event_type, void **param_data) +{ + ret_if(event == NULL); + + BT_DBG("service_function : %s (0x%x)", + _bt_convert_service_function_to_string(service_function), + service_function); + switch (service_function) { + case BT_RFCOMM_CLIENT_CONNECT: + *event_type = BT_RFCOMM_CLIENT_EVENT; + *event = BLUETOOTH_EVENT_RFCOMM_CONNECTED; + ret_if(output == NULL); + *param_data = &g_array_index(output, + bluetooth_rfcomm_connection_t, 0); + break; + default: + BT_ERR("Unknown function"); + return; + } +} + + +static void __async_req_cb_with_unix_fd_list(GDBusProxy *proxy, GAsyncResult *res, gpointer user_data) +{ + int result = BLUETOOTH_ERROR_NONE; + int event_type = BT_ADAPTER_EVENT; + bt_req_info_t *cb_data = user_data; + bluetooth_event_param_t bt_event; + + GError *error = NULL; + GVariant *value; + GVariant *param1; + GArray *out_param1 = NULL; + GUnixFDList *out_fd_list = NULL; + + BT_DBG("+"); + + memset(&bt_event, 0x00, sizeof(bluetooth_event_param_t)); + + value = g_dbus_proxy_call_with_unix_fd_list_finish(proxy, &out_fd_list, res, &error); + if (value == NULL) { + if (error) { + /* dBUS gives error cause */ + BT_ERR("D-Bus API failure: message[%s]", + error->message); + g_clear_error(&error); + } + result = BLUETOOTH_ERROR_TIMEOUT; + + ret_if(cb_data == NULL); + + __bt_get_event_info(cb_data->service_function, NULL, + &bt_event.event, &event_type, + &bt_event.param_data); + goto failed; + } + + g_variant_get(value, "(iv)", &result, ¶m1); + g_variant_unref(value); + + if (param1) { + out_param1 = g_array_new(TRUE, TRUE, sizeof(gchar)); + __bt_fill_garray_from_variant(param1, out_param1); + g_variant_unref(param1); + } + + if (!cb_data) + goto done; + + __bt_get_event_info(cb_data->service_function, out_param1, + &bt_event.event, &event_type, + &bt_event.param_data); + + if (result == BLUETOOTH_ERROR_NONE && out_param1) { + if (BT_RFCOMM_CLIENT_CONNECT == cb_data->service_function) { + int *fd_list_array; + int len = 0; + bluetooth_rfcomm_connection_t *conn_info; + + conn_info = (bluetooth_rfcomm_connection_t *)bt_event.param_data; + if (!out_fd_list) { + BT_ERR("out_fd_list is NULL"); + goto failed; + } + + fd_list_array = g_unix_fd_list_steal_fds(out_fd_list, &len); + BT_INFO("Num fds in fd_list is : %d, fd_list[0]: %d", len, fd_list_array[0]); + conn_info->socket_fd = fd_list_array[0]; + + BT_DBG("conn_info->socket_fd: %d", conn_info->socket_fd); + __bt_rfcomm_handle_new_client_connection(conn_info); + + if (cb_data->cb != NULL) { + /* Send client connected event */ + bt_event.result = result; + BT_INFO("event_type[%d], result=[%d]", event_type, result); + ((bluetooth_cb_func_ptr)cb_data->cb)( + bt_event.event, &bt_event, cb_data->user_data); + } + + g_free(fd_list_array); + g_object_unref(out_fd_list); + } + goto done; + } + +failed: + if (cb_data->cb == NULL) + goto done; + + /* Only if fail case, call the callback function*/ + bt_event.result = result; + + BT_INFO("event_type[%d], result=[%d]", event_type, result); + if (event_type == BT_RFCOMM_CLIENT_EVENT) { + ((bluetooth_cb_func_ptr)cb_data->cb)(bt_event.event, + &bt_event, cb_data->user_data); + } else { + BT_INFO("Not handled event type : %d", event_type); + } +done: + if (out_param1) + g_array_free(out_param1, TRUE); + + g_free(cb_data); + BT_DBG("-"); +} +#endif BT_EXPORT_API int bluetooth_rfcomm_connect( const bluetooth_device_address_t *remote_bt_address, const char *remote_uuid) { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT rfcomm_cb_data_t *cb_data = NULL; rfcomm_conn_info_t *conn = NULL; #else @@ -610,7 +987,7 @@ BT_EXPORT_API int bluetooth_rfcomm_connect( BT_CHECK_PARAMETER(remote_uuid, return); BT_CHECK_ENABLED(return); -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_bt_address) == BT_DPM_RESTRICTED) { BT_ERR("Blacklist device"); return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; @@ -636,13 +1013,13 @@ BT_EXPORT_API int bluetooth_rfcomm_connect( } #endif -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT BT_INFO_C("### Connect RFCOMM"); int ret; int id, object_id; char *path; - if (_bt_check_privilege(BT_BLUEZ_SERVICE, BT_RFCOMM_CLIENT_CONNECT) + if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_RFCOMM_CLIENT_CONNECT) == BLUETOOTH_ERROR_PERMISSION_DEINED) { BT_ERR("Don't have a privilege to use this API"); return BLUETOOTH_ERROR_PERMISSION_DEINED; @@ -659,6 +1036,7 @@ BT_EXPORT_API int bluetooth_rfcomm_connect( object_id = _bt_register_new_conn(path, new_connection); if (object_id < 0) { __rfcomm_delete_id(id); + g_free(path); return BLUETOOTH_ERROR_INTERNAL; } @@ -702,7 +1080,7 @@ BT_EXPORT_API int bluetooth_rfcomm_connect( /* In now, we only support to connecty using UUID */ connect_type = BT_RFCOMM_UUID; - if (_bt_check_privilege(BT_BLUEZ_SERVICE, BT_RFCOMM_CLIENT_CONNECT) + if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_RFCOMM_CLIENT_CONNECT) == BLUETOOTH_ERROR_PERMISSION_DEINED) { BT_ERR("Don't have a privilege to use this API"); return BLUETOOTH_ERROR_PERMISSION_DEINED; @@ -719,11 +1097,12 @@ BT_EXPORT_API int bluetooth_rfcomm_connect( g_array_append_vals(in_param3, &connect_type, sizeof(int)); - result = _bt_send_request_async(BT_BLUEZ_SERVICE, + result = _bt_send_request_async_with_unix_fd_list(BT_BLUEZ_SERVICE, BT_RFCOMM_CLIENT_CONNECT, in_param1, in_param2, in_param3, in_param4, - user_info->cb, user_info->user_data); + user_info->cb, user_info->user_data, + NULL, (GAsyncReadyCallback)__async_req_cb_with_unix_fd_list); BT_DBG("result: %x", result); @@ -735,6 +1114,7 @@ BT_EXPORT_API int bluetooth_rfcomm_connect( BT_EXPORT_API int bluetooth_rfcomm_client_is_connected(const bluetooth_device_address_t *device_address, gboolean *connected) { +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT GSList *l; GSList *conn_list = NULL; rfcomm_cb_data_t *client_info; @@ -765,6 +1145,32 @@ BT_EXPORT_API int bluetooth_rfcomm_client_is_connected(const bluetooth_device_ad } return BLUETOOTH_ERROR_NONE; +#else + GSList *l; + char address[BT_ADDRESS_STRING_SIZE] = { 0 }; + + BT_CHECK_PARAMETER(device_address, return); + BT_CHECK_PARAMETER(connected, return); + + BT_DBG("+"); + + *connected = FALSE; + _bt_convert_addr_type_to_string(address, (unsigned char *)device_address->addr); + BT_INFO("Client address: [%s]", address); + + for (l = rfcomm_clients; l != NULL; l = l->next) { + rfcomm_client_conn_info_t *info = l->data; + + if (info && !strncasecmp(info->remote_addr, address, BT_ADDRESS_STRING_SIZE)) { + BT_INFO("Match found"); + *connected = TRUE; + return BLUETOOTH_ERROR_NONE; + } + } + + BT_DBG("-"); + return BLUETOOTH_ERROR_NONE; +#endif } BT_EXPORT_API gboolean bluetooth_rfcomm_is_client_connected(void) @@ -798,7 +1204,7 @@ BT_EXPORT_API gboolean bluetooth_rfcomm_is_client_connected(void) BT_EXPORT_API int bluetooth_rfcomm_disconnect(int socket_fd) { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT rfcomm_cb_data_t *info; rfcomm_conn_info_t *conn_info; @@ -806,7 +1212,7 @@ BT_EXPORT_API int bluetooth_rfcomm_disconnect(int socket_fd) BT_CHECK_ENABLED(return); - if (_bt_check_privilege(BT_BLUEZ_SERVICE, BT_RFCOMM_SOCKET_DISCONNECT) + if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_RFCOMM_SOCKET_DISCONNECT) == BLUETOOTH_ERROR_PERMISSION_DEINED) { BT_ERR("Don't have a privilege to use this API"); return BLUETOOTH_ERROR_PERMISSION_DEINED; @@ -840,77 +1246,108 @@ BT_EXPORT_API int bluetooth_rfcomm_disconnect(int socket_fd) conn_info->disconnected = TRUE; BT_INFO("conn_info %s", conn_info->bt_addr); - _bt_disconnect_profile(conn_info->bt_addr, info->uuid, NULL, NULL); + _bt_disconnect_ext_profile(conn_info->bt_addr, info->obj_path); - /* - * ToDo : If idle_id is not zero, it means disconnect request is - * going on. Such a case, in-progress error should be returned. - */ if (info->idle_id == 0) info->idle_id = g_idle_add(__rfcomm_client_disconnect, info); return BLUETOOTH_ERROR_NONE; #else - int result; - int service_function; + rfcomm_client_conn_info_t *conn_info; - BT_CHECK_ENABLED(return); + BT_INFO_C("<<<<<<<<< RFCOMM Disconnect request from app >>>>>>>>"); - BT_INIT_PARAMS(); - BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + BT_CHECK_ENABLED(return); + retv_if(socket_fd < 0, BLUETOOTH_ERROR_INVALID_PARAM); - /* Support the OSP */ - if (socket_fd == -1) { - /* Cancel connect */ - service_function = BT_RFCOMM_CLIENT_CANCEL_CONNECT; - } else { - g_array_append_vals(in_param1, &socket_fd, sizeof(int)); - service_function = BT_RFCOMM_SOCKET_DISCONNECT; + if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_RFCOMM_SOCKET_DISCONNECT) + == BLUETOOTH_ERROR_PERMISSION_DEINED) { + BT_ERR("Don't have a privilege to use this API"); + return BLUETOOTH_ERROR_PERMISSION_DEINED; } - result = _bt_send_request(BT_BLUEZ_SERVICE, service_function, - in_param1, in_param2, in_param3, in_param4, &out_param); + BT_DBG("FD %d", socket_fd); - BT_DBG("result: %x", result); + conn_info = __find_rfcomm_conn_info_with_fd(socket_fd); + if (conn_info == NULL) { + BT_DBG("Could not find in client, so check in server"); + /* Check for fd in server list and perform the disconnection if present */ + return bluetooth_rfcomm_server_disconnect(socket_fd); + } - BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + if (conn_info->watch_id <= 0) { + BT_ERR("Invalid state"); + return BLUETOOTH_ERROR_NOT_CONNECTED; + } - return result; + /* + * Just close socket here and return. Socket close will be detected via I/O watch + * and disconnection event as well as info cleanup will be performed there. + */ + close(conn_info->sock_fd); + + return BLUETOOTH_ERROR_NONE; #endif } +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT +#else +static int __write_all(int fd, const char *buf, int len) +{ + int sent = 0, try = 0; + + BT_DBG("+"); + while (len > 0) { + int written; + + written = write(fd, buf, len); + BT_DBG("written: %d", written); + if (written < 0) { + if (errno == EINTR || errno == EAGAIN) { + try++; + if (try <= 49) + continue; + } + return -1; + } + + if (!written) + return 0; + + len -= written; + buf += written; + sent += written; + try = 0; + } + + BT_DBG("-"); + return sent; +} +#endif + BT_EXPORT_API int bluetooth_rfcomm_write(int fd, const char *buf, int length) { -#ifdef RFCOMM_DIRECT +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT int written; -#else - char *buffer; #endif int result; +#ifndef TIZEN_FEATURE_BT_RFCOMM_DIRECT + BT_CHECK_ENABLED(return); +#endif BT_CHECK_PARAMETER(buf, return); if (fd < 0) { BT_ERR("Invalid FD"); return BLUETOOTH_ERROR_INVALID_PARAM; } -#ifndef RFCOMM_DIRECT - BT_CHECK_ENABLED(return); -#endif - retv_if(length <= 0, BLUETOOTH_ERROR_INVALID_PARAM); + BT_DBG("FD : %d", fd); -#ifdef TIZEN_DPM_ENABLE - if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED || - _bt_check_dpm(BT_DPM_HF_ONLY, NULL) == BT_DPM_RESTRICTED) { - BT_ERR("Not allow to write RFCOMM data"); - return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; - } -#endif + retv_if(length <= 0, BLUETOOTH_ERROR_INVALID_PARAM); -#ifdef RFCOMM_DIRECT switch (privilege_token) { case 0: - result = _bt_check_privilege(BT_BLUEZ_SERVICE, BT_RFCOMM_SOCKET_WRITE); + result = _bt_check_privilege(BT_CHECK_PRIVILEGE, BT_RFCOMM_SOCKET_WRITE); if (result == BLUETOOTH_ERROR_NONE) { privilege_token = 1; /* Have a permission */ @@ -932,32 +1369,19 @@ BT_EXPORT_API int bluetooth_rfcomm_write(int fd, const char *buf, int length) return BLUETOOTH_ERROR_INTERNAL; } + if (bluetooth_get_battery_monitor_state()) { + int ret = _bt_common_send_rfcomm_tx_details(length); + if (ret != BLUETOOTH_ERROR_NONE) + BT_ERR("RFCOMM tx data could not be sent"); + } + +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT written = write(fd, buf, length); /*BT_DBG("Length %d, written = %d, balance(%d)", - length, written, length - written); */ + length, written, length - written); */ return written; #else - BT_INIT_PARAMS(); - BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); - - buffer = g_malloc0(length + 1); - - memcpy(buffer, buf, length); - - g_array_append_vals(in_param1, &fd, sizeof(int)); - g_array_append_vals(in_param2, &length, sizeof(int)); - g_array_append_vals(in_param3, buffer, length); - - result = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SOCKET_WRITE, - in_param1, in_param2, in_param3, in_param4, &out_param); - - BT_DBG("result: %x", result); - - BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); - - g_free(buffer); - + result = __write_all(fd, buf, length); return result; #endif } -