X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=89ed901d1979b0e04e5a865dc18deb78a2e2700f;hb=a021bf25db676353b8ea50740ce343962c3dddb9;hp=75b49950dcd2632fb8d8e3c27e7225c37fe5b0d2;hpb=e449d94caef963809d417f16497f6f978e10d731;p=meshlink

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 75b49950..89ed901d 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,7 +1,6 @@
 /*
     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) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -13,21 +12,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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 $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
@@ -36,17 +33,16 @@
 #include "utils.h"
 #include "xalloc.h"
 
-int send_add_edge(connection_t *c, edge_t *e)
-{
-	int x;
-	char *address, *port;
+extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
 
-	cp();
+bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
+	bool x;
+	char *address, *port;
 
 	sockaddr2str(&e->address, &address, &port);
 
-	x = send_request(c, "%d %lx %s %s %s %s %lx %d", ADD_EDGE, random(),
-					 e->from->name, e->to->name, address, port,
+	x = send_request(mesh, c, "%d %x %s %d %s %s %s %d %x %d", ADD_EDGE, rand(),
+					 e->from->name, e->from->devclass, e->to->name, address, port, e->to->devclass,
 					 e->options, e->weight);
 	free(address);
 	free(port);
@@ -54,62 +50,74 @@ int send_add_edge(connection_t *c, edge_t *e)
 	return x;
 }
 
-int add_edge_h(connection_t *c)
-{
+bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	edge_t *e;
 	node_t *from, *to;
 	char from_name[MAX_STRING_SIZE];
+	int from_devclass;
 	char to_name[MAX_STRING_SIZE];
 	char to_address[MAX_STRING_SIZE];
 	char to_port[MAX_STRING_SIZE];
+	int to_devclass;
 	sockaddr_t address;
-	long int options;
+	uint32_t options;
 	int weight;
 
-	cp();
-
-	if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
-			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name,
+	if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %x %d",
+			  from_name, &from_devclass, to_name, to_address, to_port, &to_devclass, &options, &weight) != 8) {
+		logger(mesh, MESHLINK_ERROR, "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)) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name,
-			   c->hostname, _("invalid name"));
-		return -1;
+	if(!check_id(from_name) || !check_id(to_name)) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
+			   c->hostname, "invalid name");
+		return false;
 	}
 
-	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;
+	// Check if devclasses are valid
+
+	if(from_devclass < 0 || from_devclass > _DEV_CLASS_MAX) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
+			   c->hostname, "from devclass invalid");
+		return false;
+	}
+
+	if(to_devclass < 0 || to_devclass > _DEV_CLASS_MAX) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
+			   c->hostname, "to devclass invalid");
+		return false;
 	}
 
-	if(seen_request(c->buffer))
-		return 0;
+	if(seen_request(mesh, request))
+		return true;
 
 	/* Lookup nodes */
 
-	from = lookup_node(from_name);
+	from = lookup_node(mesh, from_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!from) {
 		from = new_node();
 		from->name = xstrdup(from_name);
-		node_add(from);
+		node_add(mesh, from);
 	}
 
-	to = lookup_node(to_name);
+	from->devclass = from_devclass;
+	node_write_devclass(mesh, from);
 
 	if(!to) {
 		to = new_node();
 		to->name = xstrdup(to_name);
-		node_add(to);
+		node_add(mesh, to);
 	}
 
+	to->devclass = to_devclass;
+	node_write_devclass(mesh, to);
+
 	/* Convert addresses */
 
 	address = str2sockaddr(to_address, to_port);
@@ -120,28 +128,29 @@ int add_edge_h(connection_t *c)
 
 	if(e) {
 		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
-			if(from == myself) {
-				ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"),
+			if(from == mesh->self) {
+				logger(mesh, MESHLINK_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;
+				send_add_edge(mesh, c, e);
+				return true;
 			} else {
-				ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"),
+				logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) which does not match existing entry",
 						   "ADD_EDGE", c->name, c->hostname);
-				edge_del(e);
-				graph();
+				edge_del(mesh, e);
+				graph(mesh);
 			}
 		} else
-			return 0;
-	} else if(from == myself) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"),
+			return true;
+	} else if(from == mesh->self) {
+		logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself which does not exist",
 				   "ADD_EDGE", c->name, c->hostname);
+		mesh->contradicting_add_edge++;
 		e = new_edge();
 		e->from = from;
 		e->to = to;
-		send_del_edge(c, e);
+		send_del_edge(mesh, c, e);
 		free_edge(e);
-		return 0;
+		return true;
 	}
 
 	e = new_edge();
@@ -150,75 +159,62 @@ int add_edge_h(connection_t *c)
 	e->address = address;
 	e->options = options;
 	e->weight = weight;
-	edge_add(e);
+	edge_add(mesh, e);
 
 	/* Tell the rest about the new edge */
 
-	forward_request(c);
+	forward_request(mesh, c, request);
 
 	/* Run MST before or after we tell the rest? */
 
-	graph();
+	graph(mesh);
 
-	return 0;
+	return true;
 }
 
-int send_del_edge(connection_t *c, edge_t *e)
-{
-	cp();
-
-	return send_request(c, "%d %lx %s %s", DEL_EDGE, random(),
+bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
+	return send_request(mesh, c, "%d %x %s %s", DEL_EDGE, rand(),
 						e->from->name, e->to->name);
 }
 
-int del_edge_h(connection_t *c)
-{
+bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	edge_t *e;
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
 
-	cp();
-
-	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,
+	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
+		logger(mesh, MESHLINK_ERROR, "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)) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name,
-			   c->hostname, _("invalid name"));
-		return -1;
-	}
-
-	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;
+	if(!check_id(from_name) || !check_id(to_name)) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
+			   c->hostname, "invalid name");
+		return false;
 	}
 
-	if(seen_request(c->buffer))
-		return 0;
+	if(seen_request(mesh, request))
+		return true;
 
 	/* Lookup nodes */
 
-	from = lookup_node(from_name);
+	from = lookup_node(mesh, from_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!from) {
-		ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
+		logger(mesh, MESHLINK_ERROR, "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);
-
 	if(!to) {
-		ifdebug(PROTOCOL) logger(LOG_ERR, _("Got %s from %s (%s) which does not appear in the edge tree"),
+		logger(mesh, MESHLINK_ERROR, "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 */
@@ -226,29 +222,40 @@ int del_edge_h(connection_t *c)
 	e = lookup_edge(from, to);
 
 	if(!e) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) which does not appear in the edge tree"),
+		logger(mesh, MESHLINK_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"),
+	if(e->from == mesh->self) {
+		logger(mesh, MESHLINK_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;
+		mesh->contradicting_del_edge++;
+		send_add_edge(mesh, c, e);    /* Send back a correction */
+		return true;
 	}
 
 	/* Tell the rest about the deleted edge */
 
-	forward_request(c);
+	forward_request(mesh, c, request);
 
 	/* Delete the edge */
 
-	edge_del(e);
+	edge_del(mesh, e);
 
 	/* Run MST before or after we tell the rest? */
 
-	graph();
+	graph(mesh);
+
+	/* 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, mesh->self);
+		if(e) {
+			send_del_edge(mesh, mesh->everyone, e);
+			edge_del(mesh, e);
+		}
+	}
 
-	return 0;
+	return true;
 }