X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=c402919b6bfd999b8a5f3d6833f37fae96041a4b;hb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;hp=795141123e7abda5fa7274cb39925f4a824c83b5;hpb=fbf305c09d91bf34b1504b58d50392df2e6bcfba;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index 79514112..c402919b 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
+    Copyright (C) 2014 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
@@ -13,79 +12,106 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "splay_tree.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) {
-	int outlen;
-	int result;
-	cp();
-
-	ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
-			   c->name, c->hostname);
-
-	/* Add our data to buffer */
-	if(c->status.encryptout) {
-		char outbuf[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;
 
-		result = EVP_EncryptUpdate(c->outctx, (unsigned char *)outbuf, &outlen, (unsigned char *)buffer, length);
-		if(!result || outlen != length) {
-			logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"),
-					c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
-			return false;
-		}
-		
-		logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
-		bufferevent_write(c->buffer, (void *)outbuf, length);
-		logger(LOG_DEBUG, _("Done."));
-	} else {
-		logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
-		bufferevent_write(c->buffer, (void *)buffer, length);
-		logger(LOG_DEBUG, _("Done."));
+	if(!c) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "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);
+
 	return true;
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	splay_node_t *node;
-	connection_t *c;
+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!");
+		abort();
+	}
 
-	cp();
+	logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
+			   c->name, c->hostname);
 
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	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(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 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!");
+		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) {
+		if(length != c->tcplen)
+			return false;
+		receive_tcppacket(mesh, c, request, length);
+		c->tcplen = 0;
+		return true;
 	}
+
+	/* 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) {
-	int result, inlen, outlen;
+bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
+	int inlen;
 	char inbuf[MAXBUFSIZE];
 	char *bufp = inbuf, *endp;
 
-	cp();
-
 	/* Strategy:
 	   - Read as much as possible from the TCP socket in one go.
 	   - Decrypt it.
@@ -95,69 +121,53 @@ bool receive_meta(connection_t *c) {
 	   - If not, keep stuff in buffer and exit.
 	 */
 
-	inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+	buffer_compact(&c->inbuf, MAXBUFSIZE);
 
-	if(inlen <= 0) {
-		logger(LOG_ERR, _("Receive callback called for %s (%s) but no data to receive: %s"), c->name, c->hostname, strerror(errno));
+	if(sizeof inbuf <= c->inbuf.len) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
 		return false;
 	}
 
-	do {
-		if(!c->status.decryptin) {
-			endp = memchr(bufp, '\n', inlen);
-			if(endp)
-				endp++;
-			else
-				endp = bufp + inlen;
-
-			logger(LOG_DEBUG, _("Received unencrypted %ld of %d bytes"), endp - bufp, inlen);
-
-			evbuffer_add(c->buffer->input, bufp, endp - bufp);
-
-			inlen -= endp - bufp;
-			bufp = endp;
-		} else {
-			logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen);
-			evbuffer_expand(c->buffer->input, inlen);
-			result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer, &outlen, (unsigned char *)bufp, inlen);
-			if(!result || outlen != inlen) {
-				logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
-						c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
-				return false;
-			}
-			c->buffer->input->off += inlen;
+	inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
 
-			inlen = 0;
-		}
+	if(inlen <= 0) {
+		if(!inlen || !errno) {
+			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "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));
+		return false;
+	}
 
-		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;
-				}
-			}
+	if(c->allow_request == ID) {
+		endp = memchr(bufp, '\n', inlen);
+		if(endp)
+			endp++;
+		else
+			endp = bufp + inlen;
+
+		buffer_add(&c->inbuf, bufp, endp - bufp);
 
-			/* Otherwise we are waiting for a request */
+		inlen -= endp - bufp;
+		bufp = endp;
 
-			char *request = evbuffer_readline(c->buffer->input);
+		while(c->inbuf.len) {
+			char *request = buffer_readline(&c->inbuf);
 			if(request) {
-				receive_request(c, request);
-				free(request);
+				bool result = receive_request(mesh, c, request);
+				if(!result)
+					return false;
 				continue;
 			} else {
 				break;
 			}
 		}
-	} while(inlen);
 
-	c->last_ping_time = time(NULL);
+		return true;
+	}
 
-	return true;
+	return sptps_receive_data(&c->sptps, bufp, inlen);
 }