Strip newline from incoming SPTPS requests.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 9b2ecc2..8786d7f 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"
@@ -77,15 +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_each(connection_t, c, connection_list)
                if(c != from && c->status.active)
                        send_meta(c, buffer, length);
-       }
 }
 
 bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
@@ -116,6 +109,11 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
                return true;
        }
 
+       /* Change newline to null byte, just like non-SPTPS requests */
+
+       if(data[length - 1] == '\n')
+               ((char *)data)[length - 1] = 0;
+
        /* Otherwise we are waiting for a request */
 
        return receive_request(c, data);
@@ -196,7 +194,7 @@ bool receive_meta(connection_t *c) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
                                                        return false;
                                                }
-                                       } else 
+                                       } else
                                                receive_tcppacket(c, tcpbuffer, c->tcplen);
                                        c->tcplen = 0;
                                        continue;