mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-02-28 08:30:46 +00:00
MINOR: conn-stream: Add ISBACK conn-stream flag
CS_FL_ISBACK is a new flag, set on backend conn-streams. We must just be careful to preserve this flag when the endpoint is detached from the conn-stream.
This commit is contained in:
parent
1bceee21e3
commit
3099511571
@ -219,6 +219,7 @@ void show_cs_flags(unsigned int f)
|
|||||||
printf("0\n");
|
printf("0\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
SHOW_FLAG(f, CS_FL_ISBACK);
|
||||||
|
|
||||||
if (f) {
|
if (f) {
|
||||||
printf("EXTRA(0x%08x)", f);
|
printf("EXTRA(0x%08x)", f);
|
||||||
|
@ -78,6 +78,7 @@ struct stream_interface;
|
|||||||
/* conn_stream flags */
|
/* conn_stream flags */
|
||||||
enum {
|
enum {
|
||||||
CS_FL_NONE = 0x00000000, /* Just for initialization purposes */
|
CS_FL_NONE = 0x00000000, /* Just for initialization purposes */
|
||||||
|
CS_FL_ISBACK = 0x00000001, /* Set for CS on back-side */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* cs_shutr() modes */
|
/* cs_shutr() modes */
|
||||||
|
@ -267,7 +267,7 @@ void cs_detach_endp(struct conn_stream *cs)
|
|||||||
/* FIXME: Rest CS for now but must be reviewed. CS flags are only
|
/* FIXME: Rest CS for now but must be reviewed. CS flags are only
|
||||||
* connection related for now but this will evolved
|
* connection related for now but this will evolved
|
||||||
*/
|
*/
|
||||||
cs->flags = CS_FL_NONE;
|
cs->flags &= CS_FL_ISBACK;
|
||||||
if (cs->si)
|
if (cs->si)
|
||||||
cs->si->ops = &si_embedded_ops;
|
cs->si->ops = &si_embedded_ops;
|
||||||
cs->data_cb = NULL;
|
cs->data_cb = NULL;
|
||||||
|
@ -446,7 +446,7 @@ struct stream *stream_new(struct session *sess, struct conn_stream *cs, struct b
|
|||||||
if (cs_attach_strm(s->csf, s) < 0)
|
if (cs_attach_strm(s->csf, s) < 0)
|
||||||
goto out_fail_attach_csf;
|
goto out_fail_attach_csf;
|
||||||
|
|
||||||
s->csb = cs_new_from_strm(s, CS_FL_NONE);
|
s->csb = cs_new_from_strm(s, CS_FL_ISBACK);
|
||||||
if (!s->csb)
|
if (!s->csb)
|
||||||
goto out_fail_alloc_csb;
|
goto out_fail_alloc_csb;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user