X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=14342608518aac02ee8c06cfe16d572e2935750a;hb=5216839fa30dfbf5204b274b4e8becbb34e6ca21;hp=e286aea96a577dc12bfc6ba61d9e34459d93dc5f;hpb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index e286aea9..14342608 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 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,17 +19,16 @@
 
 #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_sptps(void *handle, const char *buffer, size_t length) {
+bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) {
 	connection_t *c = handle;
 
 	if(!c) {
@@ -39,10 +36,8 @@ bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
 		abort();
 	}
 
-	logger(DEBUG_ALWAYS, LOG_DEBUG, "send_meta_sptps(%s, %p, %zu)", c->name, buffer, length);
-
 	buffer_add(&c->outbuf, buffer, length);
-	event_add(&c->outevent, NULL);
+	io_set(&c->io, IO_READ | IO_WRITE);
 
 	return true;
 }
@@ -56,38 +51,19 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 	logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
 			   c->name, c->hostname);
 
-	if(c->protocol_minor >= 2)
-		return sptps_send_record(&c->sptps, 0, buffer, length);
-
-	/* Add our data to buffer */
-	if(c->status.encryptout) {
-		size_t outlen = length;
-
-		if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
-					c->name, c->hostname);
-			return false;
-		}
-
-	} else {
+	if(c->allow_request == ID) {
 		buffer_add(&c->outbuf, buffer, length);
+		io_set(&c->io, IO_READ | IO_WRITE);
+		return true;
 	}
 
-	event_add(&c->outevent, NULL);
-
-	return true;
+	return sptps_send_record(&c->sptps, 0, buffer, length);
 }
 
 void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	splay_node_t *node;
-	connection_t *c;
-
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-
+	for list_each(connection_t, c, mesh->connections)
 		if(c != from && c->status.active)
 			send_meta(c, buffer, length);
-	}
 }
 
 bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
@@ -98,8 +74,6 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 		abort();
 	}
 
-	logger(DEBUG_ALWAYS, LOG_DEBUG, "receive_meta_sptps(%s, %d, %p, %hu)", c->name, type, data, length);
-
 	if(type == SPTPS_HANDSHAKE) {
 		if(c->allow_request == ACK)
 			return send_ack(c);
@@ -120,6 +94,11 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 		return true;
 	}
 
+	/* Change newline to null byte, just like non-SPTPS requests */
+
+	if(data[length - 1] == '\n')
+		((char *)data)[length - 1] = 0;
+
 	/* Otherwise we are waiting for a request */
 
 	return receive_request(c, data);
@@ -160,52 +139,19 @@ bool receive_meta(connection_t *c) {
 		return false;
 	}
 
-	do {
-		if(c->protocol_minor >= 2) {
-			logger(DEBUG_ALWAYS, LOG_DEBUG, "Receiving %d bytes of SPTPS data", inlen);
-			return sptps_receive_data(&c->sptps, bufp, inlen);
-		}
-
-		if(!c->status.decryptin) {
-			endp = memchr(bufp, '\n', inlen);
-			if(endp)
-				endp++;
-			else
-				endp = bufp + inlen;
-
-			buffer_add(&c->inbuf, bufp, endp - bufp);
-
-			inlen -= endp - bufp;
-			bufp = endp;
-		} else {
-			size_t outlen = inlen;
-			logger(DEBUG_META, LOG_DEBUG, "Received encrypted %d bytes", inlen);
+	if(c->allow_request == ID) {
+		endp = memchr(bufp, '\n', inlen);
+		if(endp)
+			endp++;
+		else
+			endp = bufp + inlen;
 
-			if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
-					   c->name, c->hostname);
-				return false;
-			}
+		buffer_add(&c->inbuf, bufp, endp - bufp);
 
-			inlen = 0;
-		}
+		inlen -= endp - bufp;
+		bufp = endp;
 
 		while(c->inbuf.len) {
-			/* Are we receiving a TCPpacket? */
-
-			if(c->tcplen) {
-				char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
-				if(tcpbuffer) {
-					receive_tcppacket(c, tcpbuffer, c->tcplen);
-					c->tcplen = 0;
-					continue;
-				} else {
-					break;
-				}
-			}
-
-			/* Otherwise we are waiting for a request */
-
 			char *request = buffer_readline(&c->inbuf);
 			if(request) {
 				bool result = receive_request(c, request);
@@ -216,7 +162,9 @@ bool receive_meta(connection_t *c) {
 				break;
 			}
 		}
-	} while(inlen);
 
-	return true;
+		return true;
+	}
+
+	return sptps_receive_data(&c->sptps, bufp, inlen);
 }