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

diff --git a/src/meta.c b/src/meta.c
index 1bb634fd..f3ab47f1 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,8 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
-                  2006      Scott Lamb <slamb@slamb.org>
+    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
@@ -21,143 +19,155 @@
 
 #include "system.h"
 
-#include "splay_tree.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(connection_t *c, const char *buffer, int length) {
-	if(!c) {
-		logger(LOG_ERR, "send_meta() called with NULL pointer!");
-		abort();
+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;
+
+	buffer_add(&c->outbuf, (const char *)buffer, length);
+	io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
+
+	return true;
+}
+
+bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int length) {
+	assert(c);
+	assert(buffer);
+	assert(length);
+
+	logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name);
+
+	if(c->allow_request == ID) {
+		buffer_add(&c->outbuf, buffer, length);
+		io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
+		return true;
 	}
 
-	ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
-			   c->name, c->hostname);
+	return sptps_send_record(&c->sptps, 0, buffer, length);
+}
 
-	/* Add our data to buffer */
-	if(c->status.encryptout) {
-		char outbuf[length];
-		size_t outlen = length;
+void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buffer, int length) {
+	assert(buffer);
+	assert(length);
 
-		if(!cipher_encrypt(&c->outcipher, buffer, length, outbuf, &outlen, false) || outlen != length) {
-			logger(LOG_ERR, "Error while encrypting metadata to %s (%s)",
-					c->name, c->hostname);
-			return false;
+	for list_each(connection_t, c, mesh->connections)
+		if(c != from && c->status.active) {
+			send_meta(mesh, c, buffer, length);
 		}
-		
-		ifdebug(META) logger(LOG_DEBUG, "Encrypted write %p %p %p %d", c, c->buffer, outbuf, length);
-		bufferevent_write(c->buffer, (void *)outbuf, length);
-		ifdebug(META) logger(LOG_DEBUG, "Done.");
-	} else {
-		ifdebug(META) logger(LOG_DEBUG, "Unencrypted write %p %p %p %d", c, c->buffer, buffer, length);
-		bufferevent_write(c->buffer, (void *)buffer, length);
-		ifdebug(META) logger(LOG_DEBUG, "Done.");
-	}
+}
 
-	return true;
+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);
+			}
+		}
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	splay_node_t *node;
-	connection_t *c;
+bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) {
+	assert(handle);
+	assert(!length || data);
 
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	connection_t *c = handle;
+	meshlink_handle_t *mesh = c->mesh;
+	char *request = (char *)data;
 
-		if(c != from && c->status.active)
-			send_meta(c, buffer, length);
+	if(!c) {
+		logger(mesh, MESHLINK_ERROR, "receive_meta_sptps() called with NULL pointer!");
+		abort();
 	}
+
+	if(type == SPTPS_HANDSHAKE) {
+		if(c->allow_request == ACK) {
+			return send_ack(mesh, c);
+		} else {
+			return true;
+		}
+	}
+
+	if(!request) {
+		return true;
+	}
+
+	/* Are we receiving a TCPpacket? */
+
+	if(c->tcplen) {
+		abort(); // TODO: get rid of tcplen altogether
+	}
+
+	/* Change newline to null byte, just like non-SPTPS requests */
+
+	if(request[length - 1] == '\n') {
+		request[length - 1] = 0;
+	}
+
+	/* Otherwise we are waiting for a request */
+
+	return receive_request(mesh, c, request);
 }
 
-bool receive_meta(connection_t *c) {
-	size_t inlen;
+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.
-	 */
 
-	inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+	inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
 
 	if(inlen <= 0) {
 		if(!inlen || !errno) {
-			ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
-					   c->name, c->hostname);
-		} else if(sockwouldblock(sockerrno))
+			logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
+		} else if(sockwouldblock(sockerrno)) {
 			return true;
-		else
-			logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
-				   c->name, c->hostname, sockstrerror(sockerrno));
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
+		}
+
 		return false;
 	}
 
-	do {
-		if(!c->status.decryptin) {
-			endp = memchr(bufp, '\n', inlen);
-			if(endp)
-				endp++;
-			else
-				endp = bufp + inlen;
+	if(c->allow_request == ID) {
+		buffer_add(&c->inbuf, inbuf, inlen);
 
-			evbuffer_add(c->buffer->input, bufp, endp - bufp);
+		char *request = buffer_readline(&c->inbuf);
 
-			inlen -= endp - bufp;
-			bufp = endp;
-		} else {
-			size_t outlen = inlen;
-			ifdebug(META) logger(LOG_DEBUG, "Received encrypted %zu bytes", inlen);
-			evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
-
-			if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) {
-				logger(LOG_ERR, "Error while decrypting metadata from %s (%s)",
-					   c->name, c->hostname);
+		if(request) {
+			if(!receive_request(mesh, c, request) || c->allow_request == ID) {
 				return false;
 			}
-			c->buffer->input->off += inlen;
 
-			inlen = 0;
-		}
+			int left = c->inbuf.len - c->inbuf.offset;
 
-		while(c->buffer->input->off) {
-			/* Are we receiving a TCPpacket? */
-
-			if(c->tcplen) {
-				if(c->tcplen <= c->buffer->input->off) {
-					receive_tcppacket(c, (char *)c->buffer->input->buffer, c->tcplen);
-					evbuffer_drain(c->buffer->input, c->tcplen);
-					c->tcplen = 0;
-					continue;
-				} else {
-					break;
-				}
-			}
-
-			/* Otherwise we are waiting for a request */
-
-			char *request = evbuffer_readline(c->buffer->input);
-			if(request) {
-				bool result = receive_request(c, request);
-				free(request);
-				if(!result)
-					return false;
-				continue;
+			if(left > 0) {
+				return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left);
 			} else {
-				break;
+				return true;
 			}
 		}
-	} while(inlen);
 
-	return true;
+		if(c->inbuf.len >= sizeof(inbuf)) {
+			logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name);
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	return sptps_receive_data(&c->sptps, inbuf, inlen);
 }