REORG: stream-int: Export si_cs_recv(), si_cs_send() and si_cs_process()
It is a transient commit. It should ease next changes about the conn-stream
refactoring. At the end these functions will be moved in the conn-stream
scope.
diff --git a/include/haproxy/stream_interface.h b/include/haproxy/stream_interface.h
index f0c16c7..6c74007 100644
--- a/include/haproxy/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -48,6 +48,13 @@
int si_sync_recv(struct stream_interface *si);
void si_sync_send(struct stream_interface *si);
+/* Functions used to communicate with a conn_stream. The first two may be used
+ * directly, the last one is mostly a wake callback.
+ */
+int si_cs_recv(struct conn_stream *cs);
+int si_cs_send(struct conn_stream *cs);
+int si_cs_process(struct conn_stream *cs);
+
/* returns the channel which receives data from this stream interface (input channel) */
static inline struct channel *si_ic(struct stream_interface *si)
{
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 95985b7..ddeab7c 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -91,14 +91,6 @@
.shutw = cs_app_shutw_applet,
};
-/* Functions used to communicate with a conn_stream. The first two may be used
- * directly, the last one is mostly a wake callback.
- */
-static int si_cs_recv(struct conn_stream *cs);
-static int si_cs_send(struct conn_stream *cs);
-static int si_cs_process(struct conn_stream *cs);
-
-
struct data_cb si_conn_cb = {
.wake = si_cs_process,
.name = "STRM",
@@ -427,7 +419,7 @@
* connection's polling based on the channels and stream interface's final
* states. The function always returns 0.
*/
-static int si_cs_process(struct conn_stream *cs)
+int si_cs_process(struct conn_stream *cs)
{
struct connection *conn = __cs_conn(cs);
struct stream_interface *si = cs_si(cs);
@@ -517,7 +509,7 @@
* caller to commit polling changes. The caller should check conn->flags
* for errors.
*/
-static int si_cs_send(struct conn_stream *cs)
+int si_cs_send(struct conn_stream *cs)
{
struct connection *conn = __cs_conn(cs);
struct stream_interface *si = cs_si(cs);
@@ -1097,7 +1089,7 @@
* into the buffer from the connection. It iterates over the mux layer's
* rcv_buf function.
*/
-static int si_cs_recv(struct conn_stream *cs)
+int si_cs_recv(struct conn_stream *cs)
{
struct connection *conn = __cs_conn(cs);
struct stream_interface *si = cs_si(cs);