X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=8786d7f8b0894b69cad03f076c4c371eb04c9709;hb=94ec8d34db0ddef14b5446975663e5ff37e27b45;hp=9b2ecc267f38869800e5b9eb436bfde2a60ba554;hpb=05dac63dbc03dc5a64a7f4b50e24eb3766135916;p=tinc diff --git a/src/meta.c b/src/meta.c index 9b2ecc26..8786d7f8 100644 --- 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;