mirror of
https://git.kernel.org/pub/scm/bluetooth/bluez.git
synced 2024-11-25 05:04:18 +08:00
Fix writing to GAttrib socket without POLLOUT event
If the GIOChannel is in the buffered state (the default) the watch function is called without receiving a POLLOUT from the socket. GLib adds a G_IO_OUT condition just because there is space in the GIOChannel internal buffer. The solution is disabling the internal buffer, which in turn, makes the call of g_io_channel_flush() useless.
This commit is contained in:
parent
2fd7cb5914
commit
1e35abda9f
@ -248,8 +248,6 @@ static gboolean can_write_data(GIOChannel *io, GIOCondition cond,
|
||||
if (iostat != G_IO_STATUS_NORMAL)
|
||||
return FALSE;
|
||||
|
||||
g_io_channel_flush(io, NULL);
|
||||
|
||||
if (cmd->expected == 0) {
|
||||
g_queue_pop_head(attrib->queue);
|
||||
command_destroy(cmd);
|
||||
@ -350,6 +348,7 @@ GAttrib *g_attrib_new(GIOChannel *io)
|
||||
struct _GAttrib *attrib;
|
||||
|
||||
g_io_channel_set_encoding(io, NULL, NULL);
|
||||
g_io_channel_set_buffered(io, FALSE);
|
||||
|
||||
attrib = g_try_new0(struct _GAttrib, 1);
|
||||
if (attrib == NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user