Merge "citrix" branch into "master".

[openvswitch] / lib / stream.h

diff --git a/lib/stream.h b/lib/stream.h
index 76c9e6c67238ec46920f1b2ec54142ee2fdf4014..e7eef365b4b8d83cb845d999995a5452bb6179b4 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -17,17 +17,14 @@
 #ifndef STREAM_H
 #define STREAM_H 1
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "flow.h"
-
 struct pstream;
 struct stream;
 
-void stream_usage(const char *name, bool active, bool passive);
+void stream_usage(const char *name, bool active, bool passive, bool bootstrap);
 
 /* Bidirectional byte streams. */
 int stream_open(const char *name, struct stream **);
@@ -42,6 +39,9 @@ int stream_connect(struct stream *);
 int stream_recv(struct stream *, void *buffer, size_t n);
 int stream_send(struct stream *, const void *buffer, size_t n);
 
+void stream_run(struct stream *);
+void stream_run_wait(struct stream *);
+
 enum stream_wait_type {
     STREAM_CONNECT,
     STREAM_RECV,
@@ -57,6 +57,7 @@ int pstream_open(const char *name, struct pstream **);
 const char *pstream_get_name(const struct pstream *);
 void pstream_close(struct pstream *);
 int pstream_accept(struct pstream *, struct stream **);
+int pstream_accept_block(struct pstream *, struct stream **);
 void pstream_wait(struct pstream *);
 
 #endif /* stream.h */