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

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 75b49950..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.18 2003/07/17 15:06:26 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.22 2003/11/10 22:31:53 guus Exp $
 */
 
 #include "system.h"
@@ -36,9 +36,9 @@
 #include "utils.h"
 #include "xalloc.h"
 
-int send_add_edge(connection_t *c, edge_t *e)
+bool send_add_edge(connection_t *c, const edge_t *e)
 {
-	int x;
+	bool x;
 	char *address, *port;
 
 	cp();
@@ -54,7 +54,7 @@ int send_add_edge(connection_t *c, edge_t *e)
 	return x;
 }
 
-int add_edge_h(connection_t *c)
+bool add_edge_h(connection_t *c)
 {
 	edge_t *e;
 	node_t *from, *to;
@@ -72,25 +72,25 @@ int add_edge_h(connection_t *c)
 			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
 			   c->hostname);
-		return -1;
+		return false;
 	}
 
 	/* Check if names are valid */
 
-	if(check_id(from_name)) {
+	if(!check_id(from_name)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
 			   c->hostname, _("invalid name"));
-		return -1;
+		return false;
 	}
 
-	if(check_id(to_name)) {
+	if(!check_id(to_name)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
 			   c->hostname, _("invalid name"));
-		return -1;
+		return false;
 	}
 
 	if(seen_request(c->buffer))
-		return 0;
+		return true;
 
 	/* Lookup nodes */
 
@@ -110,6 +110,9 @@ int 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);
@@ -124,7 +127,7 @@ int add_edge_h(connection_t *c)
 				ifdebug(PROTOCOL) logger(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);
-				return 0;
+				return true;
 			} else {
 				ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
 						   "ADD_EDGE", c->name, c->hostname);
@@ -132,7 +135,7 @@ int add_edge_h(connection_t *c)
 				graph();
 			}
 		} else
-			return 0;
+			return true;
 	} else if(from == myself) {
 		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
 				   "ADD_EDGE", c->name, c->hostname);
@@ -141,7 +144,7 @@ int add_edge_h(connection_t *c)
 		e->to = to;
 		send_del_edge(c, e);
 		free_edge(e);
-		return 0;
+		return true;
 	}
 
 	e = new_edge();
@@ -154,16 +157,17 @@ int 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? */
 
 	graph();
 
-	return 0;
+	return true;
 }
 
-int send_del_edge(connection_t *c, edge_t *e)
+bool send_del_edge(connection_t *c, const edge_t *e)
 {
 	cp();
 
@@ -171,7 +175,7 @@ int send_del_edge(connection_t *c, edge_t *e)
 						e->from->name, e->to->name);
 }
 
-int del_edge_h(connection_t *c)
+bool del_edge_h(connection_t *c)
 {
 	edge_t *e;
 	char from_name[MAX_STRING_SIZE];
@@ -183,25 +187,25 @@ int del_edge_h(connection_t *c)
 	if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE", c->name,
 			   c->hostname);
-		return -1;
+		return false;
 	}
 
 	/* Check if names are valid */
 
-	if(check_id(from_name)) {
+	if(!check_id(from_name)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
 			   c->hostname, _("invalid name"));
-		return -1;
+		return false;
 	}
 
-	if(check_id(to_name)) {
+	if(!check_id(to_name)) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
 			   c->hostname, _("invalid name"));
-		return -1;
+		return false;
 	}
 
 	if(seen_request(c->buffer))
-		return 0;
+		return true;
 
 	/* Lookup nodes */
 
@@ -210,7 +214,7 @@ int del_edge_h(connection_t *c)
 	if(!from) {
 		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 0;
+		return true;
 	}
 
 	to = lookup_node(to_name);
@@ -218,9 +222,12 @@ int del_edge_h(connection_t *c)
 	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 0;
+		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);
@@ -228,19 +235,20 @@ int del_edge_h(connection_t *c)
 	if(!e) {
 		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
 				   "DEL_EDGE", c->name, c->hostname);
-		return 0;
+		return true;
 	}
 
 	if(e->from == myself) {
 		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
 				   "DEL_EDGE", c->name, c->hostname);
 		send_add_edge(c, e);	/* Send back a correction */
-		return 0;
+		return true;
 	}
 
 	/* Tell the rest about the deleted edge */
 
-	forward_request(c);
+	if(!c->status.opaque)
+		forward_request(c);
 
 	/* Delete the edge */
 
@@ -250,5 +258,15 @@ int del_edge_h(connection_t *c)
 
 	graph();
 
-	return 0;
+	/* 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;
 }