X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=7569e231834f047fa0a042d895d9a80b0b0412a1;hb=421aa3815645b2835c89799e4db91cf35466542b;hp=9fd301f239c9e1d785eac185dcc947d0a33aedd9;hpb=46f3eba7755089ff68fdc137b0754cae2fa523eb;p=tinc

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 9fd301f2..7569e231 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -22,11 +22,11 @@
 #include "system.h"
 
 #include "conf.h"
+#include "crypto.h"
 #include "connection.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
-#include "meta.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
@@ -44,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);
 	}
@@ -70,7 +70,7 @@ bool add_edge_h(connection_t *c, const char *request) {
 	char to_port[MAX_STRING_SIZE];
 	char address_local[MAX_STRING_SIZE];
 	char port_local[MAX_STRING_SIZE];
-	sockaddr_t address, local_address = {{0}};
+	sockaddr_t address, local_address = {0};
 	uint32_t options;
 	int weight;
 
@@ -178,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",
@@ -219,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);
 }