X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=9b2ecc267f38869800e5b9eb436bfde2a60ba554;hb=05dac63dbc03dc5a64a7f4b50e24eb3766135916;hp=fa031dbda557d4f55d57f91c53e23a29714d9f60;hpb=483c5dcfb43719e5fd50902641252e28a04fd74e;p=tinc

diff --git a/src/meta.c b/src/meta.c
index fa031dbd..9b2ecc26 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -31,16 +31,14 @@
 #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) {
-		logger(LOG_ERR, "send_meta_sptps() called with NULL pointer!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
-	logger(LOG_DEBUG, "send_meta_sptps(%s, %p, %zu)", c->name, buffer, length);
-
 	buffer_add(&c->outbuf, buffer, length);
 	event_add(&c->outevent, NULL);
 
@@ -49,11 +47,11 @@ bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
 
 bool send_meta(connection_t *c, const char *buffer, int length) {
 	if(!c) {
-		logger(LOG_ERR, "send_meta() called with NULL pointer!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
 		abort();
 	}
 
-	ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
+	logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
 			   c->name, c->hostname);
 
 	if(c->protocol_minor >= 2)
@@ -64,7 +62,7 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 		size_t outlen = length;
 
 		if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
-			logger(LOG_ERR, "Error while encrypting metadata to %s (%s)",
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
 					c->name, c->hostname);
 			return false;
 		}
@@ -94,12 +92,10 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 	connection_t *c = handle;
 
 	if(!c) {
-		logger(LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
-	logger(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);
@@ -142,7 +138,7 @@ bool receive_meta(connection_t *c) {
 	buffer_compact(&c->inbuf, MAXBUFSIZE);
 
 	if(sizeof inbuf <= c->inbuf.len) {
-		logger(LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
 		return false;
 	}
 
@@ -150,21 +146,19 @@ bool receive_meta(connection_t *c) {
 
 	if(inlen <= 0) {
 		if(!inlen || !errno) {
-			ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
+			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)",
 					   c->name, c->hostname);
 		} else if(sockwouldblock(sockerrno))
 			return true;
 		else
-			logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
+			logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s",
 				   c->name, c->hostname, sockstrerror(sockerrno));
 		return false;
 	}
 
 	do {
-		if(c->protocol_minor >= 2) {
-			logger(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,10 +173,9 @@ bool receive_meta(connection_t *c) {
 			bufp = endp;
 		} else {
 			size_t outlen = inlen;
-			ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", inlen);
 
 			if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
-				logger(LOG_ERR, "Error while decrypting metadata from %s (%s)",
+				logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
 					   c->name, c->hostname);
 				return false;
 			}
@@ -196,7 +189,15 @@ bool receive_meta(connection_t *c) {
 			if(c->tcplen) {
 				char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
 				if(tcpbuffer) {
-					receive_tcppacket(c, tcpbuffer, c->tcplen);
+					if(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 {