X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=7569e231834f047fa0a042d895d9a80b0b0412a1;hb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;hp=daceb2e06c217d1087751325334200cf3bee28ce;hpb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;p=tinc diff --git a/src/protocol_edge.c b/src/protocol_edge.c index daceb2e0..7569e231 100644 --- a/src/protocol_edge.c +++ b/src/protocol_edge.c @@ -22,6 +22,7 @@ #include "system.h" #include "conf.h" +#include "crypto.h" #include "connection.h" #include "edge.h" #include "graph.h" @@ -43,13 +44,13 @@ bool send_add_edge(connection_t *c, const edge_t *e) { char *local_address, *local_port; sockaddr2str(&e->local_address, &local_address, &local_port); - x = send_request(c, "%d %x %s %s %s %s %x %d %s %s", ADD_EDGE, rand(), + x = send_request(c, "%d %x %s %s %s %s %x %d %s %s", ADD_EDGE, prng(UINT32_MAX), e->from->name, e->to->name, address, port, e->options, e->weight, local_address, local_port); free(local_address); free(local_port); } else { - x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(), + x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, prng(UINT32_MAX), e->from->name, e->to->name, address, port, e->options, e->weight); } @@ -177,9 +178,9 @@ bool add_edge_h(connection_t *c, const char *request) { } if(e->weight != weight) { - splay_node_t *node = splay_unlink(edge_weight_tree, e); + splay_node_t *node = splay_unlink(&edge_weight_tree, e); e->weight = weight; - splay_insert_node(edge_weight_tree, node); + splay_insert_node(&edge_weight_tree, node); } } else if(from == myself) { logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist", @@ -218,7 +219,7 @@ bool add_edge_h(connection_t *c, const char *request) { } bool send_del_edge(connection_t *c, const edge_t *e) { - return send_request(c, "%d %x %s %s", DEL_EDGE, rand(), + return send_request(c, "%d %x %s %s", DEL_EDGE, prng(UINT32_MAX), e->from->name, e->to->name); }