X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=af0b2e7243d31d5b65ebe48f5e90d4cd9887cf10;hp=4552a528b1f91f1e1186cb93f4cea459ea76fed2;hb=0e59fb022c6c015a5be7ed70e0378cb011be98b5;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 4552a528..af0b2e72 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.20 2003/07/24 12:08:16 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.22 2003/11/10 22:31:53 guus Exp $
 */
 
 #include "system.h"
@@ -110,6 +110,9 @@ bool add_edge_h(connection_t *c)
 		node_add(to);
 	}
 
+	if(c->status.opaque && 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(!c->status.opaque)
+		forward_request(c);
 
 	/* Run MST before or after we tell the rest? */
 
@@ -221,6 +225,9 @@ bool del_edge_h(connection_t *c)
 		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);
@@ -240,7 +247,8 @@ bool del_edge_h(connection_t *c)
 
 	/* Tell the rest about the deleted edge */
 
-	forward_request(c);
+	if(!c->status.opaque)
+		forward_request(c);
 
 	/* Delete the edge */
 
@@ -250,5 +258,15 @@ 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) {
+			send_del_edge(broadcast, e);
+			edge_del(e);
+		}
+	}
+
 	return true;
 }