Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 5735da7e8d1b60f180d7174c97030f444c8442e7..29dd824042754358bba1a0efaec4698b782e70b1 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -88,7 +88,7 @@ bool receive_meta(connection_t *c) {
        buffer_compact(&c->inbuf, MAXBUFSIZE);
 
        if(sizeof inbuf <= c->inbuf.len) {
-               logger(LOG_ERR, "Input buffer full for %s (%s)\n", c, c->hostname);
+               logger(LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
                return false;
        }
 
@@ -138,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;