X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fbuffer.c;h=60adec862580ed6d7ef8c7e8790cdc5641d8f3ef;hb=e62fd508158749a0d55eae06c2e361df5d6da6e0;hp=fc4fac0f3629570f3097d65c54337db857b56f8e;hpb=f431fcb35f400be388a905ae0f7f50c1f5c4cd5d;p=tinc

diff --git a/src/buffer.c b/src/buffer.c
index fc4fac0f..60adec86 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -22,9 +22,17 @@
 #include "buffer.h"
 #include "xalloc.h"
 
+void buffer_compact(buffer_t *buffer, uint32_t maxsize) {
+	if(buffer->len >= maxsize || buffer->offset / 7 > buffer->len / 8) {
+		memmove(buffer->data, buffer->data + buffer->offset, buffer->len - buffer->offset);
+		buffer->len -= buffer->offset;
+		buffer->offset = 0;
+	}
+}
+
 // Make sure we can add size bytes to the buffer, and return a pointer to the start of those bytes.
 
-char *buffer_prepare(buffer_t *buffer, int size) {
+char *buffer_prepare(buffer_t *buffer, uint32_t size) {
 	if(!buffer->data) {
 		buffer->maxlen = size;
 		buffer->data = xmalloc(size);
@@ -41,19 +49,22 @@ char *buffer_prepare(buffer_t *buffer, int size) {
 		}
 	}
 
+	char *start = buffer->data + buffer->len;
+
 	buffer->len += size;
-	return buffer->data + buffer->offset;
+
+	return start;
 }
 
 // Copy data into the buffer.
-			
-char *buffer_add(buffer_t *buffer, const char *data, int size) {
+
+void buffer_add(buffer_t *buffer, const char *data, uint32_t size) {
 	memcpy(buffer_prepare(buffer, size), data, size);
 }
 
 // Remove given number of bytes from the buffer, return a pointer to the start of them.
 
-static char *buffer_consume(buffer_t *buffer, int size) {
+static char *buffer_consume(buffer_t *buffer, uint32_t size) {
 	char *start = buffer->data + buffer->offset;
 
 	buffer->offset += size;
@@ -61,8 +72,6 @@ static char *buffer_consume(buffer_t *buffer, int size) {
 	if(buffer->offset >= buffer->len) {
 		buffer->offset = 0;
 		buffer->len = 0;
-	} else {
-		buffer->offset += size;
 	}
 
 	return start;
@@ -73,26 +82,28 @@ static char *buffer_consume(buffer_t *buffer, int size) {
 char *buffer_readline(buffer_t *buffer) {
 	char *newline = memchr(buffer->data + buffer->offset, '\n', buffer->len - buffer->offset);
 
-	if(!newline)
+	if(!newline) {
 		return NULL;
+	}
 
-	int len = newline + 1 - buffer->data + buffer->offset;
+	uint32_t len = newline + 1 - (buffer->data + buffer->offset);
 	*newline = 0;
 	return buffer_consume(buffer, len);
 }
 
 // Check if we have enough bytes in the buffer, and if so, return a pointer to the start of them.
 
-char *buffer_read(buffer_t *buffer, int size) {
-	if(buffer->len - buffer->offset < size)
+char *buffer_read(buffer_t *buffer, uint32_t size) {
+	if(buffer->len - buffer->offset < size) {
 		return NULL;
+	}
 
 	return buffer_consume(buffer, size);
 }
 
 void buffer_clear(buffer_t *buffer) {
 	free(buffer->data);
-	buffer->data = 0;
+	buffer->data = NULL;
 	buffer->maxlen = 0;
 	buffer->len = 0;
 	buffer->offset = 0;