]> git.meshlink.io Git - meshlink/blobdiff - src/meta.c
Avoid allocating packet buffers unnecessarily.
[meshlink] / src / meta.c
index 82dde3a54442ef73f933e1f607138fd52eab1966..f3ab47f10be486767446de93ea0399ffb32bbc43 100644 (file)
@@ -1,7 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
+    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 "splay_tree.h"
-#include "cipher.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) {
-       cp();
+bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+       (void)type;
 
-       ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
-                          c->name, c->hostname);
+       assert(handle);
+       assert(buffer);
+       assert(length);
 
-       /* Add our data to buffer */
-       if(c->status.encryptout) {
-               char outbuf[length];
-               size_t outlen = length;
+       connection_t *c = handle;
+       meshlink_handle_t *mesh = c->mesh;
 
-               if(!cipher_encrypt(&c->outcipher, buffer, length, outbuf, &outlen, false) || outlen != length) {
-                       logger(LOG_ERR, _("Error while encrypting metadata to %s (%s)"),
-                                       c->name, c->hostname);
-                       return false;
-               }
-               
-               ifdebug(META) logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
-               bufferevent_write(c->buffer, (void *)outbuf, length);
-               ifdebug(META) logger(LOG_DEBUG, _("Done."));
-       } else {
-               ifdebug(META) logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
-               bufferevent_write(c->buffer, (void *)buffer, length);
-               ifdebug(META) logger(LOG_DEBUG, _("Done."));
-       }
+       buffer_add(&c->outbuf, (const char *)buffer, length);
+       io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
 
        return true;
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
-       splay_node_t *node;
-       connection_t *c;
-
-       cp();
+bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int length) {
+       assert(c);
+       assert(buffer);
+       assert(length);
 
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
+       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name);
 
-               if(c != from && c->status.active)
-                       send_meta(c, buffer, length);
+       if(c->allow_request == ID) {
+               buffer_add(&c->outbuf, buffer, length);
+               io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
+               return true;
        }
+
+       return sptps_send_record(&c->sptps, 0, buffer, length);
 }
 
-bool receive_meta(connection_t *c) {
-       size_t inlen;
-       char inbuf[MAXBUFSIZE];
-       char *bufp = inbuf, *endp;
+void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buffer, int length) {
+       assert(buffer);
+       assert(length);
 
-       cp();
+       for list_each(connection_t, c, mesh->connections)
+               if(c != from && c->status.active) {
+                       send_meta(mesh, c, buffer, length);
+               }
+}
 
-       /* 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.
-        */
+void broadcast_submesh_meta(meshlink_handle_t *mesh, connection_t *from, submesh_t *s, const char *buffer, int length) {
+       assert(buffer);
+       assert(length);
 
-       inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+       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);
+                       }
+               }
+}
 
-       if(inlen <= 0) {
-               logger(LOG_ERR, _("Receive callback called for %s (%s) but no data to receive: %s"), c->name, c->hostname, strerror(errno));
-               return false;
-       }
+bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) {
+       assert(handle);
+       assert(!length || data);
 
-       do {
-               if(!c->status.decryptin) {
-                       endp = memchr(bufp, '\n', inlen);
-                       if(endp)
-                               endp++;
-                       else
-                               endp = bufp + inlen;
+       connection_t *c = handle;
+       meshlink_handle_t *mesh = c->mesh;
+       char *request = (char *)data;
 
-                       evbuffer_add(c->buffer->input, bufp, endp - bufp);
+       if(!c) {
+               logger(mesh, MESHLINK_ERROR, "receive_meta_sptps() called with NULL pointer!");
+               abort();
+       }
 
-                       inlen -= endp - bufp;
-                       bufp = endp;
+       if(type == SPTPS_HANDSHAKE) {
+               if(c->allow_request == ACK) {
+                       return send_ack(mesh, c);
                } else {
-                       size_t outlen = inlen;
-                       ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %zu bytes"), inlen);
-                       evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
+                       return true;
+               }
+       }
 
-                       if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) {
-                               logger(LOG_ERR, _("Error while decrypting metadata from %s (%s)"),
-                                          c->name, c->hostname);
-                               return false;
-                       }
-                       c->buffer->input->off += inlen;
+       if(!request) {
+               return true;
+       }
+
+       /* Are we receiving a TCPpacket? */
+
+       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);
+}
+
+bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
+       int inlen;
+       char inbuf[MAXBUFSIZE];
 
-                       inlen = 0;
+       inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
+
+       if(inlen <= 0) {
+               if(!inlen || !errno) {
+                       logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
+               } else if(sockwouldblock(sockerrno)) {
+                       return true;
+               } else {
+                       logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
                }
 
-               while(c->buffer->input->off) {
-                       /* Are we receiving a TCPpacket? */
-
-                       if(c->tcplen) {
-                               if(c->tcplen <= c->buffer->input->off) {
-                                       receive_tcppacket(c, (char *)c->buffer->input->buffer, c->tcplen);
-                                       evbuffer_drain(c->buffer->input, c->tcplen);
-                                       c->tcplen = 0;
-                                       continue;
-                               } else {
-                                       break;
-                               }
+               return false;
+       }
+
+       if(c->allow_request == ID) {
+               buffer_add(&c->inbuf, inbuf, inlen);
+
+               char *request = buffer_readline(&c->inbuf);
+
+               if(request) {
+                       if(!receive_request(mesh, c, request) || c->allow_request == ID) {
+                               return false;
                        }
 
-                       /* Otherwise we are waiting for a request */
+                       int left = c->inbuf.len - c->inbuf.offset;
 
-                       char *request = evbuffer_readline(c->buffer->input);
-                       if(request) {
-                               bool result = receive_request(c, request);
-                               free(request);
-                               if(!result)
-                                       return false;
-                               continue;
+                       if(left > 0) {
+                               return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left);
                        } else {
-                               break;
+                               return true;
                        }
                }
-       } while(inlen);
 
-       c->last_ping_time = time(NULL);
+               if(c->inbuf.len >= sizeof(inbuf)) {
+                       logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name);
+                       return false;
+               } else {
+                       return true;
+               }
+       }
 
-       return true;
+       return sptps_receive_data(&c->sptps, inbuf, inlen);
 }