Merge branch 'master' into 1.1

[oweals/tinc.git] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 32102d27af27a04cb6381a7129a97a45fef057df..1dd68d5e86c71db1c2df12afdbde59e031d629ad 100644 (file)
--- 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) {
        uint32_t options;
        int weight;
 
-       if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
+       if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %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);
@@ -76,7 +76,7 @@ bool add_edge_h(connection_t *c) {
                return false;
        }
 
-       if(seen_request(c->buffer))
+       if(seen_request(request))
                return true;
 
        /* Lookup nodes */
@@ -153,7 +153,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? */
 
@@ -167,13 +167,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;
@@ -187,7 +187,7 @@ bool del_edge_h(connection_t *c) {
                return false;
        }
 
-       if(seen_request(c->buffer))
+       if(seen_request(request))
                return true;
 
        /* Lookup nodes */
@@ -238,7 +238,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 */