X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=ustream.h;h=53e08280bf522118f6ff53447aa62e71aeb1b16e;hp=c9e23e89f504a73e5d4cf484b64f9c2676317f1c;hb=368fd2645878edadc72c60948d1f19c6769751d6;hpb=768a69b3cedfebde10825847e42f35ed4aee1856

diff --git a/ustream.h b/ustream.h
index c9e23e8..53e0828 100644
--- a/ustream.h
+++ b/ustream.h
@@ -19,6 +19,7 @@
 #ifndef __USTREAM_H
 #define __USTREAM_H
 
+#include <stdarg.h>
 #include "uloop.h"
 
 struct ustream;
@@ -48,9 +49,10 @@ struct ustream_buf_list {
 struct ustream {
 	struct ustream_buf_list r, w;
 	struct uloop_timeout state_change;
+	struct ustream *next;
 
 	/*
-	 * notify_read:
+	 * notify_read: (optional)
 	 * called by the ustream core to notify that new data is available
 	 * for reading.
 	 * must not free the ustream from this callback
@@ -66,7 +68,7 @@ struct ustream {
 	void (*notify_write)(struct ustream *s, int bytes);
 
 	/*
-	 * notify_state:
+	 * notify_state: (optional)
 	 * called by the ustream implementation to notify that the read
 	 * side of the stream is closed (eof is set) or there was a write
 	 * error (write_error is set).
@@ -99,6 +101,14 @@ struct ustream {
 	void (*set_read_blocked)(struct ustream *s);
 
 	/*
+	 * poll: (optional)
+	 * defined by the upstream implementation, called to request polling for
+	 * available data.
+	 * returns true if data was fetched.
+	 */
+	bool (*poll)(struct ustream *s);
+
+	/*
 	 * ustream user should set this if the input stream is expected
 	 * to contain string data. the core will keep all data 0-terminated.
 	 */
@@ -133,6 +143,11 @@ void ustream_free(struct ustream *s);
 /* ustream_consume: remove data from the head of the read buffer */
 void ustream_consume(struct ustream *s, int len);
 
+/*
+ * ustream_read: read and consume data in read buffer into caller-specified
+ * area.  Return length of data read.
+ */
+int ustream_read(struct ustream *s, char *buf, int buflen);
 /* ustream_write: add data to the write buffer */
 int ustream_write(struct ustream *s, const char *buf, int len, bool more);
 int ustream_printf(struct ustream *s, const char *format, ...);
@@ -153,6 +168,19 @@ static inline bool ustream_read_blocked(struct ustream *s)
 	return !!(s->read_blocked & READ_BLOCKED_USER);
 }
 
+static inline int ustream_pending_data(struct ustream *s, bool write)
+{
+	struct ustream_buf_list *b = write ? &s->w : &s->r;
+	return b->data_bytes;
+}
+
+static inline bool ustream_read_buf_full(struct ustream *s)
+{
+	struct ustream_buf *buf = s->r.data_tail;
+	return buf && buf->data == buf->head && buf->tail == buf->end &&
+	       s->r.buffers == s->r.max_buffers;
+}
+
 /*** --- functions only used by ustream implementations --- ***/
 
 /* ustream_init_defaults: fill default callbacks and options */
@@ -180,4 +208,12 @@ static inline void ustream_state_change(struct ustream *s)
 	uloop_timeout_set(&s->state_change, 0);
 }
 
+static inline bool ustream_poll(struct ustream *s)
+{
+	if (!s->poll)
+		return false;
+
+	return s->poll(s);
+}
+
 #endif