X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=939f76b8d3deff91945c041bfc789512db096547;hp=fa475dfb758d32f3c69a4d201f0125c5d230bf9c;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/meta.c b/src/meta.c
index fa475dfb..939f76b8 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
 
     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,7 +17,7 @@
     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.29 2002/09/09 21:24:34 guus Exp $
+    $Id: meta.c,v 1.1.2.35 2003/07/12 17:41:45 guus Exp $
 */
 
 #include "config.h"
@@ -25,7 +25,6 @@
 #include <avl_tree.h>
 
 #include <errno.h>
-#include <syslog.h>
 #include <unistd.h>
 #include <string.h>
 /* This line must be below the rest for FreeBSD */
@@ -38,17 +37,18 @@
 #include "connection.h"
 #include "system.h"
 #include "protocol.h"
+#include "logger.h"
 
-int send_meta(connection_t * c, char *buffer, int length)
+int send_meta(connection_t *c, char *buffer, int length)
 {
 	char *bufp;
 	int outlen;
 	char outbuf[MAXBUFSIZE];
+	int result;
 
 	cp();
 
-	if(debug_lvl >= DEBUG_META)
-		syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+	ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
 			   c->name, c->hostname);
 
 	if(c->status.encryptout) {
@@ -58,16 +58,23 @@ int send_meta(connection_t * c, char *buffer, int length)
 	} else
 		bufp = buffer;
 
-	if(write(c->socket, bufp, length) < 0) {
-		syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
-			   c->hostname, strerror(errno));
-		return -1;
+	while(length) {
+		result = write(c->socket, bufp, length);
+		if(result <= 0) {
+			if(errno == EINTR)
+				continue;
+			logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+				   c->hostname, strerror(errno));
+			return -1;
+		}
+		bufp += result;
+		length -= result;
 	}
-
+	
 	return 0;
 }
 
-void broadcast_meta(connection_t * from, char *buffer, int length)
+void broadcast_meta(connection_t *from, char *buffer, int length)
 {
 	avl_node_t *node;
 	connection_t *c;
@@ -82,9 +89,10 @@ void broadcast_meta(connection_t * from, char *buffer, int length)
 	}
 }
 
-int receive_meta(connection_t * c)
+int receive_meta(connection_t *c)
 {
-	int x, l = sizeof(x);
+	int x;
+	socklen_t l = sizeof(x);
 	int oldlen, i;
 	int lenin, reqlen;
 	int decrypted = 0;
@@ -93,13 +101,13 @@ int receive_meta(connection_t * c)
 	cp();
 
 	if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-		syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__,
+		logger(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__,
 			   __LINE__, c->socket, strerror(errno), c->name, c->hostname);
 		return -1;
 	}
 
 	if(x) {
-		syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
+		logger(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
 			   c->name, c->hostname, strerror(x));
 		return -1;
 	}
@@ -117,13 +125,12 @@ int receive_meta(connection_t * c)
 
 	if(lenin <= 0) {
 		if(lenin == 0) {
-			if(debug_lvl >= DEBUG_CONNECTIONS)
-				syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+			ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
 					   c->name, c->hostname);
 		} else if(errno == EINTR)
 			return 0;
 		else
-			syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
+			logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
 				   c->name, c->hostname, strerror(errno));
 
 		return -1;
@@ -136,8 +143,7 @@ int receive_meta(connection_t * c)
 		/* Decrypt */
 
 		if(c->status.decryptin && !decrypted) {
-			EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen,
-							  lenin);
+			EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
 			memcpy(c->buffer + oldlen, inbuf, lenin);
 			decrypted = 1;
 		}
@@ -187,7 +193,7 @@ int receive_meta(connection_t * c)
 	}
 
 	if(c->buflen >= MAXBUFSIZE) {
-		syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
+		logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
 			   c->name, c->hostname);
 		return -1;
 	}