Always compact the buffer if it has reached MAXBUFSIZE.

diff --git a/src/buffer.c b/src/buffer.c
index 249e3e0f1c9634e08efccdce2a4e28178cf15a45..315faf18e66f9dbec8e19ee4606b3d67ed984686 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -22,8 +22,8 @@
 #include "buffer.h"
 #include "xalloc.h"
 
-void buffer_compact(buffer_t *buffer) {
-       if(buffer->offset / 7 > buffer->len / 8) {
+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;

diff --git a/src/buffer.h b/src/buffer.h
index 73c1f69e407493112f8a445dc2802d20782638be..a96c15aa7a89e00e9f6088e5cc573869c25729fb 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -8,7 +8,7 @@ typedef struct buffer_t {
        int offset;
 } buffer_t;
 
-extern void buffer_compact(buffer_t *buffer);
+extern void buffer_compact(buffer_t *buffer, int maxsize);
 extern char *buffer_prepare(buffer_t *buffer, int size);
 extern void 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 cf6b9d446d82067ee3739afdbecd25bce1247313..5735da7e8d1b60f180d7174c97030f444c8442e7 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -85,10 +85,10 @@ bool receive_meta(connection_t *c) {
           - If not, keep stuff in buffer and exit.
         */
 
-       buffer_compact(&c->inbuf);
+       buffer_compact(&c->inbuf, MAXBUFSIZE);
 
        if(sizeof inbuf <= c->inbuf.len) {
-               logger(LOG_ERR, "Input buffer full for %s (%s)\n");
+               logger(LOG_ERR, "Input buffer full for %s (%s)\n", c, c->hostname);
                return false;
        }