X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=e818b0b4b6b3a48e247e8899c040bff3e2ad504f;hp=f7450fdfd959be45820bad2c652995aa9eeef1db;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad

diff --git a/src/meta.c b/src/meta.c
index f7450fdf..e818b0b4 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,29 +17,22 @@
     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.34 2003/07/06 22:11:31 guus Exp $
+    $Id: meta.c,v 1.1.2.37 2003/07/22 20:55:19 guus Exp $
 */
 
-#include "config.h"
-#include <utils.h>
-#include <avl_tree.h>
-
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-/* This line must be below the rest for FreeBSD */
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "system.h"
 
 #include <openssl/evp.h>
 
-#include "net.h"
+#include "avl_tree.h"
 #include "connection.h"
-#include "system.h"
-#include "protocol.h"
 #include "logger.h"
+#include "net.h"
+#include "protocol.h"
+#include "system.h"
+#include "utils.h"
 
-int send_meta(connection_t *c, char *buffer, int length)
+bool send_meta(connection_t *c, char *buffer, int length)
 {
 	char *bufp;
 	int outlen;
@@ -48,7 +41,7 @@ int send_meta(connection_t *c, char *buffer, int length)
 
 	cp();
 
-	logger(DEBUG_META, 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) {
@@ -63,15 +56,15 @@ int send_meta(connection_t *c, char *buffer, int length)
 		if(result <= 0) {
 			if(errno == EINTR)
 				continue;
-			logger(DEBUG_ALWAYS, LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+			logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
 				   c->hostname, strerror(errno));
-			return -1;
+			return false;
 		}
 		bufp += result;
 		length -= result;
 	}
 	
-	return 0;
+	return true;
 }
 
 void broadcast_meta(connection_t *from, char *buffer, int length)
@@ -89,27 +82,27 @@ void broadcast_meta(connection_t *from, char *buffer, int length)
 	}
 }
 
-int receive_meta(connection_t *c)
+bool receive_meta(connection_t *c)
 {
 	int x;
 	socklen_t l = sizeof(x);
 	int oldlen, i;
 	int lenin, reqlen;
-	int decrypted = 0;
+	bool decrypted = false;
 	char inbuf[MAXBUFSIZE];
 
 	cp();
 
 	if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-		logger(DEBUG_ALWAYS, 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;
+		return false;
 	}
 
 	if(x) {
-		logger(DEBUG_ALWAYS, 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;
+		return false;
 	}
 
 	/* Strategy:
@@ -125,15 +118,15 @@ int receive_meta(connection_t *c)
 
 	if(lenin <= 0) {
 		if(lenin == 0) {
-			logger(DEBUG_CONNECTIONS, 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;
+			return true;
 		else
-			logger(DEBUG_ALWAYS, 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;
+		return false;
 	}
 
 	oldlen = c->buflen;
@@ -145,7 +138,7 @@ int receive_meta(connection_t *c)
 		if(c->status.decryptin && !decrypted) {
 			EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
 			memcpy(c->buffer + oldlen, inbuf, lenin);
-			decrypted = 1;
+			decrypted = true;
 		}
 
 		/* Are we receiving a TCPpacket? */
@@ -179,8 +172,8 @@ int receive_meta(connection_t *c)
 
 		if(reqlen) {
 			c->reqlen = reqlen;
-			if(receive_request(c))
-				return -1;
+			if(!receive_request(c))
+				return false;
 
 			c->buflen -= reqlen;
 			lenin -= reqlen;
@@ -193,12 +186,12 @@ int receive_meta(connection_t *c)
 	}
 
 	if(c->buflen >= MAXBUFSIZE) {
-		logger(DEBUG_ALWAYS, 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;
+		return false;
 	}
 
 	c->last_ping_time = now;
 
-	return 0;
+	return true;
 }