Only read one record at a time in sptps_receive_data().

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index fbd3e26..0849d3c 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2006      Scott Lamb <slamb@slamb.org>
 
@@ -30,7 +30,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) {
+bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
        connection_t *c = handle;
 
        if(!c) {
@@ -58,6 +58,9 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 
        /* Add our data to buffer */
        if(c->status.encryptout) {
+#ifdef DISABLE_LEGACY
+               return false;
+#else
                size_t outlen = length;
 
                if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
@@ -65,6 +68,7 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
                                        c->name, c->hostname);
                        return false;
                }
+#endif
        } else {
                buffer_add(&c->outbuf, buffer, length);
        }
@@ -80,7 +84,8 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
                        send_meta(c, buffer, length);
 }
 
-bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
+bool receive_meta_sptps(void *handle, uint8_t type, const void *vdata, uint16_t length) {
+       const char *data = vdata;
        connection_t *c = handle;
 
        if(!c) {
@@ -154,8 +159,14 @@ bool receive_meta(connection_t *c) {
        }
 
        do {
-               if(c->protocol_minor >= 2)
-                       return sptps_receive_data(&c->sptps, bufp, inlen);
+               if(c->protocol_minor >= 2) {
+                       int len = sptps_receive_data(&c->sptps, bufp, inlen);
+                       if(!len)
+                               return false;
+                       bufp += len;
+                       inlen -= len;
+                       continue;
+               }
 
                if(!c->status.decryptin) {
                        endp = memchr(bufp, '\n', inlen);
@@ -169,6 +180,9 @@ bool receive_meta(connection_t *c) {
                        inlen -= endp - bufp;
                        bufp = endp;
                } else {
+#ifdef DISABLE_LEGACY
+                       return false;
+#else
                        size_t outlen = inlen;
 
                        if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
@@ -178,6 +192,7 @@ bool receive_meta(connection_t *c) {
                        }
 
                        inlen = 0;
+#endif
                }
 
                while(c->inbuf.len) {