Never automatically try to bind to ports >= 32768.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index fe213643e2db018a790883eaa720ee5cdc761bb6..ffd835c46e6bdbf108553aa28e7d7ff0be321daa 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -30,14 +30,14 @@
 
 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);
 
@@ -45,10 +45,9 @@ 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 >= 0);
 
        logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name);
 
@@ -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 && !(c->flags & PROTOCOL_TINY)) {
                        send_meta(mesh, c, buffer, length);
+               }
+}
+
+void broadcast_submesh_meta(meshlink_handle_t *mesh, connection_t *from, const 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 && !(c->flags & PROTOCOL_TINY)) {
+                       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,25 +96,34 @@ 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 raw packet? */
 
-       /* Are we receiving a TCPpacket? */
+       if(c->status.raw_packet) {
+               c->status.raw_packet = false;
 
-       if(c->tcplen) {
-               abort(); // TODO: get rid of tcplen altogether
+               if(mesh->receive_cb) {
+                       mesh->receive_cb(mesh, (meshlink_node_t *)c->node, data, length);
+               }
+
+               return true;
        }
 
        /* 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 */
 
@@ -112,35 +139,46 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
        if(inlen <= 0) {
                if(!inlen || !errno) {
                        logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
-               } else if(sockwouldblock(sockerrno))
+               } else if(sockwouldblock(sockerrno)) {
                        return true;
-               else
+               } else {
                        logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
+               }
+
                return false;
        }
 
+       logger(mesh, MESHLINK_DEBUG, "Received %d bytes of metadata from %s", inlen, c->name);
+
+       if(c->node) {
+               c->node->in_meta += inlen;
+       }
+
        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)
+                       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", c->name);
                        return false;
-               } else
+               } else {
                        return true;
+               }
        }
 
        return sptps_receive_data(&c->sptps, inbuf, inlen);