X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=3bf28093f33b25629e858999d9065c492b905f96;hp=a272baf57e10da72687fed8c7aa91223e626bccc;hb=079dcd01794187d2857e1233f6c9930310812593;hpb=19be9cf7150858311f7898fa3fb525d692d02f64

diff --git a/src/meta.c b/src/meta.c
index a272baf5..3bf28093 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2006      Scott Lamb <slamb@slamb.org>
 
@@ -21,7 +21,6 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
 #include "logger.h"
@@ -31,7 +30,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
+bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) {
 	connection_t *c = handle;
 
 	if(!c) {
@@ -39,10 +38,8 @@ bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
 		abort();
 	}
 
-	logger(DEBUG_META, LOG_DEBUG, "send_meta_sptps(%s, %p, %zu)", c->name, buffer, length);
-
 	buffer_add(&c->outbuf, buffer, length);
-	event_add(&c->outevent, NULL);
+	io_set(&c->io, IO_READ | IO_WRITE);
 
 	return true;
 }
@@ -68,26 +65,19 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 					c->name, c->hostname);
 			return false;
 		}
-
 	} else {
 		buffer_add(&c->outbuf, buffer, length);
 	}
 
-	event_add(&c->outevent, NULL);
+	io_set(&c->io, IO_READ | IO_WRITE);
 
 	return true;
 }
 
 void broadcast_meta(connection_t *from, const char *buffer, int length) {
-	splay_node_t *node;
-	connection_t *c;
-
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-
+	for list_each(connection_t, c, connection_list)
 		if(c != from && c->status.active)
 			send_meta(c, buffer, length);
-	}
 }
 
 bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
@@ -98,8 +88,6 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 		abort();
 	}
 
-	logger(DEBUG_META, LOG_DEBUG, "receive_meta_sptps(%s, %d, %p, %hu)", c->name, type, data, length);
-
 	if(type == SPTPS_HANDSHAKE) {
 		if(c->allow_request == ACK)
 			return send_ack(c);
@@ -120,6 +108,11 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 		return true;
 	}
 
+	/* Change newline to null byte, just like non-SPTPS requests */
+
+	if(data[length - 1] == '\n')
+		((char *)data)[length - 1] = 0;
+
 	/* Otherwise we are waiting for a request */
 
 	return receive_request(c, data);
@@ -161,10 +154,8 @@ bool receive_meta(connection_t *c) {
 	}
 
 	do {
-		if(c->protocol_minor >= 2) {
-			logger(DEBUG_META, LOG_DEBUG, "Receiving %d bytes of SPTPS data", inlen);
+		if(c->protocol_minor >= 2)
 			return sptps_receive_data(&c->sptps, bufp, inlen);
-		}
 
 		if(!c->status.decryptin) {
 			endp = memchr(bufp, '\n', inlen);
@@ -179,7 +170,6 @@ bool receive_meta(connection_t *c) {
 			bufp = endp;
 		} else {
 			size_t outlen = inlen;
-			logger(DEBUG_META, LOG_DEBUG, "Received encrypted %d bytes", inlen);
 
 			if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
@@ -195,21 +185,50 @@ bool receive_meta(connection_t *c) {
 
 			if(c->tcplen) {
 				char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
-				if(tcpbuffer) {
-					if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+				if(!tcpbuffer)
+					break;
+
+				if(!c->node) {
+					if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
 						if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) {
 							logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
 						} else {
 							logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
 							return false;
 						}
-					} else 
-						receive_tcppacket(c, tcpbuffer, c->tcplen);
-					c->tcplen = 0;
-					continue;
+					} else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
+						if(tcpbuffer[0] != 5) {
+							logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
+							return false;
+						}
+						if(tcpbuffer[1] == 0xff) {
+							logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
+							return false;
+						}
+						if(tcpbuffer[2] != 5) {
+							logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
+							return false;
+						}
+						if(tcpbuffer[3] == 0) {
+							logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+						} else {
+							logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request rejected");
+							return false;
+						}
+					} else {
+						logger(DEBUG_CONNECTIONS, LOG_ERR, "c->tcplen set but c->node is NULL!");
+						abort();
+					}
 				} else {
-					break;
+					if(c->allow_request == ALL) {
+						receive_tcppacket(c, tcpbuffer, c->tcplen);
+					} else {
+						logger(DEBUG_CONNECTIONS, LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
+						return false;
+					}
 				}
+
+				c->tcplen = 0;
 			}
 
 			/* Otherwise we are waiting for a request */