Several fixes for the buffer code.

diff --git a/src/buffer.c b/src/buffer.c
index fc4fac0f3629570f3097d65c54337db857b56f8e..72888b508e405d5d4774844e2b3663ec0f2f76f3 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) {
+       if(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,8 +49,11 @@ 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.
@@ -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);
 }

diff --git a/src/buffer.h b/src/buffer.h
index 4d6f672611501659d4b0663cf2de4d8e43418786..db22ac4fc2f1b24b0437f43d29f6d3b384873505 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -8,6 +8,7 @@ typedef struct buffer_t {
        int offset;
 } buffer_t;
 
+extern void buffer_compact(buffer_t *buffer);
 extern char *buffer_prepare(buffer_t *buffer, int size);
 extern char *buffer_add(buffer_t *buffer, const char *data, int size);
 extern char *buffer_readline(buffer_t *buffer);

diff --git a/src/meta.c b/src/meta.c
index 726dcca924ca5dcf692bfaa2acd2b9dc4df38bd2..1fbd22c29c26e90ccc11a85337598d6413c5f4f3 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -42,10 +42,9 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 
        /* Add our data to buffer */
        if(c->status.encryptout) {
-               char outbuf[length];
                size_t outlen = length;
 
-               if(!cipher_encrypt(&c->outcipher, outbuf, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
+               if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
                        logger(LOG_ERR, "Error while encrypting metadata to %s (%s)",
                                        c->name, c->hostname);
                        return false;
@@ -152,5 +151,7 @@ bool receive_meta(connection_t *c) {
                }
        } while(inlen);
 
+       buffer_compact(&c->inbuf);
+
        return true;
 }