X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=9d8443c8e7bb8b9fa5ccbd5a3b80abfa862177c9;hp=e1e2ca01cd61973636b6d48d64dd750164107d98;hb=e3220cacb5bc79fc56167e61b7a342f88a33a479;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index e1e2ca01..9d8443c8 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -17,7 +17,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.19 2003/07/22 20:55:20 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.23 2003/11/17 15:30:18 guus Exp $
 */
 
 #include "system.h"
@@ -36,7 +36,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_add_edge(connection_t *c, edge_t *e)
+bool send_add_edge(connection_t *c, const edge_t *e)
 {
 	bool x;
 	char *address, *port;
@@ -110,6 +110,9 @@ bool add_edge_h(connection_t *c)
 		node_add(to);
 	}
 
+	if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
+		return false;
+
 	/* Convert addresses */
 
 	address = str2sockaddr(to_address, to_port);
@@ -154,7 +157,8 @@ bool add_edge_h(connection_t *c)
 
 	/* Tell the rest about the new edge */
 
-	forward_request(c);
+	if(!tunnelserver)
+		forward_request(c);
 
 	/* Run MST before or after we tell the rest? */
 
@@ -163,7 +167,7 @@ bool add_edge_h(connection_t *c)
 	return true;
 }
 
-bool send_del_edge(connection_t *c, edge_t *e)
+bool send_del_edge(connection_t *c, const edge_t *e)
 {
 	cp();
 
@@ -221,6 +225,9 @@ bool del_edge_h(connection_t *c)
 		return true;
 	}
 
+	if(tunnelserver && from != myself && from != c->node && to != myself && to != c->node)
+		return false;
+
 	/* Check if edge exists */
 
 	e = lookup_edge(from, to);
@@ -240,7 +247,8 @@ bool del_edge_h(connection_t *c)
 
 	/* Tell the rest about the deleted edge */
 
-	forward_request(c);
+	if(!tunnelserver)
+		forward_request(c);
 
 	/* Delete the edge */
 
@@ -250,5 +258,16 @@ bool del_edge_h(connection_t *c)
 
 	graph();
 
+	/* 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);
+		if(e) {
+			if(!tunnelserver)
+				send_del_edge(broadcast, e);
+			edge_del(e);
+		}
+	}
+
 	return true;
 }