Never automatically try to bind to ports >= 32768.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index aa3499e95b8f1b3a059fc820b0a2fa885acc0873..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,13 +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;
@@ -90,10 +107,16 @@ bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t l
                return true;
        }
 
-       /* Are we receiving a TCPpacket? */
+       /* Are we receiving a raw packet? */
+
+       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 */
@@ -125,6 +148,12 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
                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);