X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=3ae0d697e01cccad7273647d16e2fd4a873c8ac7;hb=157c8660a94aea6eddef4dd290ae93d40566b2d8;hp=b15ed8374eaca3cef2a18d8acef4ac291535d53c;hpb=2956559f7d12caa9779207525419801e0e9ab3e3;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index b15ed837..3ae0d697 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -19,63 +19,72 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "connection.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) {
+bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
 	connection_t *c = handle;
+	meshlink_handle_t *mesh = c->mesh;
 
 	if(!c) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!");
+		logger(mesh, MESHLINK_ERROR, "send_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
-	buffer_add(&c->outbuf, buffer, length);
-	io_set(&c->io, IO_READ | IO_WRITE);
+	buffer_add(&c->outbuf, (const char *)buffer, length);
+	io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
 
 	return true;
 }
 
-bool send_meta(connection_t *c, const char *buffer, int length) {
+bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int length) {
 	if(!c) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
+		logger(mesh, MESHLINK_ERROR, "send_meta() called with NULL pointer!");
 		abort();
 	}
 
-	logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
-			   c->name, c->hostname);
+	logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
+	       c->name, c->hostname);
+
+	if(c->allow_request == ID) {
+		buffer_add(&c->outbuf, buffer, length);
+		io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
+		return true;
+	}
 
 	return sptps_send_record(&c->sptps, 0, buffer, length);
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	for list_each(connection_t, c, connection_list)
+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)
-			send_meta(c, buffer, length);
+			send_meta(mesh, c, buffer, length);
 }
 
-bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
+bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) {
 	connection_t *c = handle;
+	meshlink_handle_t *mesh = c->mesh;
+	char *request = (char *)data;
 
 	if(!c) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
+		logger(mesh, MESHLINK_ERROR, "receive_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
 	if(type == SPTPS_HANDSHAKE) {
 		if(c->allow_request == ACK)
-			return send_ack(c);
+			return send_ack(mesh, c);
 		else
 			return true;
 	}
 
-	if(!data)
+	if(!request)
 		return true;
 
 	/* Are we receiving a TCPpacket? */
@@ -83,55 +92,62 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 	if(c->tcplen) {
 		if(length != c->tcplen)
 			return false;
-		receive_tcppacket(c, data, length);
+		receive_tcppacket(mesh, c, request, length);
 		c->tcplen = 0;
 		return true;
 	}
 
 	/* Change newline to null byte, just like non-SPTPS requests */
 
-	if(data[length - 1] == '\n')
-		((char *)data)[length - 1] = 0;
+	if(request[length - 1] == '\n')
+		request[length - 1] = 0;
 
 	/* Otherwise we are waiting for a request */
 
-	return receive_request(c, data);
+	return receive_request(mesh, c, request);
 }
 
-bool receive_meta(connection_t *c) {
+bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
 	int inlen;
 	char inbuf[MAXBUFSIZE];
-	char *bufp = inbuf, *endp;
-
-	/* Strategy:
-	   - Read as much as possible from the TCP socket in one go.
-	   - Decrypt it.
-	   - Check if a full request is in the input buffer.
-	   - If yes, process request and remove it from the buffer,
-	   then check again.
-	   - If not, keep stuff in buffer and exit.
-	 */
-
-	buffer_compact(&c->inbuf, MAXBUFSIZE);
-
-	if(sizeof inbuf <= c->inbuf.len) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
-		return false;
-	}
 
-	inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
+	inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
 
 	if(inlen <= 0) {
 		if(!inlen || !errno) {
-			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)",
-					   c->name, c->hostname);
+			logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)",
+			       c->name, c->hostname);
 		} else if(sockwouldblock(sockerrno))
 			return true;
 		else
-			logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s",
-				   c->name, c->hostname, sockstrerror(sockerrno));
+			logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s (%s): %s",
+			       c->name, c->hostname, sockstrerror(sockerrno));
 		return false;
 	}
 
-	return sptps_receive_data(&c->sptps, bufp, inlen);
+	if(c->allow_request == ID) {
+		buffer_add(&c->inbuf, inbuf, inlen);
+
+		char *request = buffer_readline(&c->inbuf);
+
+		if(request) {
+			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
+				return true;
+		}
+
+		if(c->inbuf.len >= sizeof(inbuf)) {
+			logger(mesh, MESHLINK_ERROR, "Input buffer full for %s (%s)", c->name, c->hostname);
+			return false;
+		} else
+			return true;
+	}
+
+	return sptps_receive_data(&c->sptps, inbuf, inlen);
 }