RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-26 22:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: stream-int: Remove unused SI_FL_CLEAN_ABRT flag

Browse Source 
This flag is unused. So remove it to be able to remove the stream-interface.
This commit is contained in:
Christopher Faulet 2022-03-30 16:31:41 +02:00
parent d139138bbc
commit 78ed7f247b
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/flags/flags.c
View File

@ -270,7 +270,6 @@ void show_si_flags(unsigned int f)
SHOW_FLAG(f, SI_FL_WAIT_DATA);
SHOW_FLAG(f, SI_FL_ISBACK);
SHOW_FLAG(f, SI_FL_WANT_GET);
SHOW_FLAG(f, SI_FL_CLEAN_ABRT);
SHOW_FLAG(f, SI_FL_RXBLK_CHAN);
SHOW_FLAG(f, SI_FL_RXBLK_BUFF);
SHOW_FLAG(f, SI_FL_RXBLK_ROOM);

1
include/haproxy/stream_interface-t.h
View File

@ -88,7 +88,6 @@ enum {
SI_FL_ISBACK = 0x00000010, /* 0 for front-side SI, 1 for back-side */
/* unused: 0x00000200 */
SI_FL_WANT_GET = 0x00004000, /* a stream-int would like to get some data from the buffer */
SI_FL_CLEAN_ABRT = 0x00008000, /* SI_FL_ERR is used to report aborts, and not SHUTR */
SI_FL_RXBLK_CHAN = 0x00010000, /* the channel doesn't want the stream-int to introduce data */
SI_FL_RXBLK_BUFF = 0x00020000, /* stream-int waits for a buffer allocation to complete */

8
src/stream.c
View File

@ -470,12 +470,8 @@ struct stream *stream_new(struct session *sess, struct conn_stream *cs, struct b
if (cs_conn(cs)) {
const struct mux_ops *mux = cs_conn_mux(cs);
if (mux) {
if (mux->flags & MX_FL_CLEAN_ABRT)
cs_si(s->csf)->flags |= SI_FL_CLEAN_ABRT;
if (mux->flags & MX_FL_HTX)
s->flags |= SF_HTX;
}
if (mux && mux->flags & MX_FL_HTX)
s->flags |= SF_HTX;
}
stream_init_srv_conn(s);