From: Willy Tarreau <w@1wt.eu>
Date: Fri, 15 Jun 2018 12:20:26 +0000 (+0200)
Subject: MINOR: buffer: replace bo_getblk() with direction agnostic b_getblk()
X-Git-Tag: v1.9-dev1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ed3836db053d674f488d6860aa95d3bae22820;p=thirdparty%2Fhaproxy.git

MINOR: buffer: replace bo_getblk() with direction agnostic b_getblk()

This new functoin limits itself to the amount of data available in the
buffer and doesn't care about the direction anymore. It's only called
from co_getblk() which already checks that no more than the available
output bytes is requested.
---

diff --git a/include/common/buf.h b/include/common/buf.h
index 33830f7097..ad2e2ba0d0 100644
--- a/include/common/buf.h
+++ b/include/common/buf.h
@@ -311,6 +311,38 @@ static inline size_t b_contig_space(const struct buffer *b)
 	return right - left;
 }
 
+/* b_getblk() : gets one full block of data at once from a buffer, starting
+ * from offset <offset> after the buffer's head, and limited to no more than
+ * <len> bytes. The caller is responsible for ensuring that neither <offset>
+ * nor <offset>+<len> exceed the total number of bytes available in the buffer.
+ * Return values :
+ *   >0 : number of bytes read, equal to requested size.
+ *   =0 : not enough data available. <blk> is left undefined.
+ * The buffer is left unaffected.
+ */
+static inline size_t b_getblk(const struct buffer *buf, char *blk, size_t len, size_t offset)
+{
+	size_t firstblock;
+
+	if (len + offset > b_data(buf))
+		return 0;
+
+	firstblock = b_wrap(buf) - b_head(buf);
+	if (firstblock > offset) {
+		if (firstblock >= len + offset) {
+			memcpy(blk, b_head(buf) + offset, len);
+			return len;
+		}
+
+		memcpy(blk, b_head(buf) + offset, firstblock - offset);
+		memcpy(blk + firstblock - offset, b_orig(buf), len - firstblock + offset);
+		return len;
+	}
+
+	memcpy(blk, b_orig(buf) + offset - firstblock, len);
+	return len;
+}
+
 
 /*********************************************/
 /* Functions used to modify the buffer state */
diff --git a/include/common/buffer.h b/include/common/buffer.h
index 10ff640b50..896e050628 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -326,35 +326,6 @@ static inline int bo_putchk(struct buffer *b, const struct chunk *chk)
 	return bo_putblk(b, chk->str, chk->len);
 }
 
-/* Gets one full block of data at once from a buffer's output, optionally
- * starting at a specific offset. Return values :
- *   >0 : number of bytes read, equal to requested size.
- *   =0 : not enough data available. <blk> is left undefined.
- * The buffer is left unaffected.
- */
-static inline int bo_getblk(const struct buffer *buf, char *blk, int len, int offset)
-{
-	int firstblock;
-
-	if (len + offset > buf->o)
-		return 0;
-
-	firstblock = buf->data + buf->size - b_head(buf);
-	if (firstblock > offset) {
-		if (firstblock >= len + offset) {
-			memcpy(blk, b_head(buf) + offset, len);
-			return len;
-		}
-
-		memcpy(blk, b_head(buf) + offset, firstblock - offset);
-		memcpy(blk + firstblock - offset, buf->data, len - firstblock + offset);
-		return len;
-	}
-
-	memcpy(blk, buf->data + offset - firstblock, len);
-	return len;
-}
-
 /* Gets one or two blocks of data at once from a buffer's output.
  * Return values :
  *   >0 : number of blocks filled (1 or 2). blk1 is always filled before blk2.
diff --git a/src/channel.c b/src/channel.c
index fc1bf1279e..42514179b2 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -295,13 +295,13 @@ int co_getblk(const struct channel *chn, char *blk, int len, int offset)
 	if (chn->flags & CF_SHUTW)
 		return -1;
 
-	if (len + offset > chn->buf->o) {
+	if (len + offset > co_data(chn)) {
 		if (chn->flags & (CF_SHUTW|CF_SHUTW_NOW))
 			return -1;
 		return 0;
 	}
 
-	return bo_getblk(chn->buf, blk, len, offset);
+	return b_getblk(chn->buf, blk, len, offset);
 }
 
 /* Gets one or two blocks of data at once from a channel's output buffer.