mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 06:41:32 +02:00
Code Issues Projects Releases Wiki Activity

REORG: stream-int: Export si_cs_recv(), si_cs_send() and si_cs_process()

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2022-04-01 13:48:39 +02:00
parent aa91d6292b
commit 9b7a9b400d
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/haproxy/stream_interface.h
View File

@ -48,6 +48,13 @@ void si_update_both(struct stream_interface *si_f, struct stream_interface *si_b
int si_sync_recv(struct stream_interface *si); int si_sync_recv(struct stream_interface *si);
void si_sync_send(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) */ /* returns the channel which receives data from this stream interface (input channel) */
static inline struct channel *si_ic(struct stream_interface *si) static inline struct channel *si_ic(struct stream_interface *si)
{ {

14
src/stream_interface.c
View File

@ -91,14 +91,6 @@ struct cs_app_ops cs_app_applet_ops = {
.shutw = cs_app_shutw_applet, .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 = { struct data_cb si_conn_cb = {
.wake = si_cs_process, .wake = si_cs_process,
.name = "STRM", .name = "STRM",
@ -427,7 +419,7 @@ static inline int si_is_conn_error(const struct stream_interface *si)
* connection's polling based on the channels and stream interface's final * connection's polling based on the channels and stream interface's final
* states. The function always returns 0. * 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 connection *conn = __cs_conn(cs);
struct stream_interface *si = cs_si(cs); struct stream_interface *si = cs_si(cs);
@ -517,7 +509,7 @@ static int si_cs_process(struct conn_stream *cs)
* caller to commit polling changes. The caller should check conn->flags * caller to commit polling changes. The caller should check conn->flags
* for errors. * 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 connection *conn = __cs_conn(cs);
struct stream_interface *si = cs_si(cs); struct stream_interface *si = cs_si(cs);
@ -1097,7 +1089,7 @@ static void cs_app_chk_snd_conn(struct conn_stream *cs)
* into the buffer from the connection. It iterates over the mux layer's * into the buffer from the connection. It iterates over the mux layer's
* rcv_buf function. * 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 connection *conn = __cs_conn(cs);
struct stream_interface *si = cs_si(cs); struct stream_interface *si = cs_si(cs);