uloop_timeout_cancel(&s->state_change);
ustream_free_buffers(&s->r);
ustream_free_buffers(&s->w);
- s->write_error = false;
- s->eof = false;
- s->read_blocked = 0;
}
static void ustream_state_change_cb(struct uloop_timeout *t)
#undef DEFAULT_SET
s->state_change.cb = ustream_state_change_cb;
+ s->write_error = false;
+ s->eof = false;
+ s->eof_write_done = false;
+ s->read_blocked = 0;
+
+ s->r.buffers = 0;
+ s->r.data_bytes = 0;
+
+ s->w.buffers = 0;
+ s->w.data_bytes = 0;
}
static bool ustream_should_move(struct ustream_buf_list *l, struct ustream_buf *buf, int len)
char *ustream_reserve(struct ustream *s, int len, int *maxlen)
{
- struct ustream_buf *buf = s->r.head;
+ struct ustream_buf *buf;
if (!ustream_prepare_buf(s, &s->r, len)) {
__ustream_set_read_blocked(s, s->read_blocked | READ_BLOCKED_FULL);
return data;
}
+int ustream_read(struct ustream *s, char *buf, int buflen)
+{
+ char *chunk;
+ int chunk_len;
+ int len = 0;
+
+ do {
+ chunk = ustream_get_read_buf(s, &chunk_len);
+ if (!chunk)
+ break;
+ if (chunk_len > buflen - len)
+ chunk_len = buflen - len;
+ memcpy(buf + len, chunk, chunk_len);
+ ustream_consume(s, chunk_len);
+ len += chunk_len;
+ } while (len < buflen);
+
+ return len;
+}
+
static void ustream_write_error(struct ustream *s)
{
if (!s->write_error)