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

diff --git a/src/meta.c b/src/meta.c
index 939f76b8..18315ad1 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -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.35 2003/07/12 17:41:45 guus Exp $
+    $Id: meta.c,v 1.1.2.39 2003/08/08 14:24:09 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;
@@ -59,19 +52,23 @@ int send_meta(connection_t *c, char *buffer, int length)
 		bufp = buffer;
 
 	while(length) {
-		result = write(c->socket, bufp, length);
+		result = send(c->socket, bufp, length, 0);
 		if(result <= 0) {
-			if(errno == EINTR)
+			if(!errno || errno == EPIPE)
+				ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
+						   c->name, c->hostname);
+			else if(errno == EINTR)
 				continue;
-			logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
-				   c->hostname, strerror(errno));
-			return -1;
+			else
+				logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+					   c->hostname, strerror(errno));
+			return false;
 		}
 		bufp += result;
 		length -= result;
 	}
 	
-	return 0;
+	return true;
 }
 
 void broadcast_meta(connection_t *from, char *buffer, int length)
@@ -89,13 +86,13 @@ 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();
@@ -103,13 +100,13 @@ int receive_meta(connection_t *c)
 	if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
 		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(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
 			   c->name, c->hostname, strerror(x));
-		return -1;
+		return false;
 	}
 
 	/* Strategy:
@@ -121,19 +118,19 @@ int receive_meta(connection_t *c)
 	   - If not, keep stuff in buffer and exit.
 	 */
 
-	lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen);
+	lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
 
 	if(lenin <= 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 0;
+		else if(errno == EINTR)
+			return true;
 		else
 			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 +142,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 +176,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;
@@ -195,10 +192,10 @@ int receive_meta(connection_t *c)
 	if(c->buflen >= MAXBUFSIZE) {
 		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;
 }