X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=dacb1df9fc9dda46b6ce3d24cad257c8bedca359;hp=c2fbd7edaa921830c9941eef7674c16149081f78;hb=6c5f3d8b74ffea1522a727ef189a5ba65a939e07;hpb=9bde92ce97d5503ff2d31dcc6f0648902580ec14

diff --git a/src/meta.c b/src/meta.c
index c2fbd7ed..dacb1df9 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.40 2003/08/08 22:11:54 guus Exp $
+    $Id: meta.c,v 1.1.2.44 2003/08/28 21:05:10 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;
@@ -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;
@@ -79,7 +80,7 @@ void broadcast_meta(connection_t *from, char *buffer, int length)
 	cp();
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c != from && c->status.active)
 			send_meta(c, buffer, length);
@@ -88,8 +89,6 @@ void broadcast_meta(connection_t *from, char *buffer, int length)
 
 bool receive_meta(connection_t *c)
 {
-	int x;
-	socklen_t l = sizeof(x);
 	int oldlen, i;
 	int lenin, reqlen;
 	bool decrypted = false;
@@ -97,18 +96,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.