X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fmeta.c;h=f3ab47f10be486767446de93ea0399ffb32bbc43;hp=68450166c0e844e27ad83ceaff9230f0245828a1;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=b67296418c51784d39a24c3041e2cb199bee06f2

diff --git a/src/meta.c b/src/meta.c
index 68450166..f3ab47f1 100644
--- 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);
 
 	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) {
 			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;
@@ -138,7 +155,6 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
 			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 {
 				return true;