X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=7d4ae2e50bbec23c60676a87147e553b72748613;hp=d6bf135aad19fe2630806174e0b5e4e501def95d;hb=228e7a5c8f0e517dcede50f886965a44fca39853;hpb=72bdc05cb7e246e56ed21a25256d441c45fccca8

diff --git a/src/meta.c b/src/meta.c
index d6bf135a..7d4ae2e5 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
 
     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
@@ -17,11 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.43 2003/08/22 11:18:42 guus Exp $
+    $Id$
 */
 
 #include "system.h"
 
+#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "avl_tree.h"
@@ -30,14 +31,11 @@
 #include "meta.h"
 #include "net.h"
 #include "protocol.h"
-#include "system.h"
 #include "utils.h"
 
 bool send_meta(connection_t *c, const char *buffer, int length)
 {
-	const char *bufp;
 	int outlen;
-	char outbuf[MAXBUFSIZE];
 	int result;
 
 	cp();
@@ -45,30 +43,73 @@ 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) {
-		EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
-		bufp = outbuf;
-		length = outlen;
-	} else
-		bufp = buffer;
-
-	while(length) {
-		result = send(c->socket, bufp, length, 0);
+		result = EVP_EncryptUpdate(c->outctx, c->outbuf + c->outbufstart + c->outbuflen,
+				&outlen, 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)
+			} else if(errno == EINTR) {
 				continue;
-			else
-				logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+			} 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;
+			} else {
+				logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
 					   c->hostname, strerror(errno));
+			}
+
 			return false;
 		}
-		bufp += result;
-		length -= result;
+
+		c->outbufstart += result;
+		c->outbuflen -= result;
 	}
-	
+
+	c->outbufstart = 0; /* avoid unnecessary memmoves */
 	return true;
 }
 
@@ -80,7 +121,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
 	cp();
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c != from && c->status.active)
 			send_meta(c, buffer, length);
@@ -89,8 +130,8 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
 
 bool receive_meta(connection_t *c)
 {
-	int oldlen, i;
-	int lenin, reqlen;
+	int oldlen, i, result;
+	int lenin, lenout, reqlen;
 	bool decrypted = false;
 	char inbuf[MAXBUFSIZE];
 
@@ -123,11 +164,16 @@ bool receive_meta(connection_t *c)
 	oldlen = c->buflen;
 	c->buflen += lenin;
 
-	while(lenin) {
+	while(lenin > 0) {
 		/* Decrypt */
 
 		if(c->status.decryptin && !decrypted) {
-			EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+			result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, 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));
+				return false;
+			}
 			memcpy(c->buffer + oldlen, inbuf, lenin);
 			decrypted = true;
 		}
@@ -139,7 +185,7 @@ bool receive_meta(connection_t *c)
 				receive_tcppacket(c, c->buffer, c->tcplen);
 
 				c->buflen -= c->tcplen;
-				lenin -= c->tcplen;
+				lenin -= c->tcplen - oldlen;
 				memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
 				oldlen = 0;
 				c->tcplen = 0;
@@ -167,7 +213,7 @@ bool receive_meta(connection_t *c)
 				return false;
 
 			c->buflen -= reqlen;
-			lenin -= reqlen;
+			lenin -= reqlen - oldlen;
 			memmove(c->buffer, c->buffer + reqlen, c->buflen);
 			oldlen = 0;
 			continue;