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

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index e1d2051b..6eb205fd 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,8 +1,6 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
-                  2009      Michael Tokarev <mjt@corpit.ru>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,12 +19,12 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
@@ -84,16 +82,6 @@ bool add_edge_h(connection_t *c, const char *request) {
 	from = lookup_node(from_name);
 	to = lookup_node(to_name);
 
-	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
-		/* ignore indirect edge registrations for tunnelserver */
-		logger(DEBUG_PROTOCOL, LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "ADD_EDGE", c->name, c->hostname);
-		return true;
-	}
-
 	if(!from) {
 		from = new_node();
 		from->name = xstrdup(from_name);
@@ -117,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);
@@ -130,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;
@@ -152,8 +140,7 @@ bool add_edge_h(connection_t *c, const char *request) {
 
 	/* Tell the rest about the new edge */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(c, request);
 
 	/* Run MST before or after we tell the rest? */
 
@@ -195,16 +182,6 @@ bool del_edge_h(connection_t *c, const char *request) {
 	from = lookup_node(from_name);
 	to = lookup_node(to_name);
 
-	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
-		/* ignore indirect edge registrations for tunnelserver */
-		logger(DEBUG_PROTOCOL, LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "DEL_EDGE", c->name, c->hostname);
-		return true;
-	}
-
 	if(!from) {
 		logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
 				   "DEL_EDGE", c->name, c->hostname);
@@ -227,18 +204,17 @@ 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(c, e);    /* Send back a correction */
 		return true;
 	}
 
 	/* Tell the rest about the deleted edge */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(c, request);
 
 	/* Delete the edge */
 
@@ -251,10 +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) {
-			if(!tunnelserver)
-				send_del_edge(everyone, e);
+			send_del_edge(mesh->everyone, e);
 			edge_del(e);
 		}
 	}