Avoid allocating packet buffers unnecessarily.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 3ae0d697e01cccad7273647d16e2fd4a873c8ac7..f3ab47f10be486767446de93ea0399ffb32bbc43 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>,
+    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
@@ -29,14 +29,15 @@
 #include "xalloc.h"
 
 bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+       (void)type;
+
+       assert(handle);
+       assert(buffer);
+       assert(length);
+
        connection_t *c = handle;
        meshlink_handle_t *mesh = c->mesh;
 
-       if(!c) {
-               logger(mesh, MESHLINK_ERROR, "send_meta_sptps() called with NULL pointer!");
-               abort();
-       }
-
        buffer_add(&c->outbuf, (const char *)buffer, length);
        io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
 
@@ -44,13 +45,11 @@ bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t leng
 }
 
 bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int length) {
-       if(!c) {
-               logger(mesh, MESHLINK_ERROR, "send_meta() called with NULL pointer!");
-               abort();
-       }
+       assert(c);
+       assert(buffer);
+       assert(length);
 
-       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
-              c->name, c->hostname);
+       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);
@@ -62,12 +61,31 @@ bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int
 }
 
 void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buffer, int length) {
+       assert(buffer);
+       assert(length);
+
        for list_each(connection_t, c, mesh->connections)
-               if(c != from && c->status.active)
+               if(c != from && c->status.active) {
                        send_meta(mesh, c, buffer, length);
+               }
+}
+
+void broadcast_submesh_meta(meshlink_handle_t *mesh, connection_t *from, submesh_t *s, const char *buffer, int length) {
+       assert(buffer);
+       assert(length);
+
+       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);
+                       }
+               }
 }
 
 bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) {
+       assert(handle);
+       assert(!length || data);
+
        connection_t *c = handle;
        meshlink_handle_t *mesh = c->mesh;
        char *request = (char *)data;
@@ -78,29 +96,28 @@ bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t l
        }
 
        if(type == SPTPS_HANDSHAKE) {
-               if(c->allow_request == ACK)
+               if(c->allow_request == ACK) {
                        return send_ack(mesh, c);
-               else
+               } else {
                        return true;
+               }
        }
 
-       if(!request)
+       if(!request) {
                return true;
+       }
 
        /* Are we receiving a TCPpacket? */
 
        if(c->tcplen) {
-               if(length != c->tcplen)
-                       return false;
-               receive_tcppacket(mesh, c, request, length);
-               c->tcplen = 0;
-               return true;
+               abort(); // TODO: get rid of tcplen altogether
        }
 
        /* Change newline to null byte, just like non-SPTPS requests */
 
-       if(request[length - 1] == '\n')
+       if(request[length - 1] == '\n') {
                request[length - 1] = 0;
+       }
 
        /* Otherwise we are waiting for a request */
 
@@ -115,13 +132,13 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
 
        if(inlen <= 0) {
                if(!inlen || !errno) {
-                       logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)",
-                              c->name, c->hostname);
-               } else if(sockwouldblock(sockerrno))
+                       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): %s",
-                              c->name, c->hostname, sockstrerror(sockerrno));
+               } else {
+                       logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
+               }
+
                return false;
        }
 
@@ -131,22 +148,25 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
                char *request = buffer_readline(&c->inbuf);
 
                if(request) {
-                       if(!receive_request(mesh, c, request) || c->allow_request == ID)
+                       if(!receive_request(mesh, c, request) || c->allow_request == ID) {
                                return false;
+                       }
 
                        int left = c->inbuf.len - c->inbuf.offset;
+
                        if(left > 0) {
-                               fprintf(stderr, "GOT A LITTLE MORE\n");
                                return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left);
-                       } else
+                       } else {
                                return true;
+                       }
                }
 
                if(c->inbuf.len >= sizeof(inbuf)) {
-                       logger(mesh, MESHLINK_ERROR, "Input buffer full for %s (%s)", c->name, c->hostname);
+                       logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name);
                        return false;
-               } else
+               } else {
                        return true;
+               }
        }
 
        return sptps_receive_data(&c->sptps, inbuf, inlen);