Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index e286aea96a577dc12bfc6ba61d9e34459d93dc5f..a272baf57e10da72687fed8c7aa91223e626bccc 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -39,7 +39,7 @@ bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
                abort();
        }
 
-       logger(DEBUG_ALWAYS, LOG_DEBUG, "send_meta_sptps(%s, %p, %zu)", c->name, buffer, length);
+       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);
@@ -98,7 +98,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
                abort();
        }
 
-       logger(DEBUG_ALWAYS, LOG_DEBUG, "receive_meta_sptps(%s, %d, %p, %hu)", c->name, type, data, length);
+       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)
@@ -162,7 +162,7 @@ bool receive_meta(connection_t *c) {
 
        do {
                if(c->protocol_minor >= 2) {
-                       logger(DEBUG_ALWAYS, LOG_DEBUG, "Receiving %d bytes of SPTPS data", inlen);
+                       logger(DEBUG_META, LOG_DEBUG, "Receiving %d bytes of SPTPS data", inlen);
                        return sptps_receive_data(&c->sptps, bufp, inlen);
                }
 
@@ -196,7 +196,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 {