X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;fp=src%2Fprotocol_edge.c;h=df7e9c25efc9960b79fc4b87eafc0404785f4518;hp=57e202f605ff8719535dd85c168ee207c71b9574;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hpb=9a2b0f88a9cae753ebc81c939d01403178b18a35

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 57e202f6..df7e9c25 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -21,7 +21,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
@@ -50,7 +50,7 @@ bool send_add_edge(connection_t *c, const edge_t *e) {
 	return x;
 }
 
-bool add_edge_h(connection_t *c) {
+bool add_edge_h(connection_t *c, char *request) {
 	edge_t *e;
 	node_t *from, *to;
 	char from_name[MAX_STRING_SIZE];
@@ -61,7 +61,7 @@ bool add_edge_h(connection_t *c) {
 	long int options;
 	int weight;
 
-	if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
+	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
 			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
 			   c->hostname);
@@ -82,7 +82,7 @@ bool add_edge_h(connection_t *c) {
 		return false;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	/* Lookup nodes */
@@ -158,7 +158,7 @@ bool add_edge_h(connection_t *c) {
 	/* Tell the rest about the new edge */
 
 	if(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	/* Run MST before or after we tell the rest? */
 
@@ -172,13 +172,13 @@ bool send_del_edge(connection_t *c, const edge_t *e) {
 						e->from->name, e->to->name);
 }
 
-bool del_edge_h(connection_t *c) {
+bool del_edge_h(connection_t *c, char *request) {
 	edge_t *e;
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
 
-	if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
+	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
 			   c->hostname);
 		return false;
@@ -198,7 +198,7 @@ bool del_edge_h(connection_t *c) {
 		return false;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	/* Lookup nodes */
@@ -248,7 +248,7 @@ bool del_edge_h(connection_t *c) {
 	/* Tell the rest about the deleted edge */
 
 	if(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	/* Delete the edge */