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: buffer: replace buffer_replace2() with b_rep_blk()

Browse Source 
This one is more generic and designed to work on a random block. It
may later get a b_rep_ist() variant since many strings are already
available as (ptr,len).
This commit is contained in:
Willy Tarreau 2018-07-12 15:55:34 +02:00
parent 4d893d440c
commit e3128024bf
5 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/common/buf.h
View File

@ -484,6 +484,42 @@ static inline size_t b_putblk(struct buffer *b, const char *blk, size_t len)
return len; return len;
} }
/* b_rep_blk() : writes the block <blk> at position <pos> which must be in
* buffer <b>, and moves the part between <end> and the buffer's tail just
* after the end of the copy of <blk>. This effectively replaces the part
* located between <pos> and <end> with a copy of <blk> of length <len>. The
* buffer's length is automatically updated. This is used to replace a block
* with another one inside a buffer. The shift value (positive or negative) is
* returned. If there's no space left, the move is not done. If <len> is null,
* the <blk> pointer is allowed to be null, in order to erase a block.
*/
static inline int b_rep_blk(struct buffer *b, char *pos, char *end, const char *blk, size_t len)
{
int delta;
delta = len - (end - pos);
if (b_tail(b) + delta > b_wrap(b))
return 0; /* no space left */
if (b_data(b) &&
b_tail(b) + delta > b_head(b) &&
b_head(b) >= b_tail(b))
return 0; /* no space left before wrapping data */
/* first, protect the end of the buffer */
memmove(end + delta, end, b_tail(b) - end);
/* now, copy blk over pos */
if (len)
memcpy(pos, blk, len);
b_add(b, delta);
b_realign_if_empty(b);
return delta;
}
#endif /* _COMMON_BUF_H */ #endif /* _COMMON_BUF_H */

1
include/common/buffer.h
View File

@ -50,7 +50,6 @@ __decl_hathreads(extern HA_SPINLOCK_T buffer_wq_lock);
int init_buffer(); int init_buffer();
void deinit_buffer(); void deinit_buffer();
int buffer_replace2(struct buffer *b, char *pos, char *end, const char *str, int len);
void buffer_dump(FILE *o, struct buffer *b, int from, int to); void buffer_dump(FILE *o, struct buffer *b, int from, int to);
/*****************************************************************/ /*****************************************************************/

37
src/buffer.c
View File

@ -70,43 +70,6 @@ void deinit_buffer()
pool_destroy(pool_head_buffer); pool_destroy(pool_head_buffer);
} }
/* This function writes the string <str> at position <pos> which must be in
* buffer <b>, and moves <end> just after the end of <str>. <b>'s parameters
* <l> and <r> are updated to be valid after the shift. The shift value
* (positive or negative) is returned. If there's no space left, the move is
* not done. The function does not adjust ->o because it does not make sense to
* use it on data scheduled to be sent. For the same reason, it does not make
* sense to call this function on unparsed data, so <orig> is not updated. The
* string length is taken from parameter <len>. If <len> is null, the <str>
* pointer is allowed to be null.
*/
int buffer_replace2(struct buffer *b, char *pos, char *end, const char *str, int len)
{
int delta;
delta = len - (end - pos);
if (b_tail(b) + delta > b_wrap(b))
return 0; /* no space left */
if (b_data(b) &&
b_tail(b) + delta > b_head(b) &&
b_head(b) >= b_tail(b))
return 0; /* no space left before wrapping data */
/* first, protect the end of the buffer */
memmove(end + delta, end, b_tail(b) - end);
/* now, copy str over pos */
if (len)
memcpy(pos, str, len);
b_add(b, delta);
b_realign_if_empty(b);
return delta;
}
/* /*
* Dumps part or all of a buffer. * Dumps part or all of a buffer.
*/ */

4
src/hlua.c
View File

@ -2888,7 +2888,7 @@ __LJMP static int hlua_channel_getline_yield(lua_State *L, int status, lua_KCont
len += len2; len += len2;
} }
luaL_pushresult(&b); luaL_pushresult(&b);
buffer_replace2(chn->buf, ci_head(chn), ci_head(chn) + len, NULL, 0); b_rep_blk(chn->buf, ci_head(chn), ci_head(chn) + len, NULL, 0);
hlua_resynchonize_proto(chn_strm(chn), !!(chn->flags & CF_ISRESP)); hlua_resynchonize_proto(chn_strm(chn), !!(chn->flags & CF_ISRESP));
return 1; return 1;
} }
@ -3044,7 +3044,7 @@ __LJMP static int hlua_channel_send_yield(lua_State *L, int status, lua_KContext
channel_slow_realign(chn, trash.str); channel_slow_realign(chn, trash.str);
/* Copy input data in the buffer. */ /* Copy input data in the buffer. */
max = buffer_replace2(chn->buf, ci_head(chn), ci_head(chn), str + l, max); max = b_rep_blk(chn->buf, ci_head(chn), ci_head(chn), str + l, max);
/* buffer replace considers that the input part is filled. /* buffer replace considers that the input part is filled.
* so, I must forward these new data in the output part. * so, I must forward these new data in the output part.

48
src/proto_http.c
View File

@ -880,7 +880,7 @@ int http_remove_header2(struct http_msg *msg, struct hdr_idx *idx, struct hdr_ct
hdr = &idx->v[cur_idx]; hdr = &idx->v[cur_idx];
if (sol[ctx->del] == ':' && ctx->val + ctx->vlen + ctx->tws == hdr->len) { if (sol[ctx->del] == ':' && ctx->val + ctx->vlen + ctx->tws == hdr->len) {
/* This was the only value of the header, we must now remove it entirely. */ /* This was the only value of the header, we must now remove it entirely. */
delta = buffer_replace2(msg->chn->buf, sol, sol + hdr->len + hdr->cr + 1, NULL, 0); delta = b_rep_blk(msg->chn->buf, sol, sol + hdr->len + hdr->cr + 1, NULL, 0);
http_msg_move_end(msg, delta); http_msg_move_end(msg, delta);
idx->used--; idx->used--;
hdr->len = 0; /* unused entry */ hdr->len = 0; /* unused entry */
@ -900,7 +900,7 @@ int http_remove_header2(struct http_msg *msg, struct hdr_idx *idx, struct hdr_ct
*/ */
skip_comma = (ctx->val + ctx->vlen + ctx->tws == hdr->len) ? 0 : 1; skip_comma = (ctx->val + ctx->vlen + ctx->tws == hdr->len) ? 0 : 1;
delta = buffer_replace2(msg->chn->buf, sol + ctx->del + skip_comma, delta = b_rep_blk(msg->chn->buf, sol + ctx->del + skip_comma,
sol + ctx->val + ctx->vlen + ctx->tws + skip_comma, sol + ctx->val + ctx->vlen + ctx->tws + skip_comma,
NULL, 0); NULL, 0);
hdr->len += delta; hdr->len += delta;
@ -1354,7 +1354,7 @@ static int http_upgrade_v09_to_v10(struct http_txn *txn)
return 0; return 0;
} }
/* add HTTP version */ /* add HTTP version */
delta = buffer_replace2(msg->chn->buf, cur_end, cur_end, " HTTP/1.0\r\n", 11); delta = b_rep_blk(msg->chn->buf, cur_end, cur_end, " HTTP/1.0\r\n", 11);
http_msg_move_end(msg, delta); http_msg_move_end(msg, delta);
cur_end += delta; cur_end += delta;
cur_end = (char *)http_parse_reqline(msg, cur_end = (char *)http_parse_reqline(msg,
@ -2429,7 +2429,7 @@ int http_transform_header_str(struct stream* s, struct http_msg *msg,
if (output->len == -1) if (output->len == -1)
return -1; return -1;
delta = buffer_replace2(msg->chn->buf, val, val_end, output->str, output->len); delta = b_rep_blk(msg->chn->buf, val, val_end, output->str, output->len);
hdr->len += delta; hdr->len += delta;
http_msg_move_end(msg, delta); http_msg_move_end(msg, delta);
@ -3765,7 +3765,7 @@ int http_process_request(struct stream *s, struct channel *req, int an_bit)
char *cur_end = cur_ptr + txn->req.sl.rq.l; char *cur_end = cur_ptr + txn->req.sl.rq.l;
int delta; int delta;
delta = buffer_replace2(req->buf, cur_ptr + msg->sl.rq.u, path, NULL, 0); delta = b_rep_blk(req->buf, cur_ptr + msg->sl.rq.u, path, NULL, 0);
http_msg_move_end(&txn->req, delta); http_msg_move_end(&txn->req, delta);
cur_end += delta; cur_end += delta;
if (http_parse_reqline(&txn->req, HTTP_MSG_RQMETH, cur_ptr, cur_end + 1, NULL, NULL) == NULL) if (http_parse_reqline(&txn->req, HTTP_MSG_RQMETH, cur_ptr, cur_end + 1, NULL, NULL) == NULL)
@ -3776,7 +3776,7 @@ int http_process_request(struct stream *s, struct channel *req, int an_bit)
char *cur_end = cur_ptr + txn->req.sl.rq.l; char *cur_end = cur_ptr + txn->req.sl.rq.l;
int delta; int delta;
delta = buffer_replace2(req->buf, cur_ptr + msg->sl.rq.u, delta = b_rep_blk(req->buf, cur_ptr + msg->sl.rq.u,
cur_ptr + msg->sl.rq.u + msg->sl.rq.u_l, "/", 1); cur_ptr + msg->sl.rq.u + msg->sl.rq.u_l, "/", 1);
http_msg_move_end(&txn->req, delta); http_msg_move_end(&txn->req, delta);
cur_end += delta; cur_end += delta;
@ -6516,7 +6516,7 @@ int apply_filter_to_req_headers(struct stream *s, struct channel *req, struct hd
if (trash.len < 0) if (trash.len < 0)
return -1; return -1;
delta = buffer_replace2(req->buf, cur_ptr, cur_end, trash.str, trash.len); delta = b_rep_blk(req->buf, cur_ptr, cur_end, trash.str, trash.len);
/* FIXME: if the user adds a newline in the replacement, the /* FIXME: if the user adds a newline in the replacement, the
* index will not be recalculated for now, and the new line * index will not be recalculated for now, and the new line
* will not be counted as a new header. * will not be counted as a new header.
@ -6529,7 +6529,7 @@ int apply_filter_to_req_headers(struct stream *s, struct channel *req, struct hd
break; break;
case ACT_REMOVE: case ACT_REMOVE:
delta = buffer_replace2(req->buf, cur_ptr, cur_next, NULL, 0); delta = b_rep_blk(req->buf, cur_ptr, cur_next, NULL, 0);
cur_next += delta; cur_next += delta;
http_msg_move_end(&txn->req, delta); http_msg_move_end(&txn->req, delta);
@ -6604,7 +6604,7 @@ int apply_filter_to_req_line(struct stream *s, struct channel *req, struct hdr_e
if (trash.len < 0) if (trash.len < 0)
return -1; return -1;
delta = buffer_replace2(req->buf, cur_ptr, cur_end, trash.str, trash.len); delta = b_rep_blk(req->buf, cur_ptr, cur_end, trash.str, trash.len);
/* FIXME: if the user adds a newline in the replacement, the /* FIXME: if the user adds a newline in the replacement, the
* index will not be recalculated for now, and the new line * index will not be recalculated for now, and the new line
* will not be counted as a new header. * will not be counted as a new header.
@ -6764,7 +6764,7 @@ int del_hdr_value(struct buffer *buf, char **from, char *next)
next++; next++;
} }
} }
return buffer_replace2(buf, prev, next, NULL, 0); return b_rep_blk(buf, prev, next, NULL, 0);
} }
/* /*
@ -6935,13 +6935,13 @@ void manage_client_side_cookies(struct stream *s, struct channel *req)
int stripped_after = 0; int stripped_after = 0;
if (att_end != equal) { if (att_end != equal) {
stripped_before = buffer_replace2(req->buf, att_end, equal, NULL, 0); stripped_before = b_rep_blk(req->buf, att_end, equal, NULL, 0);
equal += stripped_before; equal += stripped_before;
val_beg += stripped_before; val_beg += stripped_before;
} }
if (val_beg > equal + 1) { if (val_beg > equal + 1) {
stripped_after = buffer_replace2(req->buf, equal + 1, val_beg, NULL, 0); stripped_after = b_rep_blk(req->buf, equal + 1, val_beg, NULL, 0);
val_beg += stripped_after; val_beg += stripped_after;
stripped_before += stripped_after; stripped_before += stripped_after;
} }
@ -7122,7 +7122,7 @@ void manage_client_side_cookies(struct stream *s, struct channel *req)
if ((s->be->ck_opts & PR_CK_PFX) && (delim != val_end)) { if ((s->be->ck_opts & PR_CK_PFX) && (delim != val_end)) {
int delta; /* negative */ int delta; /* negative */
delta = buffer_replace2(req->buf, val_beg, delim + 1, NULL, 0); delta = b_rep_blk(req->buf, val_beg, delim + 1, NULL, 0);
val_end += delta; val_end += delta;
next += delta; next += delta;
hdr_end += delta; hdr_end += delta;
@ -7180,7 +7180,7 @@ void manage_client_side_cookies(struct stream *s, struct channel *req)
hdr_end = del_from; hdr_end = del_from;
cur_hdr->len += delta; cur_hdr->len += delta;
} else { } else {
delta = buffer_replace2(req->buf, hdr_beg, hdr_next, NULL, 0); delta = b_rep_blk(req->buf, hdr_beg, hdr_next, NULL, 0);
/* FIXME: this should be a separate function */ /* FIXME: this should be a separate function */
txn->hdr_idx.v[old_idx].next = cur_hdr->next; txn->hdr_idx.v[old_idx].next = cur_hdr->next;
@ -7252,7 +7252,7 @@ int apply_filter_to_resp_headers(struct stream *s, struct channel *rtr, struct h
if (trash.len < 0) if (trash.len < 0)
return -1; return -1;
delta = buffer_replace2(rtr->buf, cur_ptr, cur_end, trash.str, trash.len); delta = b_rep_blk(rtr->buf, cur_ptr, cur_end, trash.str, trash.len);
/* FIXME: if the user adds a newline in the replacement, the /* FIXME: if the user adds a newline in the replacement, the
* index will not be recalculated for now, and the new line * index will not be recalculated for now, and the new line
* will not be counted as a new header. * will not be counted as a new header.
@ -7265,7 +7265,7 @@ int apply_filter_to_resp_headers(struct stream *s, struct channel *rtr, struct h
break; break;
case ACT_REMOVE: case ACT_REMOVE:
delta = buffer_replace2(rtr->buf, cur_ptr, cur_next, NULL, 0); delta = b_rep_blk(rtr->buf, cur_ptr, cur_next, NULL, 0);
cur_next += delta; cur_next += delta;
http_msg_move_end(&txn->rsp, delta); http_msg_move_end(&txn->rsp, delta);
@ -7333,7 +7333,7 @@ int apply_filter_to_sts_line(struct stream *s, struct channel *rtr, struct hdr_e
if (trash.len < 0) if (trash.len < 0)
return -1; return -1;
delta = buffer_replace2(rtr->buf, cur_ptr, cur_end, trash.str, trash.len); delta = b_rep_blk(rtr->buf, cur_ptr, cur_end, trash.str, trash.len);
/* FIXME: if the user adds a newline in the replacement, the /* FIXME: if the user adds a newline in the replacement, the
* index will not be recalculated for now, and the new line * index will not be recalculated for now, and the new line
* will not be counted as a new header. * will not be counted as a new header.
@ -7588,13 +7588,13 @@ void manage_server_side_cookies(struct stream *s, struct channel *res)
int stripped_after = 0; int stripped_after = 0;
if (att_end != equal) { if (att_end != equal) {
stripped_before = buffer_replace2(res->buf, att_end, equal, NULL, 0); stripped_before = b_rep_blk(res->buf, att_end, equal, NULL, 0);
equal += stripped_before; equal += stripped_before;
val_beg += stripped_before; val_beg += stripped_before;
} }
if (val_beg > equal + 1) { if (val_beg > equal + 1) {
stripped_after = buffer_replace2(res->buf, equal + 1, val_beg, NULL, 0); stripped_after = b_rep_blk(res->buf, equal + 1, val_beg, NULL, 0);
val_beg += stripped_after; val_beg += stripped_after;
stripped_before += stripped_after; stripped_before += stripped_after;
} }
@ -7652,7 +7652,7 @@ void manage_server_side_cookies(struct stream *s, struct channel *res)
/* this cookie must be deleted */ /* this cookie must be deleted */
if (*prev == ':' && next == hdr_end) { if (*prev == ':' && next == hdr_end) {
/* whole header */ /* whole header */
delta = buffer_replace2(res->buf, hdr_beg, hdr_next, NULL, 0); delta = b_rep_blk(res->buf, hdr_beg, hdr_next, NULL, 0);
txn->hdr_idx.v[old_idx].next = cur_hdr->next; txn->hdr_idx.v[old_idx].next = cur_hdr->next;
txn->hdr_idx.used--; txn->hdr_idx.used--;
cur_hdr->len = 0; cur_hdr->len = 0;
@ -7679,7 +7679,7 @@ void manage_server_side_cookies(struct stream *s, struct channel *res)
/* replace bytes val_beg->val_end with the cookie name associated /* replace bytes val_beg->val_end with the cookie name associated
* with this server since we know it. * with this server since we know it.
*/ */
delta = buffer_replace2(res->buf, val_beg, val_end, srv->cookie, srv->cklen); delta = b_rep_blk(res->buf, val_beg, val_end, srv->cookie, srv->cklen);
next += delta; next += delta;
hdr_end += delta; hdr_end += delta;
hdr_next += delta; hdr_next += delta;
@ -7693,7 +7693,7 @@ void manage_server_side_cookies(struct stream *s, struct channel *res)
/* insert the cookie name associated with this server /* insert the cookie name associated with this server
* before existing cookie, and insert a delimiter between them.. * before existing cookie, and insert a delimiter between them..
*/ */
delta = buffer_replace2(res->buf, val_beg, val_beg, srv->cookie, srv->cklen + 1); delta = b_rep_blk(res->buf, val_beg, val_beg, srv->cookie, srv->cklen + 1);
next += delta; next += delta;
hdr_end += delta; hdr_end += delta;
hdr_next += delta; hdr_next += delta;
@ -11927,7 +11927,7 @@ int http_replace_req_line(int action, const char *replace, int len,
} }
/* commit changes and adjust end of message */ /* commit changes and adjust end of message */
delta = buffer_replace2(s->req.buf, cur_ptr, cur_end, replace + offset, len - offset); delta = b_rep_blk(s->req.buf, cur_ptr, cur_end, replace + offset, len - offset);
txn->req.sl.rq.l += delta; txn->req.sl.rq.l += delta;
txn->hdr_idx.v[0].len += delta; txn->hdr_idx.v[0].len += delta;
http_msg_move_end(&txn->req, delta); http_msg_move_end(&txn->req, delta);
@ -11966,7 +11966,7 @@ void http_set_status(unsigned int status, const char *reason, struct stream *s)
cur_end = ci_head(&s->res) + txn->rsp.sl.st.r + txn->rsp.sl.st.r_l; cur_end = ci_head(&s->res) + txn->rsp.sl.st.r + txn->rsp.sl.st.r_l;
/* commit changes and adjust message */ /* commit changes and adjust message */
delta = buffer_replace2(s->res.buf, cur_ptr, cur_end, trash.str, trash.len); delta = b_rep_blk(s->res.buf, cur_ptr, cur_end, trash.str, trash.len);
/* adjust res line offsets and lengths */ /* adjust res line offsets and lengths */
txn->rsp.sl.st.r += c_l - txn->rsp.sl.st.c_l; txn->rsp.sl.st.r += c_l - txn->rsp.sl.st.c_l;