X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=787ccbd0ff17426b709dc8683e08e3a358d6cf12;hp=765baeca085635fd2264d426ce320ddb0d441231;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hpb=9a2b0f88a9cae753ebc81c939d01403178b18a35

diff --git a/src/meta.c b/src/meta.c
index 765baeca..787ccbd0 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -21,10 +21,8 @@
 
 #include "system.h"
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
 #include "logger.h"
 #include "meta.h"
@@ -34,9 +32,6 @@
 #include "xalloc.h"
 
 bool send_meta(connection_t *c, const char *buffer, int length) {
-	int outlen;
-	int result;
-
 	if(!c) {
 		logger(LOG_ERR, "send_meta() called with NULL pointer!");
 		abort();
@@ -45,79 +40,31 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 	ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
 			   c->name, c->hostname);
 
-	if(!c->outbuflen)
-		c->last_flushed_time = now;
-
-	/* Find room in connection's buffer */
-	if(length + c->outbuflen > c->outbufsize) {
-		c->outbufsize = length + c->outbuflen;
-		c->outbuf = xrealloc(c->outbuf, c->outbufsize);
-	}
-
-	if(length + c->outbuflen + c->outbufstart > c->outbufsize) {
-		memmove(c->outbuf, c->outbuf + c->outbufstart, c->outbuflen);
-		c->outbufstart = 0;
-	}
-
 	/* Add our data to buffer */
 	if(c->status.encryptout) {
-		result = EVP_EncryptUpdate(c->outctx, (unsigned char *)c->outbuf + c->outbufstart + c->outbuflen,
-				&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;
-		} else if(outlen > length) {
-			logger(LOG_EMERG, "Encrypted data too long! Heap corrupted!");
-			abort();
-		}
-		c->outbuflen += outlen;
-	} else {
-		memcpy(c->outbuf + c->outbufstart + c->outbuflen, buffer, length);
-		c->outbuflen += length;
-	}
-
-	return true;
-}
-
-bool flush_meta(connection_t *c) {
-	int result;
-	
-	ifdebug(META) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s)",
-			 c->outbuflen, c->name, c->hostname);
-
-	while(c->outbuflen) {
-		result = send(c->socket, c->outbuf + c->outbufstart, c->outbuflen, 0);
-		if(result <= 0) {
-			if(!errno || errno == EPIPE) {
-				ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
-						   c->name, c->hostname);
-			} else if(errno == EINTR) {
-				continue;
-#ifdef EWOULDBLOCK
-			} else if(errno == EWOULDBLOCK) {
-				ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s) would block",
-						c->outbuflen, c->name, c->hostname);
-				return true;
-#endif
-			} else {
-				logger(LOG_ERR, "Flushing meta data to %s (%s) failed: %s", c->name,
-					   c->hostname, strerror(errno));
-			}
+		char outbuf[length];
+		size_t outlen = 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;
 		}
-
-		c->outbufstart += result;
-		c->outbuflen -= result;
+		
+		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.");
 	}
 
-	c->outbufstart = 0; /* avoid unnecessary memmoves */
 	return true;
 }
 
 void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	avl_node_t *node;
+	splay_node_t *node;
 	connection_t *c;
 
 	for(node = connection_tree->head; node; node = node->next) {
@@ -129,10 +76,9 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
 }
 
 bool receive_meta(connection_t *c) {
-	int oldlen, i, result;
-	int lenin, lenout, reqlen;
-	bool decrypted = false;
+	size_t inlen;
 	char inbuf[MAXBUFSIZE];
+	char *bufp = inbuf, *endp;
 
 	/* Strategy:
 	   - Read as much as possible from the TCP socket in one go.
@@ -143,89 +89,70 @@ bool receive_meta(connection_t *c) {
 	   - If not, keep stuff in buffer and exit.
 	 */
 
-	lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
-
-	if(lenin <= 0) {
-		if(!lenin || !errno) {
-			ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
-					   c->name, c->hostname);
-		} else if(errno == EINTR)
-			return true;
-		else
-			logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
-				   c->name, c->hostname, strerror(errno));
+	inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
 
+	if(inlen <= 0) {
+		logger(LOG_ERR, "Receive callback called for %s (%s) but no data to receive: %s", c->name, c->hostname, strerror(errno));
 		return false;
 	}
 
-	oldlen = c->buflen;
-	c->buflen += lenin;
+	do {
+		if(!c->status.decryptin) {
+			endp = memchr(bufp, '\n', inlen);
+			if(endp)
+				endp++;
+			else
+				endp = bufp + inlen;
 
-	while(lenin > 0) {
-		/* Decrypt */
+			evbuffer_add(c->buffer->input, bufp, endp - bufp);
 
-		if(c->status.decryptin && !decrypted) {
-			result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
-			if(!result || lenout != lenin) {
-				logger(LOG_ERR, "Error while decrypting metadata from %s (%s): %s",
-						c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+			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);
 				return false;
 			}
-			memcpy(c->buffer + oldlen, inbuf, lenin);
-			decrypted = true;
+			c->buffer->input->off += inlen;
+
+			inlen = 0;
 		}
 
-		/* Are we receiving a TCPpacket? */
+		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->tcplen) {
-			if(c->tcplen <= c->buflen) {
-				receive_tcppacket(c, c->buffer, c->tcplen);
+			/* Otherwise we are waiting for a request */
 
-				c->buflen -= c->tcplen;
-				lenin -= c->tcplen - oldlen;
-				memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
-				oldlen = 0;
-				c->tcplen = 0;
+			char *request = evbuffer_readline(c->buffer->input);
+			if(request) {
+				bool result = receive_request(c, request);
+				free(request);
+				if(!result)
+					return false;
 				continue;
 			} else {
 				break;
 			}
 		}
+	} while(inlen);
 
-		/* Otherwise we are waiting for a request */
-
-		reqlen = 0;
-
-		for(i = oldlen; i < c->buflen; i++) {
-			if(c->buffer[i] == '\n') {
-				c->buffer[i] = '\0';	/* replace end-of-line by end-of-string so we can use sscanf */
-				reqlen = i + 1;
-				break;
-			}
-		}
-
-		if(reqlen) {
-			c->reqlen = reqlen;
-			if(!receive_request(c))
-				return false;
-
-			c->buflen -= reqlen;
-			lenin -= reqlen - oldlen;
-			memmove(c->buffer, c->buffer + reqlen, c->buflen);
-			oldlen = 0;
-			continue;
-		} else {
-			break;
-		}
-	}
-
-	if(c->buflen >= MAXBUFSIZE) {
-		logger(LOG_ERR, "Metadata read buffer overflow for %s (%s)",
-			   c->name, c->hostname);
-		return false;
-	}
-
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
 
 	return true;
 }