X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=89ed901d1979b0e04e5a865dc18deb78a2e2700f;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=3b89cdec9bd438cf8169e5f310de91b796ca1714;hpb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;p=meshlink

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 3b89cdec..89ed901d 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -33,14 +33,16 @@
 #include "utils.h"
 #include "xalloc.h"
 
+extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
+
 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(mesh, c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
-					 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);
@@ -52,16 +54,18 @@ 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;
 	uint32_t options;
 	int weight;
 
-	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
-			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
-		logger(DEBUG_ALWAYS, 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 false;
 	}
@@ -69,11 +73,25 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Check if names are valid */
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
 			   c->hostname, "invalid name");
 		return false;
 	}
 
+	// 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(mesh, request))
 		return true;
 
@@ -88,12 +106,17 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		node_add(mesh, from);
 	}
 
+	from->devclass = from_devclass;
+	node_write_devclass(mesh, from);
+
 	if(!to) {
 		to = new_node();
 		to->name = xstrdup(to_name);
 		node_add(mesh, to);
 	}
 
+	to->devclass = to_devclass;
+	node_write_devclass(mesh, to);
 
 	/* Convert addresses */
 
@@ -106,12 +129,12 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	if(e) {
 		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
 			if(from == mesh->self) {
-				logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
+				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(mesh, c, e);
 				return true;
 			} else {
-				logger(DEBUG_PROTOCOL, 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(mesh, e);
 				graph(mesh);
@@ -119,7 +142,7 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		} else
 			return true;
 	} else if(from == mesh->self) {
-		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
+		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();
@@ -161,7 +184,7 @@ bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	node_t *from, *to;
 
 	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
 			   c->hostname);
 		return false;
 	}
@@ -169,7 +192,7 @@ bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Check if names are valid */
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
 			   c->hostname, "invalid name");
 		return false;
 	}
@@ -183,13 +206,13 @@ bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	to = lookup_node(mesh, to_name);
 
 	if(!from) {
-		logger(DEBUG_PROTOCOL, 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 true;
 	}
 
 	if(!to) {
-		logger(DEBUG_PROTOCOL, 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 true;
 	}
@@ -199,13 +222,13 @@ bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	e = lookup_edge(from, to);
 
 	if(!e) {
-		logger(DEBUG_PROTOCOL, 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 true;
 	}
 
 	if(e->from == mesh->self) {
-		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
+		logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself",
 				   "DEL_EDGE", c->name, c->hostname);
 		mesh->contradicting_del_edge++;
 		send_add_edge(mesh, c, e);    /* Send back a correction */