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 e56c86f9124d585966759fb63b9a8ae5a4b6f267..a272baf57e10da72687fed8c7aa91223e626bccc 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -31,21 +31,40 @@
 #include "utils.h"
 #include "xalloc.h"
 
+bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
+       connection_t *c = handle;
+
+       if(!c) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!");
+               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);
+
+       return true;
+}
+
 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)
+               return sptps_send_record(&c->sptps, 0, buffer, length);
+
        /* Add our data to buffer */
        if(c->status.encryptout) {
                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;
                }
@@ -71,6 +90,41 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
        }
 }
 
+bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
+       connection_t *c = handle;
+
+       if(!c) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
+               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);
+               else
+                       return true;
+       }
+
+       if(!data)
+               return true;
+
+       /* Are we receiving a TCPpacket? */
+
+       if(c->tcplen) {
+               if(length != c->tcplen)
+                       return false;
+               receive_tcppacket(c, data, length);
+               c->tcplen = 0;
+               return true;
+       }
+
+       /* Otherwise we are waiting for a request */
+
+       return receive_request(c, data);
+}
+
 bool receive_meta(connection_t *c) {
        int inlen;
        char inbuf[MAXBUFSIZE];
@@ -88,7 +142,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)\n", c, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
                return false;
        }
 
@@ -96,17 +150,22 @@ 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(DEBUG_META, LOG_DEBUG, "Receiving %d bytes of SPTPS data", inlen);
+                       return sptps_receive_data(&c->sptps, bufp, inlen);
+               }
+
                if(!c->status.decryptin) {
                        endp = memchr(bufp, '\n', inlen);
                        if(endp)
@@ -120,10 +179,10 @@ bool receive_meta(connection_t *c) {
                        bufp = endp;
                } else {
                        size_t outlen = inlen;
-                       ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", 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(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;
                        }
@@ -137,8 +196,16 @@ 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[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;
-                                       receive_tcppacket(c, tcpbuffer, c->tcplen);
                                        continue;
                                } else {
                                        break;