Compact input buffer before trying to read instead of after.
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 22 May 2011 10:56:51 +0000 (12:56 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 22 May 2011 11:20:44 +0000 (13:20 +0200)
Also log an error when the input buffer contains more than MAXBUFSIZE bytes
already, instead of silently claiming the other side closed the connection.

src/meta.c

index ac93775..cf6b9d4 100644 (file)
@@ -85,6 +85,13 @@ bool receive_meta(connection_t *c) {
           - If not, keep stuff in buffer and exit.
         */
 
           - If not, keep stuff in buffer and exit.
         */
 
+       buffer_compact(&c->inbuf);
+
+       if(sizeof inbuf <= c->inbuf.len) {
+               logger(LOG_ERR, "Input buffer full for %s (%s)\n");
+               return false;
+       }
+
        inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
 
        if(inlen <= 0) {
        inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
 
        if(inlen <= 0) {
@@ -151,7 +158,5 @@ bool receive_meta(connection_t *c) {
                }
        } while(inlen);
 
                }
        } while(inlen);
 
-       buffer_compact(&c->inbuf);
-
        return true;
 }
        return true;
 }