Replace the connection_tree with a connection_list.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index baa4c2e..7562792 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -21,7 +21,6 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
 #include "logger.h"
@@ -31,16 +30,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,22 +46,22 @@ 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)
-               return send_record(&c->sptps, 0, buffer, length);
+               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;
                }
@@ -79,11 +76,9 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 }
 
 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_node_t *node = connection_list->head, *next; node; node = next) {
+               next = node->next;
+               connection_t *c = node->data;
 
                if(c != from && c->status.active)
                        send_meta(c, buffer, length);
@@ -94,12 +89,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 +135,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 +143,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);
-                       return receive_data(&c->sptps, bufp, 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 +170,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 +186,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 {