X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=5949a38e7bea336fdbdcb1ca1dd994a29abb6d61;hp=d81fc8780ec33176cf3d698c47fa5c24b1230a85;hb=762cc2d2797d62ab593ea64d8ceeb4fe96be2a0d;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index d81fc878..5949a38e 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -17,37 +17,28 @@
     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.17 2003/07/12 17:41:47 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.21 2003/08/28 15:27:12 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "conf.h"
-#include "net.h"
-#include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
 #include "connection.h"
-#include "node.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
+#include "meta.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
-#include "system.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();
@@ -63,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;
@@ -81,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 */
 
@@ -133,7 +124,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);
@@ -141,7 +132,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);
@@ -150,7 +141,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();
@@ -169,10 +160,10 @@ int add_edge_h(connection_t *c)
 
 	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();
 
@@ -180,7 +171,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];
@@ -192,25 +183,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 */
 
@@ -219,7 +210,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);
@@ -227,7 +218,7 @@ 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;
 	}
 
 	/* Check if edge exists */
@@ -237,14 +228,14 @@ 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 */
@@ -259,5 +250,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;
 }