X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=4ed1384ba66bc76d5773b5a2b7dc9b604470064a;hb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;hp=e376c33ba716ea9204e6d94bca36fd5b700a0c8b;hpb=098090468a9e1e8c5cdb0aeefa277329ff5f3406;p=tinc

diff --git a/src/meta.c b/src/meta.c
index e376c33b..4ed1384b 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     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
@@ -34,8 +34,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta(connection_t *c, const char *buffer, int length)
-{
+bool send_meta(connection_t *c, const char *buffer, int length) {
 	int outlen;
 	int result;
 
@@ -44,8 +43,12 @@ 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;
+	if(!c->outbuflen) {
+		if(event_add(&c->outev, NULL) < 0) {
+			logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+			abort();
+		}
+	}
 
 	/* Find room in connection's buffer */
 	if(length + c->outbuflen > c->outbufsize) {
@@ -60,8 +63,8 @@ bool send_meta(connection_t *c, const char *buffer, int length)
 
 	/* Add our data to buffer */
 	if(c->status.encryptout) {
-		result = EVP_EncryptUpdate(c->outctx, c->outbuf + c->outbufstart + c->outbuflen,
-				&outlen, buffer, length);
+		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));
@@ -79,8 +82,8 @@ bool send_meta(connection_t *c, const char *buffer, int length)
 	return true;
 }
 
-bool flush_meta(connection_t *c)
-{
+void flush_meta(int fd, short events, void *data) {
+	connection_t *c = data;
 	int result;
 	
 	ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
@@ -94,28 +97,31 @@ bool flush_meta(connection_t *c)
 						   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;
+				return;
+#endif
 			} else {
 				logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
 					   c->hostname, strerror(errno));
 			}
 
-			return false;
+			terminate_connection(c, c->status.active);
+			return;
 		}
 
 		c->outbufstart += result;
 		c->outbuflen -= result;
 	}
 
+	event_del(&c->outev);
+
 	c->outbufstart = 0; /* avoid unnecessary memmoves */
-	return true;
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length)
-{
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
 	avl_node_t *node;
 	connection_t *c;
 
@@ -129,8 +135,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
 	}
 }
 
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
 	int oldlen, i, result;
 	int lenin, lenout, reqlen;
 	bool decrypted = false;
@@ -169,7 +174,7 @@ bool receive_meta(connection_t *c)
 		/* Decrypt */
 
 		if(c->status.decryptin && !decrypted) {
-			result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin);
+			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));
@@ -229,7 +234,7 @@ bool receive_meta(connection_t *c)
 		return false;
 	}
 
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
 
 	return true;
 }