X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=3b89cdec9bd438cf8169e5f310de91b796ca1714;hb=6d1ac53f5c34ece4c7a82efb432a8e1d81fcff0d;hp=6da3c876afffd870f4b76595eddd76a3aa137bc8;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 6da3c876..3b89cdec 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -24,6 +24,7 @@
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
@@ -32,13 +33,13 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_add_edge(connection_t *c, const edge_t *e) {
+bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
 	bool x;
 	char *address, *port;
 
 	sockaddr2str(&e->address, &address, &port);
 
-	x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
+	x = send_request(mesh, c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
 					 e->from->name, e->to->name, address, port,
 					 e->options, e->weight);
 	free(address);
@@ -47,7 +48,7 @@ bool send_add_edge(connection_t *c, const edge_t *e) {
 	return x;
 }
 
-bool add_edge_h(connection_t *c, const char *request) {
+bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	edge_t *e;
 	node_t *from, *to;
 	char from_name[MAX_STRING_SIZE];
@@ -73,24 +74,24 @@ bool add_edge_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(seen_request(request))
+	if(seen_request(mesh, request))
 		return true;
 
 	/* Lookup nodes */
 
-	from = lookup_node(from_name);
-	to = lookup_node(to_name);
+	from = lookup_node(mesh, from_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!from) {
 		from = new_node();
 		from->name = xstrdup(from_name);
-		node_add(from);
+		node_add(mesh, from);
 	}
 
 	if(!to) {
 		to = new_node();
 		to->name = xstrdup(to_name);
-		node_add(to);
+		node_add(mesh, to);
 	}
 
 
@@ -104,27 +105,27 @@ bool add_edge_h(connection_t *c, const char *request) {
 
 	if(e) {
 		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
-			if(from == myself) {
+			if(from == mesh->self) {
 				logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
 						   "ADD_EDGE", c->name, c->hostname);
-				send_add_edge(c, e);
+				send_add_edge(mesh, c, e);
 				return true;
 			} else {
 				logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
 						   "ADD_EDGE", c->name, c->hostname);
-				edge_del(e);
-				graph();
+				edge_del(mesh, e);
+				graph(mesh);
 			}
 		} else
 			return true;
-	} else if(from == myself) {
+	} else if(from == mesh->self) {
 		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
 				   "ADD_EDGE", c->name, c->hostname);
-		contradicting_add_edge++;
+		mesh->contradicting_add_edge++;
 		e = new_edge();
 		e->from = from;
 		e->to = to;
-		send_del_edge(c, e);
+		send_del_edge(mesh, c, e);
 		free_edge(e);
 		return true;
 	}
@@ -135,25 +136,25 @@ bool add_edge_h(connection_t *c, const char *request) {
 	e->address = address;
 	e->options = options;
 	e->weight = weight;
-	edge_add(e);
+	edge_add(mesh, e);
 
 	/* Tell the rest about the new edge */
 
-	forward_request(c, request);
+	forward_request(mesh, c, request);
 
 	/* Run MST before or after we tell the rest? */
 
-	graph();
+	graph(mesh);
 
 	return true;
 }
 
-bool send_del_edge(connection_t *c, const edge_t *e) {
-	return send_request(c, "%d %x %s %s", DEL_EDGE, rand(),
+bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
+	return send_request(mesh, c, "%d %x %s %s", DEL_EDGE, rand(),
 						e->from->name, e->to->name);
 }
 
-bool del_edge_h(connection_t *c, const char *request) {
+bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	edge_t *e;
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
@@ -173,13 +174,13 @@ bool del_edge_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(seen_request(request))
+	if(seen_request(mesh, request))
 		return true;
 
 	/* Lookup nodes */
 
-	from = lookup_node(from_name);
-	to = lookup_node(to_name);
+	from = lookup_node(mesh, from_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!from) {
 		logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
@@ -203,33 +204,33 @@ bool del_edge_h(connection_t *c, const char *request) {
 		return true;
 	}
 
-	if(e->from == myself) {
+	if(e->from == mesh->self) {
 		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
 				   "DEL_EDGE", c->name, c->hostname);
-		contradicting_del_edge++;
-		send_add_edge(c, e);    /* Send back a correction */
+		mesh->contradicting_del_edge++;
+		send_add_edge(mesh, c, e);    /* Send back a correction */
 		return true;
 	}
 
 	/* Tell the rest about the deleted edge */
 
-	forward_request(c, request);
+	forward_request(mesh, c, request);
 
 	/* Delete the edge */
 
-	edge_del(e);
+	edge_del(mesh, e);
 
 	/* Run MST before or after we tell the rest? */
 
-	graph();
+	graph(mesh);
 
 	/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
 
 	if(!to->status.reachable) {
-		e = lookup_edge(to, myself);
+		e = lookup_edge(to, mesh->self);
 		if(e) {
-			send_del_edge(everyone, e);
-			edge_del(e);
+			send_del_edge(mesh, mesh->everyone, e);
+			edge_del(mesh, e);
 		}
 	}