X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=f3ab47f10be486767446de93ea0399ffb32bbc43;hb=HEAD;hp=fa880d2a3806a4b8172e5ab9e7c088de37ef1a20;hpb=8d4b96efb7955eaa96174af4804597f92e124041;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index fa880d2a..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);
 
@@ -65,7 +65,7 @@ void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buf
 	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);
 		}
 }
@@ -75,7 +75,7 @@ void broadcast_submesh_meta(meshlink_handle_t *mesh, connection_t *from, const s
 	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)) {
 			if(c->node && submesh_allows_node(s, c->node)) {
 				send_meta(mesh, c, buffer, length);
 			}
@@ -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 */
@@ -142,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);