static struct gatt_req_info *__bt_gatt_find_request_info(guint request_id);
static int __bt_gatt_unregister_service(struct gatt_service_info *svc_info);
-
-
-typedef struct {
- int write_fd;
- int relpy_fd;
- int mtu;
- int att_hand;
- char *path ;
-} bluetooth_gatt_acquire_notify_info_t;
-
-
static int bluetooth_get_characteristic_fd(int att_handle , char *path)
{
GSList *l;
data.mtu = mtu;
data.request_id = tran_id;
- bluetooth_gatt_server_acquire_write_info_t *write_info = g_malloc0(sizeof(bluetooth_gatt_server_acquire_write_info_t)) ;
+ bluetooth_gatt_server_acquire_write_info_t *write_info = g_malloc0(sizeof(bluetooth_gatt_server_acquire_write_info_t)) ;
write_info->attribute_handle = att_han;
write_info->connection_id = tran_id;
BT_INFO("FD read %d remote address [%s ] \n", pipefd[0], addr);
-
channel = g_io_channel_unix_new(pipefd[0]);
g_io_channel_set_encoding(channel, NULL, NULL);
g_io_channel_set_buffered(channel, FALSE);
g_io_add_watch(channel, (G_IO_IN | G_IO_ERR | G_IO_HUP),
bluetooth_gatt_server_acquire_channel_write_cb, write_info);
-
- GUnixFDList *fd_list = g_unix_fd_list_new();
- GError *error = NULL;
+ GUnixFDList *fd_list = g_unix_fd_list_new();
+ GError *error = NULL;
g_unix_fd_list_append(fd_list, pipefd[1], &error);
g_assert_no_error(error);
in_param1, in_param2, in_param3, in_param4, fd_list, &out_param, NULL);
BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-
+ g_object_unref(fd_list);
}
-
-
void bluetooth_gatt_server_send_acquire_notify_response(GVariant * parameters, bt_event_info_t *event_info)
{
int con_id = -1;
data.mtu = mtu;
data.request_id = tran_id;
- BT_INFO("FD write %d characterstics path \n", pipefd[0]);
+ BT_INFO("FD write %d", pipefd[0]);
chr_info = bluetooth_get_characteristic_info_from_path(att_han);
if (!chr_info) {
chr_info->write_fd = fd;
channel = g_io_channel_unix_new(fd);
+ chr_info->io_channel = channel;
g_io_channel_set_encoding(channel, NULL, NULL);
g_io_channel_set_buffered(channel, FALSE);
g_io_channel_set_close_on_unref(channel, TRUE);
g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL);
- g_io_add_watch(channel, (G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL),
+ chr_info->watch_id =
+ g_io_add_watch(channel,
+ (G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL),
bluetooth_gatt_write_channel_watch_cb, chr_info);
- GUnixFDList *fd_list = g_unix_fd_list_new();
- GError *error = NULL;
+ GUnixFDList *fd_list = g_unix_fd_list_new();
+ GError *error = NULL;
g_unix_fd_list_append(fd_list, pipefd[1], &error);
g_assert_no_error(error);
in_param1, in_param2, in_param3, in_param4, fd_list, &out_param, NULL);
BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-
+ g_object_unref(fd_list);
//send
if (result == BLUETOOTH_ERROR_NONE) {
chr_info = bluetooth_get_characteristic_info_from_path(handle);
if (chr_info != NULL) {
- BT_INFO("GATT Server: acquire notification char info found");
+ BT_INFO("GATT Server: acquire notification char info found [%s]", chr_info->path);
+
+ if (chr_info->watch_id > 0)
+ g_source_remove(chr_info->watch_id);
- if (chr_info->write_fd >= 0) {
- BT_INFO("closing fd");
- close(chr_info->write_fd);
+ if (chr_info->io_channel) {
+ g_io_channel_shutdown(chr_info->io_channel, TRUE, NULL);
+ g_io_channel_unref(chr_info->io_channel);
}
BT_INFO("Removing char_info from the list");