RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-07 22:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream-int: set flag SI_FL_CLEAN_ABRT when mux supports clean aborts

Browse Source 
By copying the info in the stream interface that the mux cleanly reports
aborts, we'll have the ability to check this flag wherever needed regardless
of the presence of a mux or not.
This commit is contained in:
Willy Tarreau 2017-12-20 16:31:43 +01:00
parent 28f1cb9da2
commit 984fca9363
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/stream_interface.h
View File

@ -74,6 +74,7 @@ enum {
SI_FL_SRC_ADDR = 0x1000, /* get the source ip/port with getsockname */
SI_FL_WANT_PUT = 0x2000, /* an applet would like to put some data into the buffer */
SI_FL_WANT_GET = 0x4000, /* an applet would like to get some data from the buffer */
SI_FL_CLEAN_ABRT = 0x8000, /* SI_FL_ERR is used to report aborts, and not SHUTR */
};
/* A stream interface has 3 parts :

3
src/stream.c
View File

@ -195,6 +195,9 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
si_set_state(&s->si[0], SI_ST_EST);
s->si[0].hcto = sess->fe->timeout.clientfin;
if (cs && cs->conn->mux && cs->conn->mux->flags & MX_FL_CLEAN_ABRT)
s->si[0].flags |= SI_FL_CLEAN_ABRT;
/* attach the incoming connection to the stream interface now. */
if (cs)
si_attach_cs(&s->si[0], cs);