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

MINOR: stream-int: Always access the stream-int via the conn-stream

Browse Source 
To be able to move the stream-interface from the stream to the conn-stream,
all access to the SI is done via the conn-stream. This patch is limited to
the stream-interface part.
This commit is contained in:
Christopher Faulet 2021-12-23 15:15:22 +01:00
parent 0dd566b42e
commit 165ca0e812
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/haproxy/stream_interface.h
View File

@ -51,19 +51,13 @@ void si_sync_send(struct stream_interface *si);
/* 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)
{ {
if (si->flags & SI_FL_ISBACK) return ((si->flags & SI_FL_ISBACK) ? &(cs_strm(si->cs)->res) : &(cs_strm(si->cs)->req));
return &LIST_ELEM(si, struct stream *, si[1])->res;
else
return &LIST_ELEM(si, struct stream *, si[0])->req;
} }
/* returns the channel which feeds data to this stream interface (output channel) */ /* returns the channel which feeds data to this stream interface (output channel) */
static inline struct channel *si_oc(struct stream_interface *si) static inline struct channel *si_oc(struct stream_interface *si)
{ {
if (si->flags & SI_FL_ISBACK) return ((si->flags & SI_FL_ISBACK) ? &(cs_strm(si->cs)->req) : &(cs_strm(si->cs)->res));
return &LIST_ELEM(si, struct stream *, si[1])->req;
else
return &LIST_ELEM(si, struct stream *, si[0])->res;
} }
/* returns the buffer which receives data from this stream interface (input channel's buffer) */ /* returns the buffer which receives data from this stream interface (input channel's buffer) */
@ -81,28 +75,19 @@ static inline struct buffer *si_ob(struct stream_interface *si)
/* returns the stream associated to a stream interface */ /* returns the stream associated to a stream interface */
static inline struct stream *si_strm(struct stream_interface *si) static inline struct stream *si_strm(struct stream_interface *si)
{ {
if (si->flags & SI_FL_ISBACK) return cs_strm(si->cs);
return LIST_ELEM(si, struct stream *, si[1]);
else
return LIST_ELEM(si, struct stream *, si[0]);
} }
/* returns the task associated to this stream interface */ /* returns the task associated to this stream interface */
static inline struct task *si_task(struct stream_interface *si) static inline struct task *si_task(struct stream_interface *si)
{ {
if (si->flags & SI_FL_ISBACK) return cs_strm(si->cs)->task;
return LIST_ELEM(si, struct stream *, si[1])->task;
else
return LIST_ELEM(si, struct stream *, si[0])->task;
} }
/* returns the stream interface on the other side. Used during forwarding. */ /* returns the stream interface on the other side. Used during forwarding. */
static inline struct stream_interface *si_opposite(struct stream_interface *si) static inline struct stream_interface *si_opposite(struct stream_interface *si)
{ {
if (si->flags & SI_FL_ISBACK) return ((si->flags & SI_FL_ISBACK) ? &(cs_strm(si->cs)->si[0]) : &(cs_strm(si->cs)->si[1]));
return &LIST_ELEM(si, struct stream *, si[1])->si[0];
else
return &LIST_ELEM(si, struct stream *, si[0])->si[1];
} }
/* initializes a stream interface in the SI_ST_INI state. It's detached from /* initializes a stream interface in the SI_ST_INI state. It's detached from