]> git.meshlink.io Git - meshlink/blobdiff - src/meta.c
Avoid allocating packet buffers unnecessarily.
[meshlink] / src / meta.c
index 77203f60c62f7209f7311ec30921b72aaec4265d..f3ab47f10be486767446de93ea0399ffb32bbc43 100644 (file)
@@ -1,7 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>,
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
 #include "connection.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta(connection_t *c, const char *buffer, int length)
-{
-       int outlen;
-       int result;
+bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+       (void)type;
 
-       cp();
+       assert(handle);
+       assert(buffer);
+       assert(length);
 
-       ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
-                          c->name, c->hostname);
+       connection_t *c = handle;
+       meshlink_handle_t *mesh = c->mesh;
 
-       if(!c->outbuflen)
-               c->last_flushed_time = now;
+       buffer_add(&c->outbuf, (const char *)buffer, length);
+       io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
 
-       /* Find room in connection's buffer */
-       if(length + c->outbuflen > c->outbufsize) {
-               c->outbufsize = length + c->outbuflen;
-               c->outbuf = xrealloc(c->outbuf, c->outbufsize);
-       }
+       return true;
+}
 
-       if(length + c->outbuflen + c->outbufstart > c->outbufsize) {
-               memmove(c->outbuf, c->outbuf + c->outbufstart, c->outbuflen);
-               c->outbufstart = 0;
-       }
+bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int length) {
+       assert(c);
+       assert(buffer);
+       assert(length);
 
-       /* Add our data to buffer */
-       if(c->status.encryptout) {
-               result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
-                               &outlen, (unsigned char *)buffer, length);
-               if(!result || outlen < length) {
-                       logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"),
-                                       c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
-                       return false;
-               } else if(outlen > length) {
-                       logger(LOG_EMERG, _("Encrypted data too long! Heap corrupted!"));
-                       abort();
-               }
-               c->outbuflen += outlen;
-       } else {
-               memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length);
-               c->outbuflen += length;
+       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name);
+
+       if(c->allow_request == ID) {
+               buffer_add(&c->outbuf, buffer, length);
+               io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
+               return true;
        }
 
-       return true;
+       return sptps_send_record(&c->sptps, 0, buffer, length);
 }
 
-bool flush_meta(connection_t *c)
-{
-       int result;
-       
-       ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
-                        c->outbuflen, c->name, c->hostname);
-
-       while(c->outbuflen) {
-               result = send(c->socket, c->outbuf + c->outbufstart, c->outbuflen, 0);
-               if(result <= 0) {
-                       if(!errno || errno == EPIPE) {
-                               ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
-                                                  c->name, c->hostname);
-                       } else if(errno == EINTR) {
-                               continue;
-                       } else if(errno == EWOULDBLOCK) {
-                               ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s) would block"),
-                                               c->outbuflen, c->name, c->hostname);
-                               return true;
-                       } else {
-                               logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
-                                          c->hostname, strerror(errno));
-                       }
+void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buffer, int length) {
+       assert(buffer);
+       assert(length);
 
-                       return false;
+       for list_each(connection_t, c, mesh->connections)
+               if(c != from && c->status.active) {
+                       send_meta(mesh, c, buffer, length);
                }
+}
 
-               c->outbufstart += result;
-               c->outbuflen -= result;
-       }
+void broadcast_submesh_meta(meshlink_handle_t *mesh, connection_t *from, submesh_t *s, const char *buffer, int length) {
+       assert(buffer);
+       assert(length);
 
-       c->outbufstart = 0; /* avoid unnecessary memmoves */
-       return true;
+       for list_each(connection_t, c, mesh->connections)
+               if(c != from && c->status.active) {
+                       if(c->node && submesh_allows_node(s, c->node)) {
+                               send_meta(mesh, c, buffer, length);
+                       }
+               }
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length)
-{
-       avl_node_t *node;
-       connection_t *c;
+bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) {
+       assert(handle);
+       assert(!length || data);
 
-       cp();
+       connection_t *c = handle;
+       meshlink_handle_t *mesh = c->mesh;
+       char *request = (char *)data;
 
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
+       if(!c) {
+               logger(mesh, MESHLINK_ERROR, "receive_meta_sptps() called with NULL pointer!");
+               abort();
+       }
 
-               if(c != from && c->status.active)
-                       send_meta(c, buffer, length);
+       if(type == SPTPS_HANDSHAKE) {
+               if(c->allow_request == ACK) {
+                       return send_ack(mesh, c);
+               } else {
+                       return true;
+               }
        }
-}
 
-bool receive_meta(connection_t *c)
-{
-       int oldlen, i, result;
-       int lenin, lenout, reqlen;
-       bool decrypted = false;
-       char inbuf[MAXBUFSIZE];
+       if(!request) {
+               return true;
+       }
+
+       /* Are we receiving a TCPpacket? */
 
-       cp();
+       if(c->tcplen) {
+               abort(); // TODO: get rid of tcplen altogether
+       }
+
+       /* Change newline to null byte, just like non-SPTPS requests */
+
+       if(request[length - 1] == '\n') {
+               request[length - 1] = 0;
+       }
+
+       /* Otherwise we are waiting for a request */
+
+       return receive_request(mesh, c, request);
+}
 
-       /* Strategy:
-          - Read as much as possible from the TCP socket in one go.
-          - Decrypt it.
-          - Check if a full request is in the input buffer.
-          - If yes, process request and remove it from the buffer,
-          then check again.
-          - If not, keep stuff in buffer and exit.
-        */
+bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
+       int inlen;
+       char inbuf[MAXBUFSIZE];
 
-       lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
+       inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
 
-       if(lenin <= 0) {
-               if(!lenin || !errno) {
-                       ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
-                                          c->name, c->hostname);
-               } else if(errno == EINTR)
+       if(inlen <= 0) {
+               if(!inlen || !errno) {
+                       logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
+               } else if(sockwouldblock(sockerrno)) {
                        return true;
-               else
-                       logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
-                                  c->name, c->hostname, strerror(errno));
+               } else {
+                       logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
+               }
 
                return false;
        }
 
-       oldlen = c->buflen;
-       c->buflen += lenin;
+       if(c->allow_request == ID) {
+               buffer_add(&c->inbuf, inbuf, inlen);
 
-       while(lenin > 0) {
-               /* Decrypt */
+               char *request = buffer_readline(&c->inbuf);
 
-               if(c->status.decryptin && !decrypted) {
-                       result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
-                       if(!result || lenout != lenin) {
-                               logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
-                                               c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+               if(request) {
+                       if(!receive_request(mesh, c, request) || c->allow_request == ID) {
                                return false;
                        }
-                       memcpy(c->buffer + oldlen, inbuf, lenin);
-                       decrypted = true;
-               }
 
-               /* Are we receiving a TCPpacket? */
+                       int left = c->inbuf.len - c->inbuf.offset;
 
-               if(c->tcplen) {
-                       if(c->tcplen <= c->buflen) {
-                               receive_tcppacket(c, c->buffer, c->tcplen);
-
-                               c->buflen -= c->tcplen;
-                               lenin -= c->tcplen - oldlen;
-                               memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
-                               oldlen = 0;
-                               c->tcplen = 0;
-                               continue;
+                       if(left > 0) {
+                               return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left);
                        } else {
-                               break;
-                       }
-               }
-
-               /* Otherwise we are waiting for a request */
-
-               reqlen = 0;
-
-               for(i = oldlen; i < c->buflen; i++) {
-                       if(c->buffer[i] == '\n') {
-                               c->buffer[i] = '\0';    /* replace end-of-line by end-of-string so we can use sscanf */
-                               reqlen = i + 1;
-                               break;
+                               return true;
                        }
                }
 
-               if(reqlen) {
-                       c->reqlen = reqlen;
-                       if(!receive_request(c))
-                               return false;
-
-                       c->buflen -= reqlen;
-                       lenin -= reqlen - oldlen;
-                       memmove(c->buffer, c->buffer + reqlen, c->buflen);
-                       oldlen = 0;
-                       continue;
+               if(c->inbuf.len >= sizeof(inbuf)) {
+                       logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name);
+                       return false;
                } else {
-                       break;
+                       return true;
                }
        }
 
-       if(c->buflen >= MAXBUFSIZE) {
-               logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
-                          c->name, c->hostname);
-               return false;
-       }
-
-       c->last_ping_time = now;
-
-       return true;
+       return sptps_receive_data(&c->sptps, inbuf, inlen);
 }