--- embedaddon/quagga/lib/stream.h	2012/02/21 17:26:12	1.1
+++ embedaddon/quagga/lib/stream.h	2016/11/02 10:09:10	1.1.1.3
@@ -122,6 +122,9 @@ struct stream_fifo
   /* number of bytes still to be read */
 #define STREAM_READABLE(S) ((S)->endp - (S)->getp)
 
+#define STREAM_CONCAT_REMAIN(S1, S2, size) \
+  ((size) - (S1)->endp - (S2)->endp)
+
 /* deprecated macros - do not use in new code */
 #define STREAM_PNT(S)   stream_pnt((S))
 #define STREAM_DATA(S)  ((S)->data)
@@ -145,7 +148,16 @@ extern size_t stream_get_endp (struct stream *);
 extern size_t stream_get_size (struct stream *);
 extern u_char *stream_get_data (struct stream *);
 
+/**
+ * Create a new stream structure; copy offset bytes from s1 to the new
+ * stream; copy s2 data to the new stream; copy rest of s1 data to the
+ * new stream.
+ */
+extern struct stream *stream_dupcat(struct stream *s1, struct stream *s2,
+				    size_t offset);
+
 extern void stream_set_getp (struct stream *, size_t);
+extern void stream_set_endp (struct stream *, size_t);
 extern void stream_forward_getp (struct stream *, size_t);
 extern void stream_forward_endp (struct stream *, size_t);
 
@@ -180,10 +192,6 @@ extern u_int32_t stream_get_ipv4 (struct stream *);
 /* Deprecated: assumes blocking I/O.  Will be removed. 
    Use stream_read_try instead.  */
 extern int stream_read (struct stream *, int, size_t);
-
-/* Deprecated: all file descriptors should already be non-blocking.
-   Will be removed.  Use stream_read_try instead. */
-extern int stream_read_unblock (struct stream *, int, size_t);
 
 /* Read up to size bytes into the stream.
    Return code: