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

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 6da3c876..6eb205fd 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"
@@ -104,7 +105,7 @@ 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);
@@ -117,10 +118,10 @@ bool add_edge_h(connection_t *c, const char *request) {
 			}
 		} 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;
@@ -203,10 +204,10 @@ 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++;
+		mesh->contradicting_del_edge++;
 		send_add_edge(c, e);    /* Send back a correction */
 		return true;
 	}
@@ -226,9 +227,9 @@ bool del_edge_h(connection_t *c, const char *request) {
 	/* 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);
+			send_del_edge(mesh->everyone, e);
 			edge_del(e);
 		}
 	}