Move connection_list to mesh->connections.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 945a740ac22e5abea05d5e00f86168e71e2ae99f..160333b2c4cb140ced2bb17395ab550f0d6cb89d 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -22,6 +22,7 @@
 #include "cipher.h"
 #include "connection.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "protocol.h"
@@ -51,29 +52,17 @@ bool send_meta(connection_t *c, const char *buffer, int 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(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
-                                       c->name, c->hostname);
-                       return false;
-               }
-       } else {
+       if(c->allow_request == ID) {
                buffer_add(&c->outbuf, buffer, length);
+               io_set(&c->io, IO_READ | IO_WRITE);
+               return true;
        }
 
-       io_set(&c->io, IO_READ | IO_WRITE);
-
-       return true;
+       return sptps_send_record(&c->sptps, 0, buffer, length);
 }
 
 void broadcast_meta(connection_t *from, const char *buffer, int length) {
-       for list_each(connection_t, c, connection_list)
+       for list_each(connection_t, c, mesh->connections)
                if(c != from && c->status.active)
                        send_meta(c, buffer, length);
 }
@@ -151,86 +140,19 @@ bool receive_meta(connection_t *c) {
                return false;
        }
 
-       do {
-               if(c->protocol_minor >= 2)
-                       return sptps_receive_data(&c->sptps, bufp, inlen);
-
-               if(!c->status.decryptin) {
-                       endp = memchr(bufp, '\n', inlen);
-                       if(endp)
-                               endp++;
-                       else
-                               endp = bufp + inlen;
-
-                       buffer_add(&c->inbuf, bufp, endp - bufp);
-
-                       inlen -= endp - bufp;
-                       bufp = endp;
-               } else {
-                       size_t outlen = inlen;
+       if(c->allow_request == ID) {
+               endp = memchr(bufp, '\n', inlen);
+               if(endp)
+                       endp++;
+               else
+                       endp = bufp + inlen;
 
-                       if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
-                                          c->name, c->hostname);
-                               return false;
-                       }
+               buffer_add(&c->inbuf, bufp, endp - bufp);
 
-                       inlen = 0;
-               }
+               inlen -= endp - bufp;
+               bufp = endp;
 
                while(c->inbuf.len) {
-                       /* Are we receiving a TCPpacket? */
-
-                       if(c->tcplen) {
-                               char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
-                               if(!tcpbuffer)
-                                       break;
-
-                               if(!c->node) {
-                                       if(c->outgoing && 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 if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
-                                               if(tcpbuffer[0] != 5) {
-                                                       logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
-                                                       return false;
-                                               }
-                                               if(tcpbuffer[1] == (char)0xff) {
-                                                       logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
-                                                       return false;
-                                               }
-                                               if(tcpbuffer[2] != 5) {
-                                                       logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
-                                                       return false;
-                                               }
-                                               if(tcpbuffer[3] == 0) {
-                                                       logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
-                                               } else {
-                                                       logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request rejected");
-                                                       return false;
-                                               }
-                                       } else {
-                                               logger(DEBUG_CONNECTIONS, LOG_ERR, "c->tcplen set but c->node is NULL!");
-                                               abort();
-                                       }
-                               } else {
-                                       if(c->allow_request == ALL) {
-                                               receive_tcppacket(c, tcpbuffer, c->tcplen);
-                                       } else {
-                                               logger(DEBUG_CONNECTIONS, LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
-                                               return false;
-                                       }
-                               }
-
-                               c->tcplen = 0;
-                       }
-
-                       /* Otherwise we are waiting for a request */
-
                        char *request = buffer_readline(&c->inbuf);
                        if(request) {
                                bool result = receive_request(c, request);
@@ -241,7 +163,9 @@ bool receive_meta(connection_t *c) {
                                break;
                        }
                }
-       } while(inlen);
 
-       return true;
+               return true;
+       }
+
+       return sptps_receive_data(&c->sptps, bufp, inlen);
 }