9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsockd: implement plain linebuf draining, finishing this off (closes #78)

Browse source
This commit is contained in:
William Pitcock 2016-04-03 00:09:20 -05:00
parent d3f01ce7bf
commit c90e5c0884
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
wsockd/wsockd.c
View file

@ -318,6 +318,30 @@ clean_dead_conns(void *unused)
dead_list.tail = dead_list.head = NULL; dead_list.tail = dead_list.head = NULL;
} }
static void
conn_plain_write_sendq(rb_fde_t *fd, void *data)
{
conn_t *conn = data;
int retlen;
if(IsDead(conn))
return;
while((retlen = rb_linebuf_flush(fd, &conn->plainbuf_out)) > 0)
conn->plain_out += retlen;
if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno)))
{
close_conn(data, NO_WAIT, NULL);
return;
}
if(rb_linebuf_alloclen(&conn->plainbuf_out) > 0)
rb_setselect(conn->plain_fd, RB_SELECT_WRITE, conn_plain_write_sendq, conn);
else
rb_setselect(conn->plain_fd, RB_SELECT_WRITE, NULL, NULL);
}
static void static void
conn_mod_write_sendq(rb_fde_t *fd, void *data) conn_mod_write_sendq(rb_fde_t *fd, void *data)
{ {
@ -637,6 +661,8 @@ conn_mod_process(conn_t *conn)
break; break;
} }
} }
conn_plain_write_sendq(conn->plain_fd, conn);
} }
static void static void
@ -728,7 +754,10 @@ conn_mod_read_cb(rb_fde_t *fd, void *data)
if (length < 0) if (length < 0)
{ {
if (rb_ignore_errno(errno)) if (rb_ignore_errno(errno))
{
rb_setselect(fd, RB_SELECT_READ, conn_mod_read_cb, conn); rb_setselect(fd, RB_SELECT_READ, conn_mod_read_cb, conn);
conn_plain_write_sendq(conn->plain_fd, conn);
}
else else
close_conn(conn, NO_WAIT, "Connection closed"); close_conn(conn, NO_WAIT, "Connection closed");