Merge branch 'master' into 1.1

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 13c8495..84094d4 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_META, LOG_DEBUG, "send_meta_sptps(%s, %p, %zu)", c->name, buffer, length);
+       logger(DEBUG_META, LOG_DEBUG, "send_meta_sptps(%s, %p, %d)", c->name, buffer, (int)length);
 
        buffer_add(&c->outbuf, buffer, length);
        event_add(&c->outevent, NULL);
@@ -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 {