X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=571304ac620acf9d3d8e636f225182113e2a30aa;hp=af0b2e7243d31d5b65ebe48f5e90d4cd9887cf10;hb=c23fcf555ee4b69f03b76a0ffb731c3a475a77e7;hpb=0e59fb022c6c015a5be7ed70e0378cb011be98b5

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index af0b2e7..571304a 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,7 +1,8 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Michael Tokarev <mjt@corpit.ru>
 
     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
@@ -17,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_edge.c,v 1.1.4.22 2003/11/10 22:31:53 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -45,7 +46,7 @@ bool send_add_edge(connection_t *c, const edge_t *e)
 
 	sockaddr2str(&e->address, &address, &port);
 
-	x = send_request(c, "%d %lx %s %s %s %s %lx %d", ADD_EDGE, random(),
+	x = send_request(c, "%d %x %s %s %s %s %lx %d", ADD_EDGE, rand(),
 					 e->from->name, e->to->name, address, port,
 					 e->options, e->weight);
 	free(address);
@@ -95,6 +96,17 @@ bool add_edge_h(connection_t *c)
 	/* Lookup nodes */
 
 	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 */
+		ifdebug(PROTOCOL) logger(LOG_WARNING,
+		   _("Ignoring indirect %s from %s (%s)"),
+		   "ADD_EDGE", c->name, c->hostname);
+		return true;
+	}
 
 	if(!from) {
 		from = new_node();
@@ -102,16 +114,12 @@ bool add_edge_h(connection_t *c)
 		node_add(from);
 	}
 
-	to = lookup_node(to_name);
-
 	if(!to) {
 		to = new_node();
 		to->name = xstrdup(to_name);
 		node_add(to);
 	}
 
-	if(c->status.opaque && from != myself && from != c->node && to != myself && to != c->node)
-		return false;
 
 	/* Convert addresses */
 
@@ -157,7 +165,7 @@ bool add_edge_h(connection_t *c)
 
 	/* Tell the rest about the new edge */
 
-	if(!c->status.opaque)
+	if(!tunnelserver)
 		forward_request(c);
 
 	/* Run MST before or after we tell the rest? */
@@ -171,7 +179,7 @@ bool send_del_edge(connection_t *c, const edge_t *e)
 {
 	cp();
 
-	return send_request(c, "%d %lx %s %s", DEL_EDGE, random(),
+	return send_request(c, "%d %x %s %s", DEL_EDGE, rand(),
 						e->from->name, e->to->name);
 }
 
@@ -210,6 +218,17 @@ bool del_edge_h(connection_t *c)
 	/* Lookup nodes */
 
 	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 */
+		ifdebug(PROTOCOL) logger(LOG_WARNING,
+		   _("Ignoring indirect %s from %s (%s)"),
+		   "DEL_EDGE", c->name, c->hostname);
+		return true;
+	}
 
 	if(!from) {
 		ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
@@ -217,17 +236,12 @@ bool del_edge_h(connection_t *c)
 		return true;
 	}
 
-	to = lookup_node(to_name);
-
 	if(!to) {
 		ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
 				   "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
-	if(c->status.opaque && from != myself && from != c->node && to != myself && to != c->node)
-		return false;
-
 	/* Check if edge exists */
 
 	e = lookup_edge(from, to);
@@ -247,7 +261,7 @@ bool del_edge_h(connection_t *c)
 
 	/* Tell the rest about the deleted edge */
 
-	if(!c->status.opaque)
+	if(!tunnelserver)
 		forward_request(c);
 
 	/* Delete the edge */
@@ -263,7 +277,8 @@ bool del_edge_h(connection_t *c)
 	if(!to->status.reachable) {
 		e = lookup_edge(to, myself);
 		if(e) {
-			send_del_edge(broadcast, e);
+			if(!tunnelserver)
+				send_del_edge(broadcast, e);
 			edge_del(e);
 		}
 	}