X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=fa880d2a3806a4b8172e5ab9e7c088de37ef1a20;hb=HEAD;hp=13024677d0bb50f147a738b834682ea2f90f4c89;hpb=90a197d30aecd6da76fe6730702bdf4634ab1413;p=meshlink diff --git a/src/meta.c b/src/meta.c index 13024677..ffd835c4 100644 --- a/src/meta.c +++ b/src/meta.c @@ -47,7 +47,7 @@ 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) { assert(c); assert(buffer); - assert(length); + assert(length >= 0); logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name); @@ -107,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(mesh->receive_cb) { + mesh->receive_cb(mesh, (meshlink_node_t *)c->node, data, length); + } - if(c->tcplen) { - abort(); // TODO: get rid of tcplen altogether + return true; } /* Change newline to null byte, just like non-SPTPS requests */ @@ -144,6 +150,10 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) { 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);