Add stricter checks for netnames.

[tinc] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index fc4fac0..ac57d1c 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -22,6 +22,14 @@
 #include "buffer.h"
 #include "xalloc.h"
 
+void buffer_compact(buffer_t *buffer, int 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) {
@@ -41,13 +49,16 @@ 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, int size) {
        memcpy(buffer_prepare(buffer, size), data, 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;
@@ -76,7 +85,7 @@ char *buffer_readline(buffer_t *buffer) {
        if(!newline)
                return NULL;
 
-       int len = newline + 1 - buffer->data + buffer->offset;
+       int len = newline + 1 - (buffer->data + buffer->offset);
        *newline = 0;
        return buffer_consume(buffer, len);
 }
@@ -92,7 +101,7 @@ char *buffer_read(buffer_t *buffer, int 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;