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

MINOR: channel: rename buffer_max_len() to channel_recv_limit()

Browse Source 
Buffer_max_len() is ambiguous and misleading since it considers the
channel. The new name more accurately designates the size limit for
received data.
This commit is contained in:
Willy Tarreau 2015-01-14 20:21:43 +01:00
parent a4178192b9
commit 3f5096ddf2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/channel.h
View File

@ -311,10 +311,10 @@ static inline int channel_reserved(const struct channel *chn)
} }
/* Return the max number of bytes the buffer can contain so that once all the /* Return the max number of bytes the buffer can contain so that once all the
* pending bytes are forwarded, the buffer still has global.tune.maxrewrite * data in transit are forwarded, the buffer still has global.tune.maxrewrite
* bytes free. The result sits between chn->size - maxrewrite and chn->size. * bytes free. The result sits between chn->size - maxrewrite and chn->size.
*/ */
static inline int buffer_max_len(const struct channel *chn) static inline int channel_recv_limit(const struct channel *chn)
{ {
return chn->buf->size - channel_reserved(chn); return chn->buf->size - channel_reserved(chn);
} }
@ -328,7 +328,7 @@ static inline int bi_avail(const struct channel *chn)
{ {
int ret; int ret;
ret = buffer_max_len(chn) - chn->buf->i - chn->buf->o; ret = channel_recv_limit(chn) - chn->buf->i - chn->buf->o;
if (ret < 0) if (ret < 0)
ret = 0; ret = 0;
return ret; return ret;

2
src/channel.c
View File

@ -157,7 +157,7 @@ int bi_putblk(struct channel *chn, const char *blk, int len)
if (unlikely(channel_input_closed(chn))) if (unlikely(channel_input_closed(chn)))
return -2; return -2;
max = buffer_max_len(chn); max = channel_recv_limit(chn);
if (unlikely(len > max - buffer_len(chn->buf))) { if (unlikely(len > max - buffer_len(chn->buf))) {
/* we can't write this chunk right now because the buffer is /* we can't write this chunk right now because the buffer is
* almost full or because the block is too large. Return the * almost full or because the block is too large. Return the

4
src/payload.c
View File

@ -213,8 +213,8 @@ smp_fetch_req_ssl_ver(struct proxy *px, struct session *s, void *l7, unsigned in
* all the part of the request which fits in a buffer is already * all the part of the request which fits in a buffer is already
* there. * there.
*/ */
if (msg_len > buffer_max_len(s->req) + s->req->buf->data - s->req->buf->p) if (msg_len > channel_recv_limit(s->req) + s->req->buf->data - s->req->buf->p)
msg_len = buffer_max_len(s->req) + s->req->buf->data - s->req->buf->p; msg_len = channel_recv_limit(s->req) + s->req->buf->data - s->req->buf->p;
if (bleft < msg_len) if (bleft < msg_len)
goto too_short; goto too_short;