X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=d293b2ee2c8c75d626953c09d63f51276fe48961;hb=93a7614d2aa368a9799d6e39c73542a3998e70bf;hp=2d30840314d802be9b50ace3c2d77570c1efdc80;hpb=ea294dac41365a08a77b64c62c0ba630292d7a07;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index 2d308403..d293b2ee 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>,
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>,
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #include "xalloc.h"
 
 bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
+	(void)type;
 	connection_t *c = handle;
 	meshlink_handle_t *mesh = c->mesh;
 
@@ -62,8 +63,19 @@ 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) {
 	for list_each(connection_t, c, mesh->connections)
-		if(c != from && c->status.active)
+		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) {
+	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) {
@@ -77,29 +89,28 @@ 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 TCPpacket? */
 
 	if(c->tcplen) {
-		if(length != c->tcplen)
-			return false;
-		receive_tcppacket(mesh, c, request, length);
-		c->tcplen = 0;
-		return true;
+		abort(); // TODO: get rid of tcplen altogether
 	}
 
 	/* 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 */
 
@@ -115,10 +126,12 @@ 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;
 	}
 
@@ -128,22 +141,25 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
 		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);