MAJOR: buffers: replace buf->w with buf->p - buf->o
This change introduces the buffer's base pointer, which is the limit between
incoming and outgoing data. It's the point where the parsing should start
from. A number of computations have already been greatly simplified, but
more simplifications are expected to come from the removal of buf->r.
The changes appear good and have revealed occasional improper use of some
pointers. It is possible that this patch has introduced bugs or revealed
some, although preliminary testings tend to indicate that everything still
works as it should.
diff --git a/src/acl.c b/src/acl.c
index 430f985..507516f 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -123,7 +123,7 @@
b = ((dir & ACL_DIR_MASK) == ACL_DIR_RTR) ? l4->rep : l4->req;
bleft = b->i;
- data = (const unsigned char *)b->w;
+ data = (const unsigned char *)b->p;
if (!bleft)
goto too_short;
@@ -191,7 +191,7 @@
if (!bleft)
goto too_short;
- data = (const unsigned char *)l4->req->w;
+ data = (const unsigned char *)l4->req->p;
if ((*data >= 0x14 && *data <= 0x17) || (*data == 0xFF)) {
/* SSLv3 header format */
if (bleft < 5)
@@ -259,8 +259,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->w)
- msg_len = buffer_max_len(l4->req) + l4->req->data - l4->req->w;
+ 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 (bleft < msg_len)
goto too_short;
@@ -325,7 +325,7 @@
b = ((dir & ACL_DIR_MASK) == ACL_DIR_RTR) ? l4->rep : l4->req;
bleft = b->i;
- data = (unsigned char *)b->w;
+ data = (unsigned char *)b->p;
/* Check for SSL/TLS Handshake */
if (!bleft)
@@ -463,7 +463,7 @@
if (bleft <= 11)
goto too_short;
- data = (const unsigned char *)l4->req->w + 11;
+ data = (const unsigned char *)l4->req->p + 11;
bleft -= 11;
if (bleft <= 7)