Don't treat packets coming in via TCP as having zero length.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index ac93775..29dd824 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -85,6 +85,13 @@ bool receive_meta(connection_t *c) {
           - If not, keep stuff in buffer and exit.
         */
 
+       buffer_compact(&c->inbuf, MAXBUFSIZE);
+
+       if(sizeof inbuf <= c->inbuf.len) {
+               logger(LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
+               return false;
+       }
+
        inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
 
        if(inlen <= 0) {
@@ -131,6 +138,7 @@ bool receive_meta(connection_t *c) {
                                char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
                                if(tcpbuffer) {
                                        receive_tcppacket(c, tcpbuffer, c->tcplen);
+                                       c->tcplen = 0;
                                        continue;
                                } else {
                                        break;
@@ -151,7 +159,5 @@ bool receive_meta(connection_t *c) {
                }
        } while(inlen);
 
-       buffer_compact(&c->inbuf);
-
        return true;
 }