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

diff --git a/src/meta.c b/src/meta.c
index 18315ad1..0e4b0d22 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -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.39 2003/08/08 14:24:09 guus Exp $
+    $Id: meta.c,v 1.1.2.42 2003/08/16 12:40:00 guus Exp $
 */
 
 #include "system.h"
@@ -27,14 +27,15 @@
 #include "avl_tree.h"
 #include "connection.h"
 #include "logger.h"
+#include "meta.h"
 #include "net.h"
 #include "protocol.h"
 #include "system.h"
 #include "utils.h"
 
-bool send_meta(connection_t *c, char *buffer, int length)
+bool send_meta(connection_t *c, const char *buffer, int length)
 {
-	char *bufp;
+	const char *bufp;
 	int outlen;
 	char outbuf[MAXBUFSIZE];
 	int result;
@@ -54,10 +55,10 @@ bool send_meta(connection_t *c, char *buffer, int length)
 	while(length) {
 		result = send(c->socket, bufp, length, 0);
 		if(result <= 0) {
-			if(!errno || errno == EPIPE)
+			if(!errno || errno == EPIPE) {
 				ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
 						   c->name, c->hostname);
-			else if(errno == EINTR)
+			} else if(errno == EINTR)
 				continue;
 			else
 				logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
@@ -71,7 +72,7 @@ bool send_meta(connection_t *c, char *buffer, int length)
 	return true;
 }
 
-void broadcast_meta(connection_t *from, char *buffer, int length)
+void broadcast_meta(connection_t *from, const char *buffer, int length)
 {
 	avl_node_t *node;
 	connection_t *c;
@@ -97,18 +98,6 @@ bool receive_meta(connection_t *c)
 
 	cp();
 
-	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 false;
-	}
-
-	if(x) {
-		logger(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
-			   c->name, c->hostname, strerror(x));
-		return false;
-	}
-
 	/* Strategy:
 	   - Read as much as possible from the TCP socket in one go.
 	   - Decrypt it.
@@ -121,10 +110,10 @@ bool receive_meta(connection_t *c)
 	lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
 
 	if(lenin <= 0) {
-		if(!lenin || !errno)
+		if(!lenin || !errno) {
 			ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
 					   c->name, c->hostname);
-		else if(errno == EINTR)
+		} else if(errno == EINTR)
 			return true;
 		else
 			logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),