X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=89ed901d1979b0e04e5a865dc18deb78a2e2700f;hb=8c5bd53b91c720acf34d770e0f09d2b207b068eb;hp=0626cda94d66280309725766174a6cc6a6b701e9;hpb=ba799a101d57c55d4cbf602511aa24c32a5b735e;p=meshlink

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 0626cda9..89ed901d 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -33,6 +33,8 @@
 #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;
@@ -40,7 +42,7 @@ bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
 	sockaddr2str(&e->address, &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->dclass, e->to->name, address, port, e->to->dclass,
+					 e->from->name, e->from->devclass, e->to->name, address, port, e->to->devclass,
 					 e->options, e->weight);
 	free(address);
 	free(port);
@@ -52,17 +54,17 @@ 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_dclass;
+	int from_devclass;
 	char to_name[MAX_STRING_SIZE];
 	char to_address[MAX_STRING_SIZE];
 	char to_port[MAX_STRING_SIZE];
-	int to_dclass;
+	int to_devclass;
 	sockaddr_t address;
 	uint32_t options;
 	int weight;
 
 	if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %x %d",
-			  from_name, &from_dclass, to_name, to_address, to_port, &to_dclass, &options, &weight) != 6) {
+			  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;
@@ -76,6 +78,20 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		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;
 
@@ -87,17 +103,21 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	if(!from) {
 		from = new_node();
 		from->name = xstrdup(from_name);
-		from->dclass = from_dclass;
 		node_add(mesh, from);
 	}
 
+	from->devclass = from_devclass;
+	node_write_devclass(mesh, from);
+
 	if(!to) {
 		to = new_node();
 		to->name = xstrdup(to_name);
-		to->dclass = to_dclass;
 		node_add(mesh, to);
 	}
 
+	to->devclass = to_devclass;
+	node_write_devclass(mesh, to);
+
 	/* Convert addresses */
 
 	address = str2sockaddr(to_address, to_port);