X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=1244bfd0e55478ace2a22028541c6fd30a544b63;hp=9b2ecc267f38869800e5b9eb436bfde2a60ba554;hb=6bc5d626a8726fc23365ee705761a3c666a08ad4;hpb=05dac63dbc03dc5a64a7f4b50e24eb3766135916

diff --git a/src/meta.c b/src/meta.c
index 9b2ecc26..1244bfd0 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2006      Scott Lamb <slamb@slamb.org>
 
@@ -21,7 +21,6 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
 #include "logger.h"
@@ -40,7 +39,7 @@ bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t leng
 	}
 
 	buffer_add(&c->outbuf, buffer, length);
-	event_add(&c->outevent, NULL);
+	io_set(&c->io, IO_READ | IO_WRITE);
 
 	return true;
 }
@@ -66,26 +65,19 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 					c->name, c->hostname);
 			return false;
 		}
-
 	} else {
 		buffer_add(&c->outbuf, buffer, length);
 	}
 
-	event_add(&c->outevent, NULL);
+	io_set(&c->io, IO_READ | IO_WRITE);
 
 	return true;
 }
 
 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 +108,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 +193,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;