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

MAJOR: channel: only rely on the new CF_ISRESP flag to find the SI

Browse Source 
Now we exclusively use this flag to find what side a channel is and
where the stream ints are. The ->prod and ->cons are not used anymore.
This commit is contained in:
Willy Tarreau 2014-11-28 14:22:12 +01:00
parent ef573c0f22
commit 5decc05a9e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/proto/channel.h
View File

@ -33,6 +33,7 @@
#include <types/channel.h> #include <types/channel.h>
#include <types/global.h> #include <types/global.h>
#include <types/session.h>
#include <types/stream_interface.h> #include <types/stream_interface.h>
/* perform minimal intializations, report 0 in case of error, 1 if OK. */ /* perform minimal intializations, report 0 in case of error, 1 if OK. */
@ -56,13 +57,19 @@ int bo_getblk_nc(struct channel *chn, char **blk1, int *len1, char **blk2, int *
/* returns a pointer to the stream interface feeding the channel (producer) */ /* returns a pointer to the stream interface feeding the channel (producer) */
static inline struct stream_interface *chn_prod(const struct channel *chn) static inline struct stream_interface *chn_prod(const struct channel *chn)
{ {
return chn->prod; if (chn->flags & CF_ISRESP)
return &LIST_ELEM(chn, struct session *, res)->si[1];
else
return &LIST_ELEM(chn, struct session *, req)->si[0];
} }
/* returns a pointer to the stream interface consuming the channel (producer) */ /* returns a pointer to the stream interface consuming the channel (producer) */
static inline struct stream_interface *chn_cons(const struct channel *chn) static inline struct stream_interface *chn_cons(const struct channel *chn)
{ {
return chn->cons; if (chn->flags & CF_ISRESP)
return &LIST_ELEM(chn, struct session *, res)->si[0];
else
return &LIST_ELEM(chn, struct session *, req)->si[1];
} }
/* Initialize all fields in the channel. */ /* Initialize all fields in the channel. */