X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=765baeca085635fd2264d426ce320ddb0d441231;hp=27d2394a2d7d1877a960c0d08c1715d667fc5484;hb=46e481dc945c5572eb6091a3660f6bf258ee0cfa;hpb=5dde6461a321ee47b06e33f8203f2acf00a31a51

diff --git a/src/meta.c b/src/meta.c
index 27d2394a..765baeca 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -2,6 +2,7 @@
     meta.c -- handle the meta communication
     Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
+                  2006      Scott Lamb <slamb@slamb.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
@@ -36,14 +37,12 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 	int outlen;
 	int result;
 
-	cp();
-
 	if(!c) {
-		logger(LOG_ERR, _("send_meta() called with NULL pointer!"));
+		logger(LOG_ERR, "send_meta() called with NULL pointer!");
 		abort();
 	}
 
-	ifdebug(META) logger(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->outbuflen)
@@ -65,11 +64,11 @@ bool send_meta(connection_t *c, const char *buffer, int 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"),
+			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!"));
+			logger(LOG_EMERG, "Encrypted data too long! Heap corrupted!");
 			abort();
 		}
 		c->outbuflen += outlen;
@@ -84,25 +83,25 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 bool flush_meta(connection_t *c) {
 	int result;
 	
-	ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
+	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)"),
+				ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
 						   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"),
+				ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s) would block",
 						c->outbuflen, c->name, c->hostname);
 				return true;
 #endif
 			} else {
-				logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
+				logger(LOG_ERR, "Flushing meta data to %s (%s) failed: %s", c->name,
 					   c->hostname, strerror(errno));
 			}
 
@@ -121,8 +120,6 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
 	avl_node_t *node;
 	connection_t *c;
 
-	cp();
-
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
 
@@ -137,8 +134,6 @@ bool receive_meta(connection_t *c) {
 	bool decrypted = false;
 	char inbuf[MAXBUFSIZE];
 
-	cp();
-
 	/* Strategy:
 	   - Read as much as possible from the TCP socket in one go.
 	   - Decrypt it.
@@ -152,12 +147,12 @@ bool receive_meta(connection_t *c) {
 
 	if(lenin <= 0) {
 		if(!lenin || !errno) {
-			ifdebug(CONNECTIONS) logger(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 true;
 		else
-			logger(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 false;
@@ -172,7 +167,7 @@ bool receive_meta(connection_t *c) {
 		if(c->status.decryptin && !decrypted) {
 			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"),
+				logger(LOG_ERR, "Error while decrypting metadata from %s (%s): %s",
 						c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
 				return false;
 			}
@@ -225,7 +220,7 @@ bool receive_meta(connection_t *c) {
 	}
 
 	if(c->buflen >= MAXBUFSIZE) {
-		logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
+		logger(LOG_ERR, "Metadata read buffer overflow for %s (%s)",
 			   c->name, c->hostname);
 		return false;
 	}