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

MINOR: filters: convert to the new buffer API

Browse Source 
Use b_set_data() to modify the buffer size, and use the usual wrappers.
This commit is contained in:
Willy Tarreau 2018-06-19 07:16:31 +02:00
parent f37954d4da
commit 44a41a83fb
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/filters.c
View File

@ -539,7 +539,7 @@ flt_http_data(struct stream *s, struct http_msg *msg)
int delta = 0, ret = 0; int delta = 0, ret = 0;
/* Save buffer state */ /* Save buffer state */
buf_i = msg->chn->buf->i; buf_i = ci_data(msg->chn);
list_for_each_entry(filter, &strm_flt(s)->filters, list) { list_for_each_entry(filter, &strm_flt(s)->filters, list) {
unsigned int *nxt; unsigned int *nxt;
@ -556,12 +556,12 @@ flt_http_data(struct stream *s, struct http_msg *msg)
*nxt = msg->next; *nxt = msg->next;
if (FLT_OPS(filter)->http_data) { if (FLT_OPS(filter)->http_data) {
unsigned int i = msg->chn->buf->i; unsigned int i = ci_data(msg->chn);
ret = FLT_OPS(filter)->http_data(s, filter, msg); ret = FLT_OPS(filter)->http_data(s, filter, msg);
if (ret < 0) if (ret < 0)
break; break;
delta += (int)(msg->chn->buf->i - i); delta += (int)(ci_data(msg->chn) - i);
/* Update the next offset of the current filter */ /* Update the next offset of the current filter */
*nxt += ret; *nxt += ret;
@ -569,18 +569,18 @@ flt_http_data(struct stream *s, struct http_msg *msg)
/* And set this value as the bound for the next /* And set this value as the bound for the next
* filter. It will not able to parse more data than this * filter. It will not able to parse more data than this
* one. */ * one. */
msg->chn->buf->i = *nxt; b_set_data(msg->chn->buf, co_data(msg->chn) + *nxt);
} }
else { else {
/* Consume all available data and update the next offset /* Consume all available data and update the next offset
* of the current filter. buf->i is untouched here. */ * of the current filter. buf->i is untouched here. */
ret = MIN(msg->chunk_len + msg->next, msg->chn->buf->i) - *nxt; ret = MIN(msg->chunk_len + msg->next, ci_data(msg->chn)) - *nxt;
*nxt += ret; *nxt += ret;
} }
} }
/* Restore the original buffer state */ /* Restore the original buffer state */
msg->chn->buf->i = buf_i + delta; b_set_data(msg->chn->buf, co_data(msg->chn) + buf_i + delta);
return ret; return ret;
} }
@ -957,7 +957,7 @@ flt_data(struct stream *s, struct channel *chn)
int delta = 0, ret = 0; int delta = 0, ret = 0;
/* Save buffer state */ /* Save buffer state */
buf_i = chn->buf->i; buf_i = ci_data(chn);
list_for_each_entry(filter, &strm_flt(s)->filters, list) { list_for_each_entry(filter, &strm_flt(s)->filters, list) {
unsigned int *nxt; unsigned int *nxt;
@ -968,12 +968,12 @@ flt_data(struct stream *s, struct channel *chn)
nxt = &FLT_NXT(filter, chn); nxt = &FLT_NXT(filter, chn);
if (FLT_OPS(filter)->tcp_data) { if (FLT_OPS(filter)->tcp_data) {
unsigned int i = chn->buf->i; unsigned int i = ci_data(chn);
ret = FLT_OPS(filter)->tcp_data(s, filter, chn); ret = FLT_OPS(filter)->tcp_data(s, filter, chn);
if (ret < 0) if (ret < 0)
break; break;
delta += (int)(chn->buf->i - i); delta += (int)(ci_data(chn) - i);
/* Increase next offset of the current filter */ /* Increase next offset of the current filter */
*nxt += ret; *nxt += ret;
@ -981,11 +981,11 @@ flt_data(struct stream *s, struct channel *chn)
/* And set this value as the bound for the next /* And set this value as the bound for the next
* filter. It will not able to parse more data than the * filter. It will not able to parse more data than the
* current one. */ * current one. */
chn->buf->i = *nxt; b_set_data(chn->buf, co_data(chn) + *nxt);
} }
else { else {
/* Consume all available data */ /* Consume all available data */
*nxt = chn->buf->i; *nxt = ci_data(chn);
} }
/* Update <ret> value to be sure to have the last one when we /* Update <ret> value to be sure to have the last one when we
@ -995,7 +995,7 @@ flt_data(struct stream *s, struct channel *chn)
} }
/* Restore the original buffer state */ /* Restore the original buffer state */
chn->buf->i = buf_i + delta; b_set_data(chn->buf, co_data(chn) + buf_i + delta);
return ret; return ret;
} }
@ -1075,7 +1075,7 @@ flt_xfer_data(struct stream *s, struct channel *chn, unsigned int an_bit)
/* Be sure that the output is still opened. Else we stop the data /* Be sure that the output is still opened. Else we stop the data
* filtering. */ * filtering. */
if ((chn->flags & (CF_READ_ERROR|CF_READ_TIMEOUT|CF_WRITE_ERROR|CF_WRITE_TIMEOUT)) || if ((chn->flags & (CF_READ_ERROR|CF_READ_TIMEOUT|CF_WRITE_ERROR|CF_WRITE_TIMEOUT)) ||
((chn->flags & CF_SHUTW) && (chn->to_forward || chn->buf->o))) ((chn->flags & CF_SHUTW) && (chn->to_forward || co_data(chn))))
goto end; goto end;
/* Let all "data" filters parsing incoming data */ /* Let all "data" filters parsing incoming data */