REORG/MAJOR: extract "struct buffer" from "struct channel"
At the moment, the struct is still embedded into the struct channel, but
all the functions have been updated to use struct buffer only when possible,
otherwise struct channel. Some functions would likely need to be splitted
between a buffer-layer primitive and a channel-layer function.
Later the buffer should become a pointer in the struct buffer, but doing so
requires a few changes to the buffer allocation calls.
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index 4bc79ba..e0d43e9 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -47,23 +47,23 @@
int bo_getblk(struct channel *buf, char *blk, int len, int offset);
int buffer_replace2(struct channel *b, char *pos, char *end, const char *str, int len);
int buffer_insert_line2(struct channel *b, char *pos, const char *str, int len);
-void buffer_dump(FILE *o, struct channel *b, int from, int to);
-void buffer_slow_realign(struct channel *buf);
-void buffer_bounce_realign(struct channel *buf);
+void buffer_dump(FILE *o, struct buffer *b, int from, int to);
+void buffer_slow_realign(struct buffer *buf);
+void buffer_bounce_realign(struct buffer *buf);
unsigned long long buffer_forward(struct channel *buf, unsigned long long bytes);
/* Initialize all fields in the buffer. The BF_OUT_EMPTY flags is set. */
static inline void buffer_init(struct channel *buf)
{
- buf->o = 0;
- buf->i = 0;
+ buf->buf.o = 0;
+ buf->buf.i = 0;
+ buf->buf.p = buf->buf.data;
buf->to_forward = 0;
buf->total = 0;
buf->pipe = NULL;
buf->analysers = 0;
buf->cons = NULL;
buf->flags = BF_OUT_EMPTY;
- buf->p = buf->data;
}
/*****************************************************************/
@@ -86,7 +86,7 @@
})
/* Returns the start of the input data in a buffer */
-static inline char *bi_ptr(const struct channel *b)
+static inline char *bi_ptr(const struct buffer *b)
{
return b->p;
}
@@ -94,7 +94,7 @@
/* Returns the end of the input data in a buffer (pointer to next
* insertion point).
*/
-static inline char *bi_end(const struct channel *b)
+static inline char *bi_end(const struct buffer *b)
{
char *ret = b->p + b->i;
@@ -104,7 +104,7 @@
}
/* Returns the amount of input data that can contiguously be read at once */
-static inline int bi_contig_data(const struct channel *b)
+static inline int bi_contig_data(const struct buffer *b)
{
int data = b->data + b->size - b->p;
@@ -114,7 +114,7 @@
}
/* Returns the start of the output data in a buffer */
-static inline char *bo_ptr(const struct channel *b)
+static inline char *bo_ptr(const struct buffer *b)
{
char *ret = b->p - b->o;
@@ -124,13 +124,13 @@
}
/* Returns the end of the output data in a buffer */
-static inline char *bo_end(const struct channel *b)
+static inline char *bo_end(const struct buffer *b)
{
return b->p;
}
/* Returns the amount of output data that can contiguously be read at once */
-static inline int bo_contig_data(const struct channel *b)
+static inline int bo_contig_data(const struct buffer *b)
{
char *beg = b->p - b->o;
@@ -140,25 +140,25 @@
}
/* Return the buffer's length in bytes by summing the input and the output */
-static inline int buffer_len(const struct channel *buf)
+static inline int buffer_len(const struct buffer *buf)
{
return buf->i + buf->o;
}
/* Return non-zero only if the buffer is not empty */
-static inline int buffer_not_empty(const struct channel *buf)
+static inline int buffer_not_empty(const struct buffer *buf)
{
return buf->i | buf->o;
}
/* Return non-zero only if the buffer is empty */
-static inline int buffer_empty(const struct channel *buf)
+static inline int buffer_empty(const struct buffer *buf)
{
return !buffer_not_empty(buf);
}
/* Normalizes a pointer after a subtract */
-static inline char *buffer_wrap_sub(const struct channel *buf, char *ptr)
+static inline char *buffer_wrap_sub(const struct buffer *buf, char *ptr)
{
if (ptr < buf->data)
ptr += buf->size;
@@ -166,7 +166,7 @@
}
/* Normalizes a pointer after an addition */
-static inline char *buffer_wrap_add(const struct channel *buf, char *ptr)
+static inline char *buffer_wrap_add(const struct buffer *buf, char *ptr)
{
if (ptr - buf->size >= buf->data)
ptr -= buf->size;
@@ -180,7 +180,7 @@
*/
static inline int buffer_reserved(const struct channel *buf)
{
- int ret = global.tune.maxrewrite - buf->to_forward - buf->o;
+ int ret = global.tune.maxrewrite - buf->to_forward - buf->buf.o;
if (buf->to_forward == BUF_INFINITE_FORWARD)
return 0;
@@ -195,7 +195,7 @@
*/
static inline int buffer_max_len(const struct channel *buf)
{
- return buf->size - buffer_reserved(buf);
+ return buf->buf.size - buffer_reserved(buf);
}
/* Returns non-zero if the buffer input is considered full. The reserved space
@@ -205,20 +205,20 @@
*/
static inline int bi_full(const struct channel *b)
{
- int rem = b->size;
+ int rem = b->buf.size;
- rem -= b->o;
- rem -= b->i;
+ rem -= b->buf.o;
+ rem -= b->buf.i;
if (!rem)
return 1; /* buffer already full */
- if (b->to_forward >= b->size ||
- (BUF_INFINITE_FORWARD < MAX_RANGE(typeof(b->size)) && // just there to ensure gcc
+ if (b->to_forward >= b->buf.size ||
+ (BUF_INFINITE_FORWARD < MAX_RANGE(typeof(b->buf.size)) && // just there to ensure gcc
b->to_forward == BUF_INFINITE_FORWARD)) // avoids the useless second
return 0; // test whenever possible
rem -= global.tune.maxrewrite;
- rem += b->o;
+ rem += b->buf.o;
rem += b->to_forward;
return rem <= 0;
}
@@ -230,21 +230,21 @@
*/
static inline int bi_avail(const struct channel *b)
{
- int rem = b->size;
+ int rem = b->buf.size;
int rem2;
- rem -= b->o;
- rem -= b->i;
+ rem -= b->buf.o;
+ rem -= b->buf.i;
if (!rem)
return rem; /* buffer already full */
- if (b->to_forward >= b->size ||
- (BUF_INFINITE_FORWARD < MAX_RANGE(typeof(b->size)) && // just there to ensure gcc
+ if (b->to_forward >= b->buf.size ||
+ (BUF_INFINITE_FORWARD < MAX_RANGE(typeof(b->buf.size)) && // just there to ensure gcc
b->to_forward == BUF_INFINITE_FORWARD)) // avoids the useless second
return rem; // test whenever possible
rem2 = rem - global.tune.maxrewrite;
- rem2 += b->o;
+ rem2 += b->buf.o;
rem2 += b->to_forward;
if (rem > rem2)
@@ -257,7 +257,7 @@
/* Return the maximum amount of bytes that can be written into the buffer,
* including reserved space which may be overwritten.
*/
-static inline int buffer_total_space(const struct channel *buf)
+static inline int buffer_total_space(const struct buffer *buf)
{
return buf->size - buffer_len(buf);
}
@@ -266,7 +266,7 @@
* and enforces a limit on buf->data + buf->size. <start> must be within the
* buffer.
*/
-static inline int buffer_contig_area(const struct channel *buf, const char *start, int count)
+static inline int buffer_contig_area(const struct buffer *buf, const char *start, int count)
{
if (count > buf->data - start + buf->size)
count = buf->data - start + buf->size;
@@ -276,7 +276,7 @@
/* Return the amount of bytes that can be written into the buffer at once,
* including reserved space which may be overwritten.
*/
-static inline int buffer_contig_space(const struct channel *buf)
+static inline int buffer_contig_space(const struct buffer *buf)
{
const char *left, *right;
@@ -296,11 +296,11 @@
*/
static inline void b_adv(struct channel *b, unsigned int adv)
{
- b->i -= adv;
- b->o += adv;
- if (b->o)
+ b->buf.i -= adv;
+ b->buf.o += adv;
+ if (b->buf.o)
b->flags &= ~BF_OUT_EMPTY;
- b->p = b_ptr(b, adv);
+ b->buf.p = b_ptr(&b->buf, adv);
}
/* Rewinds the buffer by <adv> bytes, which means that the buffer pointer goes
@@ -309,18 +309,18 @@
*/
static inline void b_rew(struct channel *b, unsigned int adv)
{
- b->i += adv;
- b->o -= adv;
- if (!b->o && !b->pipe)
+ b->buf.i += adv;
+ b->buf.o -= adv;
+ if (!b->buf.o && !b->pipe)
b->flags |= BF_OUT_EMPTY;
- b->p = b_ptr(b, (int)-adv);
+ b->buf.p = b_ptr(&b->buf, (int)-adv);
}
/* Return the amount of bytes that can be written into the buffer at once,
* excluding the amount of reserved space passed in <res>, which is
* preserved.
*/
-static inline int buffer_contig_space_with_res(const struct channel *buf, int res)
+static inline int buffer_contig_space_with_res(const struct buffer *buf, int res)
{
/* Proceed differently if the buffer is full, partially used or empty.
* The hard situation is when it's partially used and either data or
@@ -342,9 +342,9 @@
/* Return the amount of bytes that can be written into the buffer at once,
* excluding reserved space, which is preserved.
*/
-static inline int buffer_contig_space_res(const struct channel *buf)
+static inline int buffer_contig_space_res(const struct channel *chn)
{
- return buffer_contig_space_with_res(buf, buffer_reserved(buf));
+ return buffer_contig_space_with_res(&chn->buf, buffer_reserved(chn));
}
/* Normalizes a pointer which is supposed to be relative to the beginning of a
@@ -353,7 +353,7 @@
* once, so the original pointer must be between ->data-size and ->data+2*size-1,
* otherwise an invalid pointer might be returned.
*/
-static inline const char *buffer_pointer(const struct channel *buf, const char *ptr)
+static inline const char *buffer_pointer(const struct buffer *buf, const char *ptr)
{
if (ptr < buf->data)
ptr += buf->size;
@@ -365,7 +365,7 @@
/* Returns the distance between two pointers, taking into account the ability
* to wrap around the buffer's end.
*/
-static inline int buffer_count(const struct channel *buf, const char *from, const char *to)
+static inline int buffer_count(const struct buffer *buf, const char *from, const char *to)
{
int count = to - from;
if (count < 0)
@@ -376,7 +376,7 @@
/* returns the amount of pending bytes in the buffer. It is the amount of bytes
* that is not scheduled to be sent.
*/
-static inline int buffer_pending(const struct channel *buf)
+static inline int buffer_pending(const struct buffer *buf)
{
return buf->i;
}
@@ -387,7 +387,7 @@
* <end>. It always starts at buf->p. The work area includes the
* reserved area.
*/
-static inline int buffer_work_area(const struct channel *buf, const char *end)
+static inline int buffer_work_area(const struct buffer *buf, const char *end)
{
end = buffer_pointer(buf, end);
if (end == buffer_wrap_add(buf, buf->p + buf->i))
@@ -397,7 +397,7 @@
}
/* Return 1 if the buffer has less than 1/4 of its capacity free, otherwise 0 */
-static inline int buffer_almost_full(const struct channel *buf)
+static inline int buffer_almost_full(const struct buffer *buf)
{
if (buffer_total_space(buf) < buf->size / 4)
return 1;
@@ -443,10 +443,10 @@
*/
static inline void buffer_flush(struct channel *buf)
{
- buf->p = buffer_wrap_add(buf, buf->p + buf->i);
- buf->o += buf->i;
- buf->i = 0;
- if (buf->o)
+ buf->buf.p = buffer_wrap_add(&buf->buf, buf->buf.p + buf->buf.i);
+ buf->buf.o += buf->buf.i;
+ buf->buf.i = 0;
+ if (buf->buf.o)
buf->flags &= ~BF_OUT_EMPTY;
}
@@ -456,10 +456,10 @@
*/
static inline void buffer_erase(struct channel *buf)
{
- buf->o = 0;
- buf->i = 0;
+ buf->buf.o = 0;
+ buf->buf.i = 0;
buf->to_forward = 0;
- buf->p = buf->data;
+ buf->buf.p = buf->buf.data;
buf->flags &= ~(BF_FULL | BF_OUT_EMPTY);
if (!buf->pipe)
buf->flags |= BF_OUT_EMPTY;
@@ -472,14 +472,14 @@
*/
static inline void bi_erase(struct channel *buf)
{
- if (!buf->o)
+ if (!buf->buf.o)
return buffer_erase(buf);
buf->to_forward = 0;
- if (!buf->i)
+ if (!buf->buf.i)
return;
- buf->i = 0;
+ buf->buf.i = 0;
buf->flags &= ~BF_FULL;
if (bi_full(buf))
buf->flags |= BF_FULL;
@@ -491,7 +491,7 @@
* This is mainly used to remove empty lines at the beginning of a request
* or a response.
*/
-static inline void bi_fast_delete(struct channel *buf, int n)
+static inline void bi_fast_delete(struct buffer *buf, int n)
{
buf->i -= n;
buf->p += n;
@@ -578,7 +578,7 @@
* Tries to realign the given buffer, and returns how many bytes can be written
* there at once without overwriting anything.
*/
-static inline int buffer_realign(struct channel *buf)
+static inline int buffer_realign(struct buffer *buf)
{
if (!(buf->i | buf->o)) {
/* let's realign the buffer to optimize I/O */
@@ -595,12 +595,12 @@
*/
static inline void bo_skip(struct channel *buf, int len)
{
- buf->o -= len;
- if (!buf->o && !buf->pipe)
+ buf->buf.o -= len;
+ if (!buf->buf.o && !buf->pipe)
buf->flags |= BF_OUT_EMPTY;
- if (buffer_len(buf) == 0)
- buf->p = buf->data;
+ if (buffer_len(&buf->buf) == 0)
+ buf->buf.p = buf->buf.data;
if (!bi_full(buf))
buf->flags &= ~BF_FULL;
@@ -654,7 +654,7 @@
return -2;
return -1;
}
- return *buffer_wrap_sub(buf, buf->p - buf->o);
+ return *buffer_wrap_sub(&buf->buf, buf->buf.p - buf->buf.o);
}
/* This function writes the string <str> at position <pos> which must be in
diff --git a/include/types/buffers.h b/include/types/buffers.h
index 68b4319..200e26c 100644
--- a/include/types/buffers.h
+++ b/include/types/buffers.h
@@ -174,16 +174,20 @@
/* needed for a declaration below */
struct session;
+struct buffer {
+ char *p; /* buffer's start pointer, separates in and out data */
+ unsigned int size; /* buffer size in bytes */
+ unsigned int i; /* number of input bytes pending for analysis in the buffer */
+ unsigned int o; /* number of out bytes the sender can consume from this buffer */
+ char data[0]; /* <size> bytes */
+};
+
struct channel {
unsigned int flags; /* BF_* */
int rex; /* expiration date for a read, in ticks */
int wex; /* expiration date for a write or connect, in ticks */
int rto; /* read timeout, in ticks */
int wto; /* write timeout, in ticks */
- char *p; /* buffer's start pointer, separates in and out data */
- unsigned int size; /* buffer size in bytes */
- unsigned int i; /* number of input bytes pending for analysis in the buffer */
- unsigned int o; /* number of out bytes the sender can consume from this buffer */
unsigned int to_forward; /* number of bytes to forward after out without a wake-up */
unsigned int analysers; /* bit field indicating what to do on the buffer */
int analyse_exp; /* expiration date for current analysers (if set) */
@@ -194,7 +198,7 @@
struct stream_interface *prod; /* producer attached to this buffer */
struct stream_interface *cons; /* consumer attached to this buffer */
struct pipe *pipe; /* non-NULL only when data present */
- char data[0]; /* <size> bytes */
+ struct buffer buf; /* embedded buffer for now, will move */
};
diff --git a/src/acl.c b/src/acl.c
index b4c5908..1680ac9 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -108,7 +108,7 @@
return 0;
smp->type = SMP_T_UINT;
- smp->data.uint = l4->req->i;
+ smp->data.uint = l4->req->buf.i;
smp->flags = SMP_F_VOLATILE | SMP_F_MAY_CHANGE;
return 1;
}
@@ -128,8 +128,8 @@
b = ((opt & SMP_OPT_DIR) == SMP_OPT_DIR_RES) ? l4->rep : l4->req;
- bleft = b->i;
- data = (const unsigned char *)b->p;
+ bleft = b->buf.i;
+ data = (const unsigned char *)b->buf.p;
if (!bleft)
goto too_short;
@@ -194,11 +194,11 @@
return 0;
msg_len = 0;
- bleft = l4->req->i;
+ bleft = l4->req->buf.i;
if (!bleft)
goto too_short;
- data = (const unsigned char *)l4->req->p;
+ data = (const unsigned char *)l4->req->buf.p;
if ((*data >= 0x14 && *data <= 0x17) || (*data == 0xFF)) {
/* SSLv3 header format */
if (bleft < 5)
@@ -266,8 +266,8 @@
* all the part of the request which fits in a buffer is already
* there.
*/
- if (msg_len > buffer_max_len(l4->req) + l4->req->data - l4->req->p)
- msg_len = buffer_max_len(l4->req) + l4->req->data - l4->req->p;
+ if (msg_len > buffer_max_len(l4->req) + l4->req->buf.data - l4->req->buf.p)
+ msg_len = buffer_max_len(l4->req) + l4->req->buf.data - l4->req->buf.p;
if (bleft < msg_len)
goto too_short;
@@ -332,8 +332,8 @@
b = ((opt & SMP_OPT_DIR) == SMP_OPT_DIR_RES) ? l4->rep : l4->req;
- bleft = b->i;
- data = (unsigned char *)b->p;
+ bleft = b->buf.i;
+ data = (unsigned char *)b->buf.p;
/* Check for SSL/TLS Handshake */
if (!bleft)
diff --git a/src/backend.c b/src/backend.c
index b3bd972..f9cbaf2 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -257,11 +257,11 @@
struct proxy *px = s->be;
unsigned int plen = px->url_param_len;
unsigned long len = msg->body_len;
- const char *params = b_ptr(req, (int)(msg->sov - req->o));
+ const char *params = b_ptr(&req->buf, (int)(msg->sov - req->buf.o));
const char *p = params;
- if (len > buffer_len(req) - msg->sov)
- len = buffer_len(req) - msg->sov;
+ if (len > buffer_len(&req->buf) - msg->sov)
+ len = buffer_len(&req->buf) - msg->sov;
if (len == 0)
return NULL;
@@ -342,7 +342,7 @@
ctx.idx = 0;
/* if the message is chunked, we skip the chunk size, but use the value as len */
- http_find_header2(px->hh_name, plen, b_ptr(s->req, -s->req->o), &txn->hdr_idx, &ctx);
+ http_find_header2(px->hh_name, plen, b_ptr(&s->req->buf, s->req->buf.o), &txn->hdr_idx, &ctx);
/* if the header is not found or empty, let's fallback to round robin */
if (!ctx.idx || !ctx.vlen)
@@ -418,7 +418,7 @@
args[0].data.str.len = px->hh_len;
args[1].type = ARGT_STOP;
- b_rew(s->req, rewind = s->req->o);
+ b_rew(s->req, rewind = s->req->buf.o);
ret = smp_fetch_rdp_cookie(px, s, NULL, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, args, &smp);
len = smp.data.str.len;
@@ -568,7 +568,7 @@
if (s->txn.req.msg_state < HTTP_MSG_BODY)
break;
srv = get_server_uh(s->be,
- b_ptr(s->req, (int)(s->txn.req.sl.rq.u - s->req->o)),
+ b_ptr(&s->req->buf, (int)(s->txn.req.sl.rq.u - s->req->buf.o)),
s->txn.req.sl.rq.u_l);
break;
@@ -578,7 +578,7 @@
break;
srv = get_server_ph(s->be,
- b_ptr(s->req, (int)(s->txn.req.sl.rq.u - s->req->o)),
+ b_ptr(&s->req->buf, (int)(s->txn.req.sl.rq.u - s->req->buf.o)),
s->txn.req.sl.rq.u_l);
if (!srv && s->txn.meth == HTTP_METH_POST)
@@ -904,7 +904,7 @@
((struct sockaddr_in *)&s->req->cons->addr.from)->sin_port = 0;
((struct sockaddr_in *)&s->req->cons->addr.from)->sin_addr.s_addr = 0;
- b_rew(s->req, rewind = s->req->o);
+ b_rew(s->req, rewind = s->req->buf.o);
if (http_get_hdr(&s->txn.req, srv->bind_hdr_name, srv->bind_hdr_len,
&s->txn.hdr_idx, srv->bind_hdr_occ, NULL, &vptr, &vlen)) {
((struct sockaddr_in *)&s->req->cons->addr.from)->sin_addr.s_addr =
@@ -938,7 +938,7 @@
((struct sockaddr_in *)&s->req->cons->addr.from)->sin_port = 0;
((struct sockaddr_in *)&s->req->cons->addr.from)->sin_addr.s_addr = 0;
- b_rew(s->req, rewind = s->req->o);
+ b_rew(s->req, rewind = s->req->buf.o);
if (http_get_hdr(&s->txn.req, s->be->bind_hdr_name, s->be->bind_hdr_len,
&s->txn.hdr_idx, s->be->bind_hdr_occ, NULL, &vptr, &vlen)) {
((struct sockaddr_in *)&s->req->cons->addr.from)->sin_addr.s_addr =
diff --git a/src/buffers.c b/src/buffers.c
index 6d87ef9..db4b435 100644
--- a/src/buffers.c
+++ b/src/buffers.c
@@ -51,7 +51,7 @@
* once anyway.
*/
if (bytes <= ~0U) {
- if (bytes32 <= buf->i) {
+ if (bytes32 <= buf->buf.i) {
/* OK this amount of bytes might be forwarded at once */
if (!bytes32)
return 0;
@@ -60,8 +60,8 @@
}
}
- forwarded = buf->i;
- b_adv(buf, buf->i);
+ forwarded = buf->buf.i;
+ b_adv(buf, buf->buf.i);
/* Note: the case below is the only case where we may return
* a byte count that does not fit into a 32-bit number.
@@ -103,7 +103,7 @@
if (len == 0)
return -1;
- if (len > buf->size) {
+ if (len > buf->buf.size) {
/* we can't write this chunk and will never be able to, because
* it is larger than the buffer. This must be reported as an
* error. Then we return -2 so that writers that don't care can
@@ -112,14 +112,14 @@
return -2;
}
- max = buffer_realign(buf);
+ max = buffer_realign(&buf->buf);
if (len > max)
return max;
- memcpy(buf->p, msg, len);
- buf->o += len;
- buf->p = b_ptr(buf, len);
+ memcpy(buf->buf.p, msg, len);
+ buf->buf.o += len;
+ buf->buf.p = b_ptr(&buf->buf, len);
buf->total += len;
buf->flags &= ~(BF_OUT_EMPTY|BF_FULL);
@@ -144,9 +144,9 @@
if (buf->flags & BF_FULL)
return -1;
- *bi_end(buf) = c;
+ *bi_end(&buf->buf) = c;
- buf->i++;
+ buf->buf.i++;
if (bi_full(buf))
buf->flags |= BF_FULL;
buf->flags |= BF_READ_PARTIAL;
@@ -177,7 +177,7 @@
return -2;
max = buffer_max_len(buf);
- if (unlikely(len > max - buffer_len(buf))) {
+ if (unlikely(len > max - buffer_len(&buf->buf))) {
/* we can't write this chunk right now because the buffer is
* almost full or because the block is too large. Return the
* available space or -2 if impossible.
@@ -192,12 +192,12 @@
return 0;
/* OK so the data fits in the buffer in one or two blocks */
- max = buffer_contig_space_with_res(buf, buf->size - max);
- memcpy(bi_end(buf), blk, MIN(len, max));
+ max = buffer_contig_space_with_res(&buf->buf, buf->buf.size - max);
+ memcpy(bi_end(&buf->buf), blk, MIN(len, max));
if (len > max)
- memcpy(buf->data, blk + max, len - max);
+ memcpy(buf->buf.data, blk + max, len - max);
- buf->i += len;
+ buf->buf.i += len;
buf->total += len;
if (buf->to_forward) {
unsigned long fwd = len;
@@ -243,10 +243,10 @@
goto out;
}
- p = bo_ptr(buf);
+ p = bo_ptr(&buf->buf);
- if (max > buf->o) {
- max = buf->o;
+ if (max > buf->buf.o) {
+ max = buf->buf.o;
str[max-1] = 0;
}
while (max) {
@@ -256,9 +256,9 @@
if (*p == '\n')
break;
- p = buffer_wrap_add(buf, p + 1);
+ p = buffer_wrap_add(&buf->buf, p + 1);
}
- if (ret > 0 && ret < len && ret < buf->o &&
+ if (ret > 0 && ret < len && ret < buf->buf.o &&
*(str-1) != '\n' &&
!(buf->flags & (BF_SHUTW|BF_SHUTW_NOW)))
ret = 0;
@@ -283,25 +283,25 @@
if (buf->flags & BF_SHUTW)
return -1;
- if (len + offset > buf->o) {
+ if (len + offset > buf->buf.o) {
if (buf->flags & (BF_SHUTW|BF_SHUTW_NOW))
return -1;
return 0;
}
- firstblock = buf->data + buf->size - bo_ptr(buf);
+ firstblock = buf->buf.data + buf->buf.size - bo_ptr(&buf->buf);
if (firstblock > offset) {
if (firstblock >= len + offset) {
- memcpy(blk, bo_ptr(buf) + offset, len);
+ memcpy(blk, bo_ptr(&buf->buf) + offset, len);
return len;
}
- memcpy(blk, bo_ptr(buf) + offset, firstblock - offset);
- memcpy(blk + firstblock - offset, buf->data, len - firstblock + offset);
+ memcpy(blk, bo_ptr(&buf->buf) + offset, firstblock - offset);
+ memcpy(blk + firstblock - offset, buf->buf.data, len - firstblock + offset);
return len;
}
- memcpy(blk, buf->data + offset - firstblock, len);
+ memcpy(blk, buf->buf.data + offset - firstblock, len);
return len;
}
@@ -321,26 +321,26 @@
delta = len - (end - pos);
- if (bi_end(b) + delta >= b->data + b->size)
+ if (bi_end(&b->buf) + delta >= b->buf.data + b->buf.size)
return 0; /* no space left */
- if (buffer_not_empty(b) &&
- bi_end(b) + delta > bo_ptr(b) &&
- bo_ptr(b) >= bi_end(b))
+ if (buffer_not_empty(&b->buf) &&
+ bi_end(&b->buf) + delta > bo_ptr(&b->buf) &&
+ bo_ptr(&b->buf) >= bi_end(&b->buf))
return 0; /* no space left before wrapping data */
/* first, protect the end of the buffer */
- memmove(end + delta, end, bi_end(b) - end);
+ memmove(end + delta, end, bi_end(&b->buf) - end);
/* now, copy str over pos */
if (len)
memcpy(pos, str, len);
- b->i += delta;
+ b->buf.i += delta;
b->flags &= ~BF_FULL;
- if (buffer_len(b) == 0)
- b->p = b->data;
+ if (buffer_len(&b->buf) == 0)
+ b->buf.p = b->buf.data;
if (bi_full(b))
b->flags |= BF_FULL;
@@ -363,11 +363,11 @@
delta = len + 2;
- if (bi_end(b) + delta >= b->data + b->size)
+ if (bi_end(&b->buf) + delta >= b->buf.data + b->buf.size)
return 0; /* no space left */
/* first, protect the end of the buffer */
- memmove(pos + delta, pos, bi_end(b) - pos);
+ memmove(pos + delta, pos, bi_end(&b->buf) - pos);
/* now, copy str over pos */
if (len && str) {
@@ -376,7 +376,7 @@
pos[len + 1] = '\n';
}
- b->i += delta;
+ b->buf.i += delta;
b->flags &= ~BF_FULL;
if (bi_full(b))
@@ -390,7 +390,7 @@
* becomes contiguous and starts at the beginning of the buffer area. The
* function may only be used when the buffer's output is empty.
*/
-void buffer_slow_realign(struct channel *buf)
+void buffer_slow_realign(struct buffer *buf)
{
/* two possible cases :
* - the buffer is in one contiguous block, we move it in-place
@@ -420,7 +420,7 @@
* so it's desirable to use it only on non-contiguous buffers. No pointers are
* changed, the caller is responsible for that.
*/
-void buffer_bounce_realign(struct channel *buf)
+void buffer_bounce_realign(struct buffer *buf)
{
int advance, to_move;
char *from, *to;
@@ -584,7 +584,7 @@
/*
* Dumps part or all of a buffer.
*/
-void buffer_dump(FILE *o, struct channel *b, int from, int to)
+void buffer_dump(FILE *o, struct buffer *b, int from, int to)
{
fprintf(o, "Dumping buffer %p\n", b);
fprintf(o, " data=%p o=%d i=%d p=%p\n",
diff --git a/src/dumpstats.c b/src/dumpstats.c
index a3d0f28..4d7b90c 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -1481,7 +1481,7 @@
/* ensure we have some output room left in the event we
* would want to return some info right after parsing.
*/
- if (buffer_almost_full(si->ib))
+ if (buffer_almost_full(&si->ib->buf))
break;
reql = bo_getline(si->ob, trash, trashlen);
@@ -1595,7 +1595,7 @@
* buffer is empty. This still allows pipelined requests
* to be sent in non-interactive mode.
*/
- if ((res->flags & (BF_SHUTW|BF_SHUTW_NOW)) || (!si->applet.st1 && !req->o)) {
+ if ((res->flags & (BF_SHUTW|BF_SHUTW_NOW)) || (!si->applet.st1 && !req->buf.o)) {
si->applet.st0 = STAT_CLI_END;
continue;
}
@@ -2197,7 +2197,7 @@
case STAT_ST_LIST:
/* dump proxies */
while (si->applet.ctx.stats.px) {
- if (buffer_almost_full(rep))
+ if (buffer_almost_full(&rep->buf))
return 0;
px = si->applet.ctx.stats.px;
/* skip the disabled proxies and non-networked ones */
@@ -2513,7 +2513,7 @@
case STAT_PX_ST_LI:
/* stats.l has been initialized above */
for (; si->applet.ctx.stats.l != NULL; si->applet.ctx.stats.l = l->next) {
- if (buffer_almost_full(rep))
+ if (buffer_almost_full(&rep->buf))
return 0;
l = si->applet.ctx.stats.l;
@@ -2651,7 +2651,7 @@
for (; si->applet.ctx.stats.sv != NULL; si->applet.ctx.stats.sv = sv->next) {
int sv_state; /* 0=DOWN, 1=going up, 2=going down, 3=UP, 4,5=NOLB, 6=unchecked */
- if (buffer_almost_full(rep))
+ if (buffer_almost_full(&rep->buf))
return 0;
sv = si->applet.ctx.stats.sv;
@@ -3472,7 +3472,7 @@
" an_exp=%s",
sess->req,
sess->req->flags, sess->req->analysers,
- sess->req->i, sess->req->o,
+ sess->req->buf.i, sess->req->buf.o,
sess->req->pipe ? sess->req->pipe->data : 0,
sess->req->to_forward,
sess->req->analyse_exp ?
@@ -3491,8 +3491,8 @@
sess->req->wex ?
human_time(TICKS_TO_MS(sess->req->wex - now_ms),
TICKS_TO_MS(1000)) : "<NEVER>",
- sess->req->data,
- (int)(sess->req->p - sess->req->data),
+ sess->req->buf.data,
+ (int)(sess->req->buf.p - sess->req->buf.data),
sess->txn.req.next,
sess->req->total);
@@ -3501,7 +3501,7 @@
" an_exp=%s",
sess->rep,
sess->rep->flags, sess->rep->analysers,
- sess->rep->i, sess->rep->o,
+ sess->rep->buf.i, sess->rep->buf.o,
sess->rep->pipe ? sess->rep->pipe->data : 0,
sess->rep->to_forward,
sess->rep->analyse_exp ?
@@ -3520,8 +3520,8 @@
sess->rep->wex ?
human_time(TICKS_TO_MS(sess->rep->wex - now_ms),
TICKS_TO_MS(1000)) : "<NEVER>",
- sess->rep->data,
- (int)(sess->rep->p - sess->rep->data),
+ sess->rep->buf.data,
+ (int)(sess->rep->buf.p - sess->rep->buf.data),
sess->txn.rsp.next,
sess->rep->total);
@@ -3642,7 +3642,7 @@
chunk_printf(&msg,
" rq[f=%06xh,i=%d,an=%02xh,rx=%s",
curr_sess->req->flags,
- curr_sess->req->i,
+ curr_sess->req->buf.i,
curr_sess->req->analysers,
curr_sess->req->rex ?
human_time(TICKS_TO_MS(curr_sess->req->rex - now_ms),
@@ -3663,7 +3663,7 @@
chunk_printf(&msg,
" rp[f=%06xh,i=%d,an=%02xh,rx=%s",
curr_sess->rep->flags,
- curr_sess->rep->i,
+ curr_sess->rep->buf.i,
curr_sess->rep->analysers,
curr_sess->rep->rex ?
human_time(TICKS_TO_MS(curr_sess->rep->rex - now_ms),
diff --git a/src/frontend.c b/src/frontend.c
index 8405bf6..a4f0940 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -253,8 +253,8 @@
*/
int frontend_decode_proxy_request(struct session *s, struct channel *req, int an_bit)
{
- char *line = req->data;
- char *end = req->data + req->i;
+ char *line = req->buf.data;
+ char *end = req->buf.data + req->buf.i;
int len;
DPRINTF(stderr,"[%u] %s: session=%p b=%p, exp(r,w)=%u,%u bf=%08x bh=%d analysers=%02x\n",
@@ -269,7 +269,7 @@
if (req->flags & (BF_READ_ERROR|BF_READ_TIMEOUT))
goto fail;
- len = MIN(req->i, 6);
+ len = MIN(req->buf.i, 6);
if (!len)
goto missing;
@@ -278,7 +278,7 @@
goto fail;
line += 6;
- if (req->i < 18) /* shortest possible line */
+ if (req->buf.i < 18) /* shortest possible line */
goto missing;
if (!memcmp(line, "TCP4 ", 5) != 0) {
@@ -388,8 +388,8 @@
}
/* remove the PROXY line from the request */
- len = line - req->data;
- buffer_replace2(req, req->data, line, NULL, 0);
+ len = line - req->buf.data;
+ buffer_replace2(req, req->buf.data, line, NULL, 0);
req->total -= len; /* don't count the header line */
req->analysers &= ~an_bit;
diff --git a/src/peers.c b/src/peers.c
index e18b065..c168ec4 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1228,7 +1228,7 @@
if ((s->req = pool_alloc2(pool2_buffer)) == NULL)
goto out_fail_req; /* no memory */
- s->req->size = global.tune.bufsize;
+ s->req->buf.size = global.tune.bufsize;
buffer_init(s->req);
s->req->prod = &s->si[0];
s->req->cons = &s->si[1];
@@ -1251,7 +1251,7 @@
if ((s->rep = pool_alloc2(pool2_buffer)) == NULL)
goto out_fail_rep; /* no memory */
- s->rep->size = global.tune.bufsize;
+ s->rep->buf.size = global.tune.bufsize;
buffer_init(s->rep);
s->rep->prod = &s->si[1];
s->rep->cons = &s->si[0];
diff --git a/src/proto_http.c b/src/proto_http.c
index 173ba32..c9383b4 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -394,14 +394,14 @@
"[%04d] req: p=%d(%d) s=%d bf=%08x an=%08x data=%p size=%d l=%d w=%p r=%p o=%p sm=%d fw=%ld tf=%08x\n",
line,
s->si[0].state, s->si[0].fd, s->txn.req.msg_state, s->req->flags, s->req->analysers,
- s->req->data, s->req->size, s->req->l, s->req->w, s->req->r, s->req->p, s->req->o, s->req->to_forward, s->txn.flags);
+ s->req->buf.data, s->req->buf.size, s->req->l, s->req->w, s->req->r, s->req->buf.p, s->req->buf.o, s->req->to_forward, s->txn.flags);
write(-1, trash, size);
size = 0;
size += snprintf(trash + size, trashlen - size,
" %04d rep: p=%d(%d) s=%d bf=%08x an=%08x data=%p size=%d l=%d w=%p r=%p o=%p sm=%d fw=%ld\n",
line,
s->si[1].state, s->si[1].fd, s->txn.rsp.msg_state, s->rep->flags, s->rep->analysers,
- s->rep->data, s->rep->size, s->rep->l, s->rep->w, s->rep->r, s->rep->p, s->rep->o, s->rep->to_forward);
+ s->rep->buf.data, s->rep->buf.size, s->rep->l, s->rep->w, s->rep->r, s->rep->buf.p, s->rep->buf.o, s->rep->to_forward);
write(-1, trash, size);
}
@@ -421,7 +421,7 @@
int bytes, len;
len = strlen(text);
- bytes = buffer_insert_line2(msg->buf, msg->buf->p + msg->eoh, text, len);
+ bytes = buffer_insert_line2(msg->buf, msg->buf->buf.p + msg->eoh, text, len);
if (!bytes)
return -1;
http_msg_move_end(msg, bytes);
@@ -441,7 +441,7 @@
{
int bytes;
- bytes = buffer_insert_line2(msg->buf, msg->buf->p + msg->eoh, text, len);
+ bytes = buffer_insert_line2(msg->buf, msg->buf->buf.p + msg->eoh, text, len);
if (!bytes)
return -1;
http_msg_move_end(msg, bytes);
@@ -712,7 +712,7 @@
{
char *ptr, *end;
- ptr = txn->req.buf->p + txn->req.sl.rq.u;
+ ptr = txn->req.buf->buf.p + txn->req.sl.rq.u;
end = ptr + txn->req.sl.rq.u_l;
if (ptr >= end)
@@ -787,10 +787,10 @@
* to temporarily rewind the buffer.
*/
txn = &s->txn;
- b_rew(s->req, rewind = s->req->o);
+ b_rew(s->req, rewind = s->req->buf.o);
path = http_get_path(txn);
- len = buffer_count(s->req, path, b_ptr(s->req, txn->req.sl.rq.u + txn->req.sl.rq.u_l));
+ len = buffer_count(&s->req->buf, path, b_ptr(&s->req->buf, txn->req.sl.rq.u + txn->req.sl.rq.u_l));
b_adv(s->req, rewind);
@@ -962,7 +962,7 @@
unsigned int state, const char *ptr, const char *end,
unsigned int *ret_ptr, unsigned int *ret_state)
{
- const char *msg_start = msg->buf->p;
+ const char *msg_start = msg->buf->buf.p;
switch (state) {
case HTTP_MSG_RPVER:
@@ -1072,7 +1072,7 @@
unsigned int state, const char *ptr, const char *end,
unsigned int *ret_ptr, unsigned int *ret_state)
{
- const char *msg_start = msg->buf->p;
+ const char *msg_start = msg->buf->buf.p;
switch (state) {
case HTTP_MSG_RQMETH:
@@ -1234,7 +1234,7 @@
len = strlen(h);
}
- if (!http_find_header2(h, len, s->req->p, &txn->hdr_idx, &ctx))
+ if (!http_find_header2(h, len, s->req->buf.p, &txn->hdr_idx, &ctx))
return 0;
h = ctx.line + ctx.val;
@@ -1293,8 +1293,8 @@
struct channel *buf = msg->buf;
state = msg->msg_state;
- ptr = buf->p + msg->next;
- end = buf->p + buf->i;
+ ptr = buf->buf.p + msg->next;
+ end = buf->buf.p + buf->buf.i;
if (unlikely(ptr >= end))
goto http_msg_ood;
@@ -1312,11 +1312,11 @@
* first if we need to remove some CRLF. We can only
* do this when o=0.
*/
- if (unlikely(ptr != buf->p)) {
- if (buf->o)
+ if (unlikely(ptr != buf->buf.p)) {
+ if (buf->buf.o)
goto http_msg_ood;
/* Remove empty leading lines, as recommended by RFC2616. */
- bi_fast_delete(buf, ptr - buf->p);
+ bi_fast_delete(&buf->buf, ptr - buf->buf.p);
}
msg->sol = 0;
hdr_idx_init(idx);
@@ -1355,7 +1355,7 @@
*/
hdr_idx_set_start(idx, msg->sl.st.l, *ptr == '\r');
- msg->sol = ptr - buf->p;
+ msg->sol = ptr - buf->buf.p;
if (likely(*ptr == '\r'))
EAT_AND_JUMP_OR_RETURN(http_msg_rpline_end, HTTP_MSG_RPLINE_END);
goto http_msg_rpline_end;
@@ -1377,11 +1377,11 @@
* first if we need to remove some CRLF. We can only
* do this when o=0.
*/
- if (likely(ptr != buf->p)) {
- if (buf->o)
+ if (likely(ptr != buf->buf.p)) {
+ if (buf->buf.o)
goto http_msg_ood;
/* Remove empty leading lines, as recommended by RFC2616. */
- bi_fast_delete(buf, ptr - buf->p);
+ bi_fast_delete(&buf->buf, ptr - buf->buf.p);
}
msg->sol = 0;
/* we will need this when keep-alive will be supported
@@ -1422,7 +1422,7 @@
*/
hdr_idx_set_start(idx, msg->sl.rq.l, *ptr == '\r');
- msg->sol = ptr - buf->p;
+ msg->sol = ptr - buf->buf.p;
if (likely(*ptr == '\r'))
EAT_AND_JUMP_OR_RETURN(http_msg_rqline_end, HTTP_MSG_RQLINE_END);
goto http_msg_rqline_end;
@@ -1444,7 +1444,7 @@
*/
case HTTP_MSG_HDR_FIRST:
http_msg_hdr_first:
- msg->sol = ptr - buf->p;
+ msg->sol = ptr - buf->buf.p;
if (likely(!HTTP_IS_CRLF(*ptr))) {
goto http_msg_hdr_name;
}
@@ -1466,7 +1466,7 @@
goto http_msg_invalid;
if (msg->err_pos == -1) /* capture error pointer */
- msg->err_pos = ptr - buf->p; /* >= 0 now */
+ msg->err_pos = ptr - buf->buf.p; /* >= 0 now */
/* and we still accept this non-token character */
EAT_AND_JUMP_OR_RETURN(http_msg_hdr_name, HTTP_MSG_HDR_NAME);
@@ -1478,7 +1478,7 @@
EAT_AND_JUMP_OR_RETURN(http_msg_hdr_l1_sp, HTTP_MSG_HDR_L1_SP);
/* header value can be basically anything except CR/LF */
- msg->sov = ptr - buf->p;
+ msg->sov = ptr - buf->buf.p;
if (likely(!HTTP_IS_CRLF(*ptr))) {
goto http_msg_hdr_val;
@@ -1497,8 +1497,8 @@
http_msg_hdr_l1_lws:
if (likely(HTTP_IS_SPHT(*ptr))) {
/* replace HT,CR,LF with spaces */
- for (; buf->p + msg->sov < ptr; msg->sov++)
- buf->p[msg->sov] = ' ';
+ for (; buf->buf.p + msg->sov < ptr; msg->sov++)
+ buf->buf.p[msg->sov] = ' ';
goto http_msg_hdr_l1_sp;
}
/* we had a header consisting only in spaces ! */
@@ -1513,7 +1513,7 @@
if (likely(!HTTP_IS_CRLF(*ptr)))
EAT_AND_JUMP_OR_RETURN(http_msg_hdr_val, HTTP_MSG_HDR_VAL);
- msg->eol = ptr - buf->p;
+ msg->eol = ptr - buf->buf.p;
/* Note: we could also copy eol into ->eoh so that we have the
* real header end in case it ends with lots of LWS, but is this
* really needed ?
@@ -1531,8 +1531,8 @@
http_msg_hdr_l2_lws:
if (unlikely(HTTP_IS_SPHT(*ptr))) {
/* LWS: replace HT,CR,LF with spaces */
- for (; buf->p + msg->eol < ptr; msg->eol++)
- buf->p[msg->eol] = ' ';
+ for (; buf->buf.p + msg->eol < ptr; msg->eol++)
+ buf->buf.p[msg->eol] = ' ';
goto http_msg_hdr_val;
}
http_msg_complete_header:
@@ -1543,11 +1543,11 @@
* first CR or LF so we know how the line ends. We insert last
* header into the index.
*/
- if (unlikely(hdr_idx_add(msg->eol - msg->sol, buf->p[msg->eol] == '\r',
+ if (unlikely(hdr_idx_add(msg->eol - msg->sol, buf->buf.p[msg->eol] == '\r',
idx, idx->tail) < 0))
goto http_msg_invalid;
- msg->sol = ptr - buf->p;
+ msg->sol = ptr - buf->buf.p;
if (likely(!HTTP_IS_CRLF(*ptr))) {
goto http_msg_hdr_name;
}
@@ -1561,7 +1561,7 @@
/* Assumes msg->sol points to the first of either CR or LF */
EXPECT_LF_HERE(ptr, http_msg_invalid);
ptr++;
- msg->sov = msg->next = ptr - buf->p;
+ msg->sov = msg->next = ptr - buf->buf.p;
msg->eoh = msg->sol;
msg->sol = 0;
msg->msg_state = HTTP_MSG_BODY;
@@ -1580,13 +1580,13 @@
http_msg_ood:
/* out of data */
msg->msg_state = state;
- msg->next = ptr - buf->p;
+ msg->next = ptr - buf->buf.p;
return;
http_msg_invalid:
/* invalid message */
msg->msg_state = HTTP_MSG_ERROR;
- msg->next = ptr - buf->p;
+ msg->next = ptr - buf->buf.p;
return;
}
@@ -1603,7 +1603,7 @@
if (msg->sl.rq.v_l != 0)
return 1;
- cur_end = msg->buf->p + msg->sl.rq.l;
+ cur_end = msg->buf->buf.p + msg->sl.rq.l;
delta = 0;
if (msg->sl.rq.u_l == 0) {
@@ -1618,7 +1618,7 @@
cur_end += delta;
cur_end = (char *)http_parse_reqline(msg,
HTTP_MSG_RQMETH,
- msg->buf->p, cur_end + 1,
+ msg->buf->buf.p, cur_end + 1,
NULL, NULL);
if (unlikely(!cur_end))
return 0;
@@ -1656,7 +1656,7 @@
ctx.idx = 0;
txn->flags &= ~(TX_CON_KAL_SET|TX_CON_CLO_SET);
- while (http_find_header2(hdr_val, hdr_len, msg->buf->p, &txn->hdr_idx, &ctx)) {
+ while (http_find_header2(hdr_val, hdr_len, msg->buf->buf.p, &txn->hdr_idx, &ctx)) {
if (ctx.vlen >= 10 && word_match(ctx.line + ctx.val, ctx.vlen, "keep-alive", 10)) {
txn->flags |= TX_HDR_CONN_KAL;
if (to_del & 2)
@@ -1697,7 +1697,7 @@
}
txn->flags &= ~(TX_CON_CLO_SET | TX_CON_KAL_SET);
- while (http_find_header2(hdr_val, hdr_len, msg->buf->p, &txn->hdr_idx, &ctx)) {
+ while (http_find_header2(hdr_val, hdr_len, msg->buf->buf.p, &txn->hdr_idx, &ctx)) {
if (ctx.vlen >= 10 && word_match(ctx.line + ctx.val, ctx.vlen, "keep-alive", 10)) {
if (wanted & TX_CON_KAL_SET)
txn->flags |= TX_CON_KAL_SET;
@@ -1748,10 +1748,10 @@
int http_parse_chunk_size(struct http_msg *msg)
{
const struct channel *buf = msg->buf;
- const char *ptr = b_ptr(buf, msg->next);
+ const char *ptr = b_ptr(&buf->buf, msg->next);
const char *ptr_old = ptr;
- const char *end = buf->data + buf->size;
- const char *stop = bi_end(buf);
+ const char *end = buf->buf.data + buf->buf.size;
+ const char *stop = bi_end(&buf->buf);
unsigned int chunk = 0;
/* The chunk size is in the following form, though we are only
@@ -1766,7 +1766,7 @@
if (c < 0) /* not a hex digit anymore */
break;
if (++ptr >= end)
- ptr = buf->data;
+ ptr = buf->buf.data;
if (chunk & 0xF8000000) /* integer overflow will occur if result >= 2GB */
goto error;
chunk = (chunk << 4) + c;
@@ -1778,7 +1778,7 @@
while (http_is_spht[(unsigned char)*ptr]) {
if (++ptr >= end)
- ptr = buf->data;
+ ptr = buf->buf.data;
if (ptr == stop)
return 0;
}
@@ -1791,7 +1791,7 @@
/* we now have a CR or an LF at ptr */
if (likely(*ptr == '\r')) {
if (++ptr >= end)
- ptr = buf->data;
+ ptr = buf->buf.data;
if (ptr == stop)
return 0;
}
@@ -1799,20 +1799,20 @@
if (*ptr != '\n')
goto error;
if (++ptr >= end)
- ptr = buf->data;
+ ptr = buf->buf.data;
/* done */
break;
}
else if (*ptr == ';') {
/* chunk extension, ends at next CRLF */
if (++ptr >= end)
- ptr = buf->data;
+ ptr = buf->buf.data;
if (ptr == stop)
return 0;
while (!HTTP_IS_CRLF(*ptr)) {
if (++ptr >= end)
- ptr = buf->data;
+ ptr = buf->buf.data;
if (ptr == stop)
return 0;
}
@@ -1828,13 +1828,13 @@
* ->sov.
*/
msg->sov += ptr - ptr_old;
- msg->next = buffer_count(buf, buf->p, ptr);
+ msg->next = buffer_count(&buf->buf, buf->buf.p, ptr);
msg->chunk_len = chunk;
msg->body_len += chunk;
msg->msg_state = chunk ? HTTP_MSG_DATA : HTTP_MSG_TRAILERS;
return 1;
error:
- msg->err_pos = buffer_count(buf, buf->p, ptr);
+ msg->err_pos = buffer_count(&buf->buf, buf->buf.p, ptr);
return -1;
}
@@ -1860,8 +1860,8 @@
/* we have msg->next which points to next line. Look for CRLF. */
while (1) {
const char *p1 = NULL, *p2 = NULL;
- const char *ptr = b_ptr(buf, msg->next);
- const char *stop = bi_end(buf);
+ const char *ptr = b_ptr(&buf->buf, msg->next);
+ const char *stop = bi_end(&buf->buf);
int bytes;
/* scan current line and stop at LF or CRLF */
@@ -1878,42 +1878,42 @@
if (*ptr == '\r') {
if (p1) {
- msg->err_pos = buffer_count(buf, buf->p, ptr);
+ msg->err_pos = buffer_count(&buf->buf, buf->buf.p, ptr);
return -1;
}
p1 = ptr;
}
ptr++;
- if (ptr >= buf->data + buf->size)
- ptr = buf->data;
+ if (ptr >= buf->buf.data + buf->buf.size)
+ ptr = buf->buf.data;
}
/* after LF; point to beginning of next line */
p2++;
- if (p2 >= buf->data + buf->size)
- p2 = buf->data;
+ if (p2 >= buf->buf.data + buf->buf.size)
+ p2 = buf->buf.data;
- bytes = p2 - b_ptr(buf, msg->next);
+ bytes = p2 - b_ptr(&buf->buf, msg->next);
if (bytes < 0)
- bytes += buf->size;
+ bytes += buf->buf.size;
/* schedule this line for forwarding */
msg->sov += bytes;
- if (msg->sov >= buf->size)
- msg->sov -= buf->size;
+ if (msg->sov >= buf->buf.size)
+ msg->sov -= buf->buf.size;
- if (p1 == b_ptr(buf, msg->next)) {
+ if (p1 == b_ptr(&buf->buf, msg->next)) {
/* LF/CRLF at beginning of line => end of trailers at p2.
* Everything was scheduled for forwarding, there's nothing
* left from this message.
*/
- msg->next = buffer_count(buf, buf->p, p2);
+ msg->next = buffer_count(&buf->buf, buf->buf.p, p2);
msg->msg_state = HTTP_MSG_DONE;
return 1;
}
/* OK, next line then */
- msg->next = buffer_count(buf, buf->p, p2);
+ msg->next = buffer_count(&buf->buf, buf->buf.p, p2);
}
}
@@ -1938,25 +1938,25 @@
* against the correct length.
*/
bytes = 1;
- ptr = buf->p;
+ ptr = buf->buf.p;
if (*ptr == '\r') {
bytes++;
ptr++;
- if (ptr >= buf->data + buf->size)
- ptr = buf->data;
+ if (ptr >= buf->buf.data + buf->buf.size)
+ ptr = buf->buf.data;
}
- if (bytes > buf->i)
+ if (bytes > buf->buf.i)
return 0;
if (*ptr != '\n') {
- msg->err_pos = buffer_count(buf, buf->p, ptr);
+ msg->err_pos = buffer_count(&buf->buf, buf->buf.p, ptr);
return -1;
}
ptr++;
- if (ptr >= buf->data + buf->size)
- ptr = buf->data;
+ if (ptr >= buf->buf.data + buf->buf.size)
+ ptr = buf->buf.data;
/* prepare the CRLF to be forwarded (between ->sol and ->sov) */
msg->sol = 0;
msg->sov = msg->next = bytes;
@@ -1982,9 +1982,9 @@
* For the parsing, we use a 28 states FSM.
*
* Here is the information we currently have :
- * req->p = beginning of request
- * req->p + msg->eoh = end of processed headers / start of current one
- * req->p + req->i = end of input data
+ * req->buf.p = beginning of request
+ * req->buf.p + msg->eoh = end of processed headers / start of current one
+ * req->buf.p + req->buf.i = end of input data
* msg->eol = end of current header or line (LF or CRLF)
* msg->next = first non-visited byte
*
@@ -2006,7 +2006,7 @@
req,
req->rex, req->wex,
req->flags,
- req->i,
+ req->buf.i,
req->analysers);
/* we're speaking HTTP here, so let's speak HTTP to the client */
@@ -2017,12 +2017,12 @@
* protected area is affected, because we may have to move processed
* data later, which is much more complicated.
*/
- if (buffer_not_empty(req) && msg->msg_state < HTTP_MSG_ERROR) {
+ if (buffer_not_empty(&req->buf) && msg->msg_state < HTTP_MSG_ERROR) {
if ((txn->flags & TX_NOT_FIRST) &&
unlikely((req->flags & BF_FULL) ||
- bi_end(req) < b_ptr(req, msg->next) ||
- bi_end(req) > req->data + req->size - global.tune.maxrewrite)) {
- if (req->o) {
+ bi_end(&req->buf) < b_ptr(&req->buf, msg->next) ||
+ bi_end(&req->buf) > req->buf.data + req->buf.size - global.tune.maxrewrite)) {
+ if (req->buf.o) {
if (req->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_WRITE_ERROR|BF_WRITE_TIMEOUT))
goto failed_keep_alive;
/* some data has still not left the buffer, wake us once that's done */
@@ -2030,9 +2030,9 @@
req->flags |= BF_READ_DONTWAIT; /* try to get back here ASAP */
return 0;
}
- if (bi_end(req) < b_ptr(req, msg->next) ||
- bi_end(req) > req->data + req->size - global.tune.maxrewrite)
- buffer_slow_realign(msg->buf);
+ if (bi_end(&req->buf) < b_ptr(&req->buf, msg->next) ||
+ bi_end(&req->buf) > req->buf.data + req->buf.size - global.tune.maxrewrite)
+ buffer_slow_realign(&msg->buf->buf);
}
/* Note that we have the same problem with the response ; we
@@ -2044,9 +2044,9 @@
*/
if ((txn->flags & TX_NOT_FIRST) &&
unlikely((s->rep->flags & BF_FULL) ||
- bi_end(s->rep) < b_ptr(s->rep, txn->rsp.next) ||
- bi_end(s->rep) > s->rep->data + s->rep->size - global.tune.maxrewrite)) {
- if (s->rep->o) {
+ bi_end(&s->rep->buf) < b_ptr(&s->rep->buf, txn->rsp.next) ||
+ bi_end(&s->rep->buf) > s->rep->buf.data + s->rep->buf.size - global.tune.maxrewrite)) {
+ if (s->rep->buf.o) {
if (s->rep->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_WRITE_ERROR|BF_WRITE_TIMEOUT))
goto failed_keep_alive;
/* don't let a connection request be initiated */
@@ -2057,7 +2057,7 @@
}
}
- if (likely(msg->next < req->i)) /* some unparsed data are available */
+ if (likely(msg->next < req->buf.i)) /* some unparsed data are available */
http_msg_analyzer(msg, &txn->hdr_idx);
}
@@ -2067,7 +2067,7 @@
(msg->msg_state >= HTTP_MSG_BODY || msg->msg_state == HTTP_MSG_ERROR))) {
char *eol, *sol;
- sol = req->p;
+ sol = req->buf.p;
eol = sol + msg->sl.rq.l;
debug_hdr("clireq", s, sol, eol);
@@ -2123,7 +2123,7 @@
session_inc_http_err_ctr(s);
proxy_inc_fe_req_ctr(s->fe);
if (msg->err_pos < 0)
- msg->err_pos = req->i;
+ msg->err_pos = req->buf.i;
goto return_bad_req;
}
@@ -2215,7 +2215,7 @@
req->flags |= BF_READ_DONTWAIT; /* try to get back here ASAP */
s->rep->flags &= ~BF_EXPECT_MORE; /* speed up sending a previous response */
#ifdef TCP_QUICKACK
- if (s->listener->options & LI_O_NOQUICKACK && req->i) {
+ if (s->listener->options & LI_O_NOQUICKACK && req->buf.i) {
/* We need more data, we have to re-enable quick-ack in case we
* previously disabled it, otherwise we might cause the client
* to delay next data.
@@ -2262,7 +2262,7 @@
/* OK now we have a complete HTTP request with indexed headers. Let's
* complete the request parsing by setting a few fields we will need
- * later. At this point, we have the last CRLF at req->data + msg->eoh.
+ * later. At this point, we have the last CRLF at req->buf.data + msg->eoh.
* If the request is in HTTP/0.9 form, the rule is still true, and eoh
* points to the CRLF of the request line. msg->next points to the first
* byte after the last LF. msg->sov points to the first byte of data.
@@ -2289,7 +2289,7 @@
/*
* 1: identify the method
*/
- txn->meth = find_http_meth(req->p, msg->sl.rq.m_l);
+ txn->meth = find_http_meth(req->buf.p, msg->sl.rq.m_l);
/* we can make use of server redirect on GET and HEAD */
if (txn->meth == HTTP_METH_GET || txn->meth == HTTP_METH_HEAD)
@@ -2302,7 +2302,7 @@
*/
if (unlikely((s->fe->monitor_uri_len != 0) &&
(s->fe->monitor_uri_len == msg->sl.rq.u_l) &&
- !memcmp(req->p + msg->sl.rq.u,
+ !memcmp(req->buf.p + msg->sl.rq.u,
s->fe->monitor_uri,
s->fe->monitor_uri_len))) {
/*
@@ -2347,7 +2347,7 @@
if (urilen >= REQURI_LEN)
urilen = REQURI_LEN - 1;
- memcpy(txn->uri, req->p, urilen);
+ memcpy(txn->uri, req->buf.p, urilen);
txn->uri[urilen] = 0;
if (!(s->logs.logwait &= ~LW_REQ))
@@ -2367,9 +2367,9 @@
/* ... and check if the request is HTTP/1.1 or above */
if ((msg->sl.rq.v_l == 8) &&
- ((req->p[msg->sl.rq.v + 5] > '1') ||
- ((req->p[msg->sl.rq.v + 5] == '1') &&
- (req->p[msg->sl.rq.v + 7] >= '1'))))
+ ((req->buf.p[msg->sl.rq.v + 5] > '1') ||
+ ((req->buf.p[msg->sl.rq.v + 5] == '1') &&
+ (req->buf.p[msg->sl.rq.v + 7] >= '1'))))
msg->flags |= HTTP_MSGF_VER_11;
/* "connection" has not been parsed yet */
@@ -2385,7 +2385,7 @@
* CONNECT ip:port.
*/
if ((s->fe->options2 & PR_O2_USE_PXHDR) &&
- req->p[msg->sl.rq.u] != '/' && req->p[msg->sl.rq.u] != '*')
+ req->buf.p[msg->sl.rq.u] != '/' && req->buf.p[msg->sl.rq.u] != '*')
txn->flags |= TX_USE_PX_CONN;
/* transfer length unknown*/
@@ -2393,7 +2393,7 @@
/* 5: we may need to capture headers */
if (unlikely((s->logs.logwait & LW_REQHDR) && txn->req.cap))
- capture_headers(req->p, &txn->hdr_idx,
+ capture_headers(req->buf.p, &txn->hdr_idx,
txn->req.cap, s->fe->req_cap);
/* 6: determine the transfer-length.
@@ -2438,7 +2438,7 @@
ctx.idx = 0;
/* set TE_CHNK and XFER_LEN only if "chunked" is seen last */
while ((msg->flags & HTTP_MSGF_VER_11) &&
- http_find_header2("Transfer-Encoding", 17, req->p, &txn->hdr_idx, &ctx)) {
+ http_find_header2("Transfer-Encoding", 17, req->buf.p, &txn->hdr_idx, &ctx)) {
if (ctx.vlen == 7 && strncasecmp(ctx.line + ctx.val, "chunked", 7) == 0)
msg->flags |= (HTTP_MSGF_TE_CHNK | HTTP_MSGF_XFER_LEN);
else if (msg->flags & HTTP_MSGF_TE_CHNK) {
@@ -2451,26 +2451,26 @@
ctx.idx = 0;
while (!(msg->flags & HTTP_MSGF_TE_CHNK) && !use_close_only &&
- http_find_header2("Content-Length", 14, req->p, &txn->hdr_idx, &ctx)) {
+ http_find_header2("Content-Length", 14, req->buf.p, &txn->hdr_idx, &ctx)) {
signed long long cl;
if (!ctx.vlen) {
- msg->err_pos = ctx.line + ctx.val - req->p;
+ msg->err_pos = ctx.line + ctx.val - req->buf.p;
goto return_bad_req;
}
if (strl2llrc(ctx.line + ctx.val, ctx.vlen, &cl)) {
- msg->err_pos = ctx.line + ctx.val - req->p;
+ msg->err_pos = ctx.line + ctx.val - req->buf.p;
goto return_bad_req; /* parse failure */
}
if (cl < 0) {
- msg->err_pos = ctx.line + ctx.val - req->p;
+ msg->err_pos = ctx.line + ctx.val - req->buf.p;
goto return_bad_req;
}
if ((msg->flags & HTTP_MSGF_CNT_LEN) && (msg->chunk_len != cl)) {
- msg->err_pos = ctx.line + ctx.val - req->p;
+ msg->err_pos = ctx.line + ctx.val - req->buf.p;
goto return_bad_req; /* already specified, was different */
}
@@ -2535,17 +2535,17 @@
char *st_cur_param = NULL;
char *st_next_param = NULL;
- first_param = req->p + txn->req.eoh + 2;
+ first_param = req->buf.p + txn->req.eoh + 2;
end_params = first_param + txn->req.body_len;
cur_param = next_param = end_params;
- if (end_params >= req->data + req->size - global.tune.maxrewrite) {
+ if (end_params >= req->buf.data + req->buf.size - global.tune.maxrewrite) {
/* Prevent buffer overflow */
si->applet.ctx.stats.st_code = STAT_STATUS_EXCD;
return 1;
}
- else if (end_params > req->p + req->i) {
+ else if (end_params > req->buf.p + req->buf.i) {
/* we need more data */
si->applet.ctx.stats.st_code = STAT_STATUS_NONE;
return 0;
@@ -2797,7 +2797,7 @@
req,
req->rex, req->wex,
req->flags,
- req->i,
+ req->buf.i,
req->analysers);
/* first check whether we have some ACLs set to block this request */
@@ -3006,7 +3006,7 @@
struct hdr_ctx ctx;
ctx.idx = 0;
/* Expect is allowed in 1.1, look for it */
- if (http_find_header2("Expect", 6, req->p, &txn->hdr_idx, &ctx) &&
+ if (http_find_header2("Expect", 6, req->buf.p, &txn->hdr_idx, &ctx) &&
unlikely(ctx.vlen == 12 && strncasecmp(ctx.line+ctx.val, "100-continue", 12) == 0)) {
bo_inject(s->rep, http_100_chunk.str, http_100_chunk.len);
}
@@ -3079,7 +3079,7 @@
path = http_get_path(txn);
/* build message using path */
if (path) {
- pathlen = txn->req.sl.rq.u_l + (req->p + txn->req.sl.rq.u) - path;
+ pathlen = txn->req.sl.rq.u_l + (req->buf.p + txn->req.sl.rq.u) - path;
if (rule->flags & REDIRECT_FLAG_DROP_QS) {
int qs = 0;
while (qs < pathlen) {
@@ -3170,7 +3170,7 @@
rdr.len += 4;
bo_inject(req->prod->ob, rdr.str, rdr.len);
/* "eat" the request */
- bi_fast_delete(req, msg->sov);
+ bi_fast_delete(&req->buf, msg->sov);
msg->sov = 0;
req->analysers = AN_REQ_HTTP_XFER_BODY;
s->rep->analysers = AN_RES_HTTP_XFER_BODY;
@@ -3254,7 +3254,7 @@
req,
req->rex, req->wex,
req->flags,
- req->i,
+ req->buf.i,
req->analysers);
/*
@@ -3269,7 +3269,7 @@
* parsing incoming request.
*/
if ((s->be->options & PR_O_HTTP_PROXY) && !(s->flags & SN_ADDR_SET)) {
- url2sa(req->p + msg->sl.rq.u, msg->sl.rq.u_l, &s->req->cons->addr.to);
+ url2sa(req->buf.p + msg->sl.rq.u, msg->sl.rq.u_l, &s->req->cons->addr.to);
}
/*
@@ -3289,7 +3289,7 @@
/* It needs to look into the URI unless persistence must be ignored */
if ((txn->sessid == NULL) && s->be->appsession_name && !(s->flags & SN_IGNORE_PRST)) {
- get_srv_from_appsession(s, req->p + msg->sl.rq.u, msg->sl.rq.u_l);
+ get_srv_from_appsession(s, req->buf.p + msg->sl.rq.u, msg->sl.rq.u_l);
}
/* add unique-id if "header-unique-id" is specified */
@@ -3314,7 +3314,7 @@
if (!((s->fe->options | s->be->options) & PR_O_FF_ALWAYS) &&
http_find_header2(s->be->fwdfor_hdr_len ? s->be->fwdfor_hdr_name : s->fe->fwdfor_hdr_name,
s->be->fwdfor_hdr_len ? s->be->fwdfor_hdr_len : s->fe->fwdfor_hdr_len,
- req->p, &txn->hdr_idx, &ctx)) {
+ req->buf.p, &txn->hdr_idx, &ctx)) {
/* The header is set to be added only if none is present
* and we found it, so don't do anything.
*/
@@ -3468,7 +3468,7 @@
*/
if ((s->listener->options & LI_O_NOQUICKACK) &&
((msg->flags & HTTP_MSGF_TE_CHNK) ||
- (msg->body_len > req->i - txn->req.eoh - 2)))
+ (msg->body_len > req->buf.i - txn->req.eoh - 2)))
setsockopt(si_fd(&s->si[0]), IPPROTO_TCP, TCP_QUICKACK, &one, sizeof(one));
#endif
}
@@ -3586,7 +3586,7 @@
struct hdr_ctx ctx;
ctx.idx = 0;
/* Expect is allowed in 1.1, look for it */
- if (http_find_header2("Expect", 6, req->p, &txn->hdr_idx, &ctx) &&
+ if (http_find_header2("Expect", 6, req->buf.p, &txn->hdr_idx, &ctx) &&
unlikely(ctx.vlen == 12 && strncasecmp(ctx.line+ctx.val, "100-continue", 12) == 0)) {
bo_inject(s->rep, http_100_chunk.str, http_100_chunk.len);
}
@@ -3596,7 +3596,7 @@
if (msg->msg_state < HTTP_MSG_CHUNK_SIZE) {
/* we have msg->sov which points to the first byte of message body.
- * req->p still points to the beginning of the message and msg->sol
+ * req->buf.p still points to the beginning of the message and msg->sol
* is still null. We must save the body in msg->next because it
* survives buffer re-alignments.
*/
@@ -3631,7 +3631,7 @@
if (msg->body_len < limit)
limit = msg->body_len;
- if (req->i - msg->sov >= limit) /* we have enough bytes now */
+ if (req->buf.i - msg->sov >= limit) /* we have enough bytes now */
goto http_end;
missing_data:
@@ -3708,14 +3708,14 @@
ctx.idx = 0;
- old_o = req->o;
+ old_o = req->buf.o;
if (old_o) {
/* The request was already skipped, let's restore it */
b_rew(req, old_o);
}
- old_i = req->i;
- while (http_find_header2(hdr_name, hdr_name_len, txn->req.buf->p, &txn->hdr_idx, &ctx)) {
+ old_i = req->buf.i;
+ while (http_find_header2(hdr_name, hdr_name_len, txn->req.buf->buf.p, &txn->hdr_idx, &ctx)) {
/* remove any existing values from the header */
http_remove_header2(&txn->req, &txn->hdr_idx, &ctx);
}
@@ -3734,7 +3734,7 @@
* data to be forwarded in order to take into account the size
* variations.
*/
- b_adv(req, old_o + req->i - old_i);
+ b_adv(req, old_o + req->buf.i - old_i);
}
return 0;
@@ -3784,8 +3784,8 @@
}
/* don't count other requests' data */
- s->logs.bytes_in -= s->req->i;
- s->logs.bytes_out -= s->rep->i;
+ s->logs.bytes_in -= s->req->buf.i;
+ s->logs.bytes_out -= s->rep->buf.i;
/* let's do a final log if we need it */
if (s->logs.logwait &&
@@ -3804,8 +3804,8 @@
s->logs.prx_queue_size = 0; /* we get the number of pending conns before us */
s->logs.srv_queue_size = 0; /* we will get this number soon */
- s->logs.bytes_in = s->req->total = s->req->i;
- s->logs.bytes_out = s->rep->total = s->rep->i;
+ s->logs.bytes_in = s->req->total = s->req->buf.i;
+ s->logs.bytes_out = s->rep->total = s->rep->buf.i;
if (s->pend_pos)
pendconn_free(s->pend_pos);
@@ -3851,10 +3851,10 @@
* because the request will wait for it to flush a little
* bit before proceeding.
*/
- if (s->req->i) {
- if (s->rep->o &&
+ if (s->req->buf.i) {
+ if (s->rep->buf.o &&
!(s->rep->flags & BF_FULL) &&
- bi_end(s->rep) <= s->rep->data + s->rep->size - global.tune.maxrewrite)
+ bi_end(&s->rep->buf) <= s->rep->buf.data + s->rep->buf.size - global.tune.maxrewrite)
s->rep->flags |= BF_EXPECT_MORE;
}
@@ -4211,7 +4211,7 @@
return 0;
if ((req->flags & (BF_READ_ERROR|BF_READ_TIMEOUT|BF_WRITE_ERROR|BF_WRITE_TIMEOUT)) ||
- ((req->flags & BF_SHUTW) && (req->to_forward || req->o))) {
+ ((req->flags & BF_SHUTW) && (req->to_forward || req->buf.o))) {
/* Output closed while we were sending data. We must abort and
* wake the other side up.
*/
@@ -4231,7 +4231,7 @@
if (msg->msg_state < HTTP_MSG_CHUNK_SIZE) {
/* we have msg->sov which points to the first byte of message body.
- * req->p still points to the beginning of the message and msg->sol
+ * req->buf.p still points to the beginning of the message and msg->sol
* is still null. We must save the body in msg->next because it
* survives buffer re-alignments.
*/
@@ -4483,7 +4483,7 @@
rep,
rep->rex, rep->wex,
rep->flags,
- rep->i,
+ rep->buf.i,
rep->analysers);
/*
@@ -4495,9 +4495,9 @@
* For the parsing, we use a 28 states FSM.
*
* Here is the information we currently have :
- * rep->p = beginning of response
- * rep->p + msg->eoh = end of processed headers / start of current one
- * rep->p + rep->i = end of input data
+ * rep->buf.p = beginning of response
+ * rep->buf.p + msg->eoh = end of processed headers / start of current one
+ * rep->buf.p + rep->buf.i = end of input data
* msg->eol = end of current header or line (LF or CRLF)
* msg->next = first non-visited byte
*/
@@ -4507,11 +4507,11 @@
* protected area is affected, because we may have to move processed
* data later, which is much more complicated.
*/
- if (buffer_not_empty(rep) && msg->msg_state < HTTP_MSG_ERROR) {
+ if (buffer_not_empty(&rep->buf) && msg->msg_state < HTTP_MSG_ERROR) {
if (unlikely((rep->flags & BF_FULL) ||
- bi_end(rep) < b_ptr(rep, msg->next) ||
- bi_end(rep) > rep->data + rep->size - global.tune.maxrewrite)) {
- if (rep->o) {
+ bi_end(&rep->buf) < b_ptr(&rep->buf, msg->next) ||
+ bi_end(&rep->buf) > rep->buf.data + rep->buf.size - global.tune.maxrewrite)) {
+ if (rep->buf.o) {
/* some data has still not left the buffer, wake us once that's done */
if (rep->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_WRITE_ERROR|BF_WRITE_TIMEOUT))
goto abort_response;
@@ -4519,11 +4519,11 @@
rep->flags |= BF_READ_DONTWAIT; /* try to get back here ASAP */
return 0;
}
- if (rep->i <= rep->size - global.tune.maxrewrite)
- buffer_slow_realign(msg->buf);
+ if (rep->buf.i <= rep->buf.size - global.tune.maxrewrite)
+ buffer_slow_realign(&msg->buf->buf);
}
- if (likely(msg->next < rep->i))
+ if (likely(msg->next < rep->buf.i))
http_msg_analyzer(msg, &txn->hdr_idx);
}
@@ -4533,7 +4533,7 @@
(msg->msg_state >= HTTP_MSG_BODY || msg->msg_state == HTTP_MSG_ERROR))) {
char *eol, *sol;
- sol = rep->p;
+ sol = rep->buf.p;
eol = sol + msg->sl.st.l;
debug_hdr("srvrep", s, sol, eol);
@@ -4595,7 +4595,7 @@
/* too large response does not fit in buffer. */
else if (rep->flags & BF_FULL) {
if (msg->err_pos < 0)
- msg->err_pos = rep->i;
+ msg->err_pos = rep->buf.i;
goto hdr_response_bad;
}
@@ -4707,7 +4707,7 @@
/*
* 1: get the status code
*/
- n = rep->p[msg->sl.st.c] - '0';
+ n = rep->buf.p[msg->sl.st.c] - '0';
if (n < 1 || n > 5)
n = 0;
/* when the client triggers a 4xx from the server, it's most often due
@@ -4723,8 +4723,8 @@
/* check if the response is HTTP/1.1 or above */
if ((msg->sl.st.v_l == 8) &&
- ((rep->p[5] > '1') ||
- ((rep->p[5] == '1') && (rep->p[7] >= '1'))))
+ ((rep->buf.p[5] > '1') ||
+ ((rep->buf.p[5] == '1') && (rep->buf.p[7] >= '1'))))
msg->flags |= HTTP_MSGF_VER_11;
/* "connection" has not been parsed yet */
@@ -4733,7 +4733,7 @@
/* transfer length unknown*/
msg->flags &= ~HTTP_MSGF_XFER_LEN;
- txn->status = strl2ui(rep->p + msg->sl.st.c, msg->sl.st.c_l);
+ txn->status = strl2ui(rep->buf.p + msg->sl.st.c, msg->sl.st.c_l);
/* Adjust server's health based on status code. Note: status codes 501
* and 505 are triggered on demand by client request, so we must not
@@ -4781,7 +4781,7 @@
*/
s->logs.logwait &= ~LW_RESP;
if (unlikely((s->logs.logwait & LW_RSPHDR) && txn->rsp.cap))
- capture_headers(rep->p, &txn->hdr_idx,
+ capture_headers(rep->buf.p, &txn->hdr_idx,
txn->rsp.cap, s->fe->rsp_cap);
/* 4: determine the transfer-length.
@@ -4839,7 +4839,7 @@
use_close_only = 0;
ctx.idx = 0;
while ((msg->flags & HTTP_MSGF_VER_11) &&
- http_find_header2("Transfer-Encoding", 17, rep->p, &txn->hdr_idx, &ctx)) {
+ http_find_header2("Transfer-Encoding", 17, rep->buf.p, &txn->hdr_idx, &ctx)) {
if (ctx.vlen == 7 && strncasecmp(ctx.line + ctx.val, "chunked", 7) == 0)
msg->flags |= (HTTP_MSGF_TE_CHNK | HTTP_MSGF_XFER_LEN);
else if (msg->flags & HTTP_MSGF_TE_CHNK) {
@@ -4853,26 +4853,26 @@
/* FIXME: below we should remove the content-length header(s) in case of chunked encoding */
ctx.idx = 0;
while (!(msg->flags & HTTP_MSGF_TE_CHNK) && !use_close_only &&
- http_find_header2("Content-Length", 14, rep->p, &txn->hdr_idx, &ctx)) {
+ http_find_header2("Content-Length", 14, rep->buf.p, &txn->hdr_idx, &ctx)) {
signed long long cl;
if (!ctx.vlen) {
- msg->err_pos = ctx.line + ctx.val - rep->p;
+ msg->err_pos = ctx.line + ctx.val - rep->buf.p;
goto hdr_response_bad;
}
if (strl2llrc(ctx.line + ctx.val, ctx.vlen, &cl)) {
- msg->err_pos = ctx.line + ctx.val - rep->p;
+ msg->err_pos = ctx.line + ctx.val - rep->buf.p;
goto hdr_response_bad; /* parse failure */
}
if (cl < 0) {
- msg->err_pos = ctx.line + ctx.val - rep->p;
+ msg->err_pos = ctx.line + ctx.val - rep->buf.p;
goto hdr_response_bad;
}
if ((msg->flags & HTTP_MSGF_CNT_LEN) && (msg->chunk_len != cl)) {
- msg->err_pos = ctx.line + ctx.val - rep->p;
+ msg->err_pos = ctx.line + ctx.val - rep->buf.p;
goto hdr_response_bad; /* already specified, was different */
}
@@ -4910,7 +4910,7 @@
rep,
rep->rex, rep->wex,
rep->flags,
- rep->i,
+ rep->buf.i,
rep->analysers);
if (unlikely(msg->msg_state < HTTP_MSG_BODY)) /* we need more data */
@@ -5279,7 +5279,7 @@
return 0;
if ((res->flags & (BF_READ_ERROR|BF_READ_TIMEOUT|BF_WRITE_ERROR|BF_WRITE_TIMEOUT)) ||
- ((res->flags & BF_SHUTW) && (res->to_forward || res->o)) ||
+ ((res->flags & BF_SHUTW) && (res->to_forward || res->buf.o)) ||
!s->req->analysers) {
/* Output closed while we were sending data. We must abort and
* wake the other side up.
@@ -5294,7 +5294,7 @@
if (msg->msg_state < HTTP_MSG_CHUNK_SIZE) {
/* we have msg->sov which points to the first byte of message body.
- * rep->p still points to the beginning of the message and msg->sol
+ * rep->buf.p still points to the beginning of the message and msg->sol
* is still null. We must save the body in msg->next because it
* survives buffer re-alignments.
*/
@@ -5509,7 +5509,7 @@
last_hdr = 0;
- cur_next = req->p + hdr_idx_first_pos(&txn->hdr_idx);
+ cur_next = req->buf.p + hdr_idx_first_pos(&txn->hdr_idx);
old_idx = 0;
while (!last_hdr) {
@@ -5653,7 +5653,7 @@
done = 0;
- cur_ptr = req->p;
+ cur_ptr = req->buf.p;
cur_end = cur_ptr + txn->req.sl.rq.l;
/* Now we have the request line between cur_ptr and cur_end */
@@ -5966,7 +5966,7 @@
/* Iterate through the headers, we start with the start line. */
old_idx = 0;
- hdr_next = req->p + hdr_idx_first_pos(&txn->hdr_idx);
+ hdr_next = req->buf.p + hdr_idx_first_pos(&txn->hdr_idx);
while ((cur_idx = txn->hdr_idx.v[old_idx].next)) {
struct hdr_idx_elem *cur_hdr;
@@ -6416,7 +6416,7 @@
last_hdr = 0;
- cur_next = rtr->p + hdr_idx_first_pos(&txn->hdr_idx);
+ cur_next = rtr->buf.p + hdr_idx_first_pos(&txn->hdr_idx);
old_idx = 0;
while (!last_hdr) {
@@ -6524,7 +6524,7 @@
done = 0;
- cur_ptr = rtr->p;
+ cur_ptr = rtr->buf.p;
cur_end = cur_ptr + txn->rsp.sl.st.l;
/* Now we have the status line between cur_ptr and cur_end */
@@ -6570,7 +6570,7 @@
/* we have a full respnse and we know that we have either a CR
* or an LF at <ptr>.
*/
- txn->status = strl2ui(rtr->p + txn->rsp.sl.st.c, txn->rsp.sl.st.c_l);
+ txn->status = strl2ui(rtr->buf.p + txn->rsp.sl.st.c, txn->rsp.sl.st.c_l);
hdr_idx_set_start(&txn->hdr_idx, txn->rsp.sl.st.l, *cur_end == '\r');
/* there is no point trying this regex on headers */
return 1;
@@ -6657,7 +6657,7 @@
* we start with the start line.
*/
old_idx = 0;
- hdr_next = res->p + hdr_idx_first_pos(&txn->hdr_idx);
+ hdr_next = res->buf.p + hdr_idx_first_pos(&txn->hdr_idx);
while ((cur_idx = txn->hdr_idx.v[old_idx].next)) {
struct hdr_idx_elem *cur_hdr;
@@ -7022,7 +7022,7 @@
* we start with the start line.
*/
cur_idx = 0;
- cur_next = rtr->p + hdr_idx_first_pos(&txn->hdr_idx);
+ cur_next = rtr->buf.p + hdr_idx_first_pos(&txn->hdr_idx);
while ((cur_idx = txn->hdr_idx.v[cur_idx].next)) {
struct hdr_idx_elem *cur_hdr;
@@ -7176,7 +7176,7 @@
{
struct uri_auth *uri_auth = backend->uri_auth;
struct http_msg *msg = &txn->req;
- const char *uri = msg->buf->p+ msg->sl.rq.u;
+ const char *uri = msg->buf->buf.p+ msg->sl.rq.u;
const char *h;
if (!uri_auth)
@@ -7252,7 +7252,7 @@
* By default it tries to report the error position as msg->err_pos. However if
* this one is not set, it will then report msg->next, which is the last known
* parsing point. The function is able to deal with wrapping buffers. It always
- * displays buffers as a contiguous area starting at buf->p.
+ * displays buffers as a contiguous area starting at buf->buf.p.
*/
void http_capture_bad_message(struct error_snapshot *es, struct session *s,
struct http_msg *msg,
@@ -7261,14 +7261,14 @@
struct channel *buf = msg->buf;
int len1, len2;
- es->len = MIN(buf->i, sizeof(es->buf));
- len1 = buf->data + buf->size - buf->p;
+ es->len = MIN(buf->buf.i, sizeof(es->buf));
+ len1 = buf->buf.data + buf->buf.size - buf->buf.p;
len1 = MIN(len1, es->len);
len2 = es->len - len1; /* remaining data if buffer wraps */
- memcpy(es->buf, buf->p, len1);
+ memcpy(es->buf, buf->buf.p, len1);
if (len2)
- memcpy(es->buf + len1, buf->data, len2);
+ memcpy(es->buf + len1, buf->buf.data, len2);
if (msg->err_pos >= 0)
es->pos = msg->err_pos;
@@ -7286,8 +7286,8 @@
es->s_flags = s->flags;
es->t_flags = s->txn.flags;
es->m_flags = msg->flags;
- es->b_out = buf->o;
- es->b_wrap = buf->data + buf->size - buf->p;
+ es->b_out = buf->buf.o;
+ es->b_wrap = buf->buf.data + buf->buf.size - buf->buf.p;
es->b_tot = buf->total;
es->m_clen = msg->chunk_len;
es->m_blen = msg->body_len;
@@ -7320,7 +7320,7 @@
if (occ >= 0) {
/* search from the beginning */
- while (http_find_header2(hname, hlen, msg->buf->p, idx, ctx)) {
+ while (http_find_header2(hname, hlen, msg->buf->buf.p, idx, ctx)) {
occ--;
if (occ <= 0) {
*vptr = ctx->line + ctx->val;
@@ -7336,7 +7336,7 @@
return 0;
found = hist_ptr = 0;
- while (http_find_header2(hname, hlen, msg->buf->p, idx, ctx)) {
+ while (http_find_header2(hname, hlen, msg->buf->buf.p, idx, ctx)) {
ptr_hist[hist_ptr] = ctx->line + ctx->val;
len_hist[hist_ptr] = ctx->vlen;
if (++hist_ptr >= MAX_HDR_HISTORY)
@@ -7479,8 +7479,8 @@
* a HEAD with some data, or sending more than the advertised
* content-length.
*/
- if (unlikely(s->rep->i))
- s->rep->i = 0;
+ if (unlikely(s->rep->buf.i))
+ s->rep->buf.i = 0;
s->req->rto = s->fe->timeout.client;
s->req->wto = TICK_ETERNITY;
@@ -7612,7 +7612,7 @@
}
/* Try to decode HTTP request */
- if (likely(msg->next < s->req->i))
+ if (likely(msg->next < s->req->buf.i))
http_msg_analyzer(msg, &txn->hdr_idx);
/* Still no valid request ? */
@@ -7630,7 +7630,7 @@
* preparation to perform so that further checks can rely
* on HTTP tests.
*/
- txn->meth = find_http_meth(msg->buf->p, msg->sl.rq.m_l);
+ txn->meth = find_http_meth(msg->buf->buf.p, msg->sl.rq.m_l);
if (txn->meth == HTTP_METH_GET || txn->meth == HTTP_METH_HEAD)
s->flags |= SN_REDIRECTABLE;
@@ -7712,7 +7712,7 @@
return 0;
smp->type = SMP_T_CSTR;
smp->data.str.len = txn->req.sl.rq.m_l;
- smp->data.str.str = txn->req.buf->p;
+ smp->data.str.str = txn->req.buf->buf.p;
}
smp->flags = SMP_F_VOL_1ST;
return 1;
@@ -7772,7 +7772,7 @@
CHECK_HTTP_MESSAGE_FIRST();
len = txn->req.sl.rq.v_l;
- ptr = txn->req.buf->p + txn->req.sl.rq.v;
+ ptr = txn->req.buf->buf.p + txn->req.sl.rq.v;
while ((len-- > 0) && (*ptr++ != '/'));
if (len <= 0)
@@ -7797,7 +7797,7 @@
CHECK_HTTP_MESSAGE_FIRST();
len = txn->rsp.sl.st.v_l;
- ptr = txn->rsp.buf->p;
+ ptr = txn->rsp.buf->buf.p;
while ((len-- > 0) && (*ptr++ != '/'));
if (len <= 0)
@@ -7823,7 +7823,7 @@
CHECK_HTTP_MESSAGE_FIRST();
len = txn->rsp.sl.st.c_l;
- ptr = txn->rsp.buf->p + txn->rsp.sl.st.c;
+ ptr = txn->rsp.buf->buf.p + txn->rsp.sl.st.c;
smp->type = SMP_T_UINT;
smp->data.uint = __strl2ui(ptr, len);
@@ -7842,7 +7842,7 @@
smp->type = SMP_T_CSTR;
smp->data.str.len = txn->req.sl.rq.u_l;
- smp->data.str.str = txn->req.buf->p + txn->req.sl.rq.u;
+ smp->data.str.str = txn->req.buf->buf.p + txn->req.sl.rq.u;
smp->flags = SMP_F_VOL_1ST;
return 1;
}
@@ -7856,7 +7856,7 @@
CHECK_HTTP_MESSAGE_FIRST();
/* Parse HTTP request */
- url2sa(txn->req.buf->p + txn->req.sl.rq.u, txn->req.sl.rq.u_l, &l4->req->cons->addr.to);
+ url2sa(txn->req.buf->buf.p + txn->req.sl.rq.u, txn->req.sl.rq.u_l, &l4->req->cons->addr.to);
if (((struct sockaddr_in *)&l4->req->cons->addr.to)->sin_family != AF_INET)
return 0;
smp->type = SMP_T_IPV4;
@@ -7882,7 +7882,7 @@
CHECK_HTTP_MESSAGE_FIRST();
/* Same optimization as url_ip */
- url2sa(txn->req.buf->p + txn->req.sl.rq.u, txn->req.sl.rq.u_l, &l4->req->cons->addr.to);
+ url2sa(txn->req.buf->buf.p + txn->req.sl.rq.u, txn->req.sl.rq.u_l, &l4->req->cons->addr.to);
smp->type = SMP_T_UINT;
smp->data.uint = ntohs(((struct sockaddr_in *)&l4->req->cons->addr.to)->sin_port);
@@ -7964,7 +7964,7 @@
ctx.idx = 0;
cnt = 0;
- while (http_find_header2(args->data.str.str, args->data.str.len, msg->buf->p, idx, &ctx))
+ while (http_find_header2(args->data.str.str, args->data.str.len, msg->buf->buf.p, idx, &ctx))
cnt++;
smp->type = SMP_T_UINT;
@@ -8025,7 +8025,7 @@
CHECK_HTTP_MESSAGE_FIRST();
- end = txn->req.buf->p + txn->req.sl.rq.u + txn->req.sl.rq.u_l;
+ end = txn->req.buf->buf.p + txn->req.sl.rq.u + txn->req.sl.rq.u_l;
ptr = http_get_path(txn);
if (!ptr)
return 0;
@@ -8059,7 +8059,7 @@
CHECK_HTTP_MESSAGE_FIRST();
ctx.idx = 0;
- if (!http_find_header2("Host", 4, txn->req.buf->p + txn->req.sol, &txn->hdr_idx, &ctx) ||
+ if (!http_find_header2("Host", 4, txn->req.buf->buf.p + txn->req.sol, &txn->hdr_idx, &ctx) ||
!ctx.vlen)
return smp_fetch_path(px, l4, l7, opt, args, smp);
@@ -8070,7 +8070,7 @@
smp->data.str.len = ctx.vlen;
/* now retrieve the path */
- end = txn->req.buf->p + txn->req.sol + txn->req.sl.rq.u + txn->req.sl.rq.u_l;
+ end = txn->req.buf->buf.p + txn->req.sol + txn->req.sl.rq.u + txn->req.sl.rq.u_l;
beg = http_get_path(txn);
if (!beg)
beg = end;
@@ -8306,7 +8306,7 @@
* next one.
*/
- sol = msg->buf->p;
+ sol = msg->buf->buf.p;
if (!(smp->flags & SMP_F_NOT_LAST)) {
/* search for the header from the beginning, we must first initialize
* the search parameters.
@@ -8388,7 +8388,7 @@
hdr_name_len = 10;
}
- sol = msg->buf->p;
+ sol = msg->buf->buf.p;
val_end = val_beg = NULL;
ctx.idx = 0;
cnt = 0;
@@ -8539,7 +8539,7 @@
CHECK_HTTP_MESSAGE_FIRST();
- if (!find_url_param_value(msg->buf->p + msg->sl.rq.u, msg->sl.rq.u_l,
+ if (!find_url_param_value(msg->buf->buf.p + msg->sl.rq.u, msg->sl.rq.u_l,
args->data.str.str, args->data.str.len,
&smp->data.str.str, &smp->data.str.len))
return 0;
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 57339c6..be246e1 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -411,7 +411,7 @@
* machine with the first ACK. We only do this if there are pending
* data in the buffer.
*/
- if ((be->options2 & PR_O2_SMARTCON) && si->ob->o)
+ if ((be->options2 & PR_O2_SMARTCON) && si->ob->buf.o)
setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, &zero, sizeof(zero));
#endif
@@ -1403,11 +1403,11 @@
smp->flags = 0;
smp->type = SMP_T_CSTR;
- bleft = l4->req->i;
+ bleft = l4->req->buf.i;
if (bleft <= 11)
goto too_short;
- data = (const unsigned char *)l4->req->p + 11;
+ data = (const unsigned char *)l4->req->buf.p + 11;
bleft -= 11;
if (bleft <= 7)
@@ -1598,11 +1598,11 @@
if (!b)
return 0;
- if (len_offset + len_size > b->i)
+ if (len_offset + len_size > b->buf.i)
goto too_short;
for (i = 0; i < len_size; i++) {
- buf_size = (buf_size << 8) + ((unsigned char *)b->p)[i + len_offset];
+ buf_size = (buf_size << 8) + ((unsigned char *)b->buf.p)[i + len_offset];
}
/* buf offset may be implicit, absolute or relative */
@@ -1612,18 +1612,18 @@
else if (arg_p[2].type == ARGT_SINT)
buf_offset += arg_p[2].data.sint;
- if (!buf_size || buf_size > b->size || buf_offset + buf_size > b->size) {
+ if (!buf_size || buf_size > b->buf.size || buf_offset + buf_size > b->buf.size) {
/* will never match */
smp->flags = 0;
return 0;
}
- if (buf_offset + buf_size > b->i)
+ if (buf_offset + buf_size > b->buf.i)
goto too_short;
/* init chunk as read only */
smp->type = SMP_T_CBIN;
- chunk_initlen(&smp->data.str, b->p + buf_offset, 0, buf_size);
+ chunk_initlen(&smp->data.str, b->buf.p + buf_offset, 0, buf_size);
smp->flags = SMP_F_VOLATILE;
return 1;
@@ -1648,18 +1648,18 @@
if (!b)
return 0;
- if (!buf_size || buf_size > b->size || buf_offset + buf_size > b->size) {
+ if (!buf_size || buf_size > b->buf.size || buf_offset + buf_size > b->buf.size) {
/* will never match */
smp->flags = 0;
return 0;
}
- if (buf_offset + buf_size > b->i)
+ if (buf_offset + buf_size > b->buf.i)
goto too_short;
/* init chunk as read only */
smp->type = SMP_T_CBIN;
- chunk_initlen(&smp->data.str, b->p + buf_offset, 0, buf_size);
+ chunk_initlen(&smp->data.str, b->buf.p + buf_offset, 0, buf_size);
smp->flags = SMP_F_VOLATILE;
return 1;
diff --git a/src/session.c b/src/session.c
index 3984104..fa5efae 100644
--- a/src/session.c
+++ b/src/session.c
@@ -225,7 +225,7 @@
goto out_free_req; /* no memory */
/* initialize the request buffer */
- s->req->size = global.tune.bufsize;
+ s->req->buf.size = global.tune.bufsize;
buffer_init(s->req);
s->req->prod = &s->si[0];
s->req->cons = &s->si[1];
@@ -242,7 +242,7 @@
s->req->analyse_exp = TICK_ETERNITY;
/* initialize response buffer */
- s->rep->size = global.tune.bufsize;
+ s->rep->buf.size = global.tune.bufsize;
buffer_init(s->rep);
s->rep->prod = &s->si[1];
s->rep->cons = &s->si[0];
diff --git a/src/sock_raw.c b/src/sock_raw.c
index 272935a..96debe9 100644
--- a/src/sock_raw.c
+++ b/src/sock_raw.c
@@ -88,7 +88,7 @@
if (!(b->flags & BF_KERN_SPLICING))
return -1;
- if (buffer_not_empty(b)) {
+ if (buffer_not_empty(&b->buf)) {
/* We're embarrassed, there are already data pending in
* the buffer and we don't want to have them at two
* locations at a time. Let's indicate we need some
@@ -273,25 +273,25 @@
/*
* 1. compute the maximum block size we can read at once.
*/
- if (buffer_empty(b)) {
+ if (buffer_empty(&b->buf)) {
/* let's realign the buffer to optimize I/O */
- b->p = b->data;
+ b->buf.p = b->buf.data;
}
- else if (b->data + b->o < b->p &&
- b->p + b->i < b->data + b->size) {
+ else if (b->buf.data + b->buf.o < b->buf.p &&
+ b->buf.p + b->buf.i < b->buf.data + b->buf.size) {
/* remaining space wraps at the end, with a moving limit */
- if (max > b->data + b->size - (b->p + b->i))
- max = b->data + b->size - (b->p + b->i);
+ if (max > b->buf.data + b->buf.size - (b->buf.p + b->buf.i))
+ max = b->buf.data + b->buf.size - (b->buf.p + b->buf.i);
}
/* else max is already OK */
/*
* 2. read the largest possible block
*/
- ret = recv(fd, bi_end(b), max, 0);
+ ret = recv(fd, bi_end(&b->buf), max, 0);
if (ret > 0) {
- b->i += ret;
+ b->buf.i += ret;
cur_read += ret;
/* if we're allowed to directly forward data, we must update ->o */
@@ -317,7 +317,7 @@
/* The buffer is now full, there's no point in going through
* the loop again.
*/
- if (!(b->flags & BF_STREAMER_FAST) && (cur_read == buffer_len(b))) {
+ if (!(b->flags & BF_STREAMER_FAST) && (cur_read == buffer_len(&b->buf))) {
b->xfer_small = 0;
b->xfer_large++;
if (b->xfer_large >= 3) {
@@ -329,7 +329,7 @@
}
}
else if ((b->flags & (BF_STREAMER | BF_STREAMER_FAST)) &&
- (cur_read <= b->size / 2)) {
+ (cur_read <= b->buf.size / 2)) {
b->xfer_large = 0;
b->xfer_small++;
if (b->xfer_small >= 2) {
@@ -359,7 +359,7 @@
*/
if (ret < max) {
if ((b->flags & (BF_STREAMER | BF_STREAMER_FAST)) &&
- (cur_read <= b->size / 2)) {
+ (cur_read <= b->buf.size / 2)) {
b->xfer_large = 0;
b->xfer_small++;
if (b->xfer_small >= 3) {
@@ -492,7 +492,7 @@
* in the normal buffer.
*/
#endif
- if (!b->o) {
+ if (!b->buf.o) {
b->flags |= BF_OUT_EMPTY;
return 0;
}
@@ -501,11 +501,11 @@
* data left, and that there are sendable buffered data.
*/
while (1) {
- max = b->o;
+ max = b->buf.o;
/* outgoing data may wrap at the end */
- if (b->data + max > b->p)
- max = b->data + max - b->p;
+ if (b->buf.data + max > b->buf.p)
+ max = b->buf.data + max - b->buf.p;
/* check if we want to inform the kernel that we're interested in
* sending more data after this call. We want this if :
@@ -524,8 +524,8 @@
if ((!(b->flags & BF_NEVER_WAIT) &&
((b->to_forward && b->to_forward != BUF_INFINITE_FORWARD) ||
(b->flags & BF_EXPECT_MORE))) ||
- ((b->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_HIJACK)) == BF_SHUTW_NOW && (max == b->o)) ||
- (max != b->o)) {
+ ((b->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_HIJACK)) == BF_SHUTW_NOW && (max == b->buf.o)) ||
+ (max != b->buf.o)) {
send_flag |= MSG_MORE;
}
@@ -533,7 +533,7 @@
if (b->flags & BF_SEND_DONTWAIT)
send_flag &= ~MSG_MORE;
- ret = send(si_fd(si), bo_ptr(b), max, send_flag);
+ ret = send(si_fd(si), bo_ptr(&b->buf), max, send_flag);
} else {
int skerr;
socklen_t lskerr = sizeof(skerr);
@@ -542,7 +542,7 @@
if (ret == -1 || skerr)
ret = -1;
else
- ret = send(si_fd(si), bo_ptr(b), max, MSG_DONTWAIT);
+ ret = send(si_fd(si), bo_ptr(&b->buf), max, MSG_DONTWAIT);
}
if (ret > 0) {
@@ -553,15 +553,15 @@
b->flags |= BF_WRITE_PARTIAL;
- b->o -= ret;
- if (likely(!buffer_len(b)))
+ b->buf.o -= ret;
+ if (likely(!buffer_len(&b->buf)))
/* optimize data alignment in the buffer */
- b->p = b->data;
+ b->buf.p = b->buf.data;
if (likely(!bi_full(b)))
b->flags &= ~BF_FULL;
- if (!b->o) {
+ if (!b->buf.o) {
/* Always clear both flags once everything has been sent, they're one-shot */
b->flags &= ~(BF_EXPECT_MORE | BF_SEND_DONTWAIT);
if (likely(!b->pipe))
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 08560a9..bdbf2e7 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -614,7 +614,7 @@
*/
if (((si->ib->flags & (BF_READ_PARTIAL|BF_OUT_EMPTY)) == BF_READ_PARTIAL) &&
(si->ib->pipe /* always try to send spliced data */ ||
- (si->ib->i == 0 && (si->ib->cons->flags & SI_FL_WAIT_DATA)))) {
+ (si->ib->buf.i == 0 && (si->ib->cons->flags & SI_FL_WAIT_DATA)))) {
int last_len = si->ib->pipe ? si->ib->pipe->data : 0;
si_chk_snd(si->ib->cons);