X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=82254593e36aa0a5982ad447dae801c5baa76f89;hb=a021bf25db676353b8ea50740ce343962c3dddb9;hp=d72257b75845f600a007fa5c85a99942740d19d7;hpb=87b60ec7e32d14ce0ebe20bb19a342d9e0aac70a;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index d72257b7..82254593 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -36,6 +36,8 @@
 #include "utils.h"
 #include "xalloc.h"
 #include "ed25519/sha512.h"
+    
+extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
 
 static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 	switch(mesh->proxytype) {
@@ -358,7 +360,7 @@ bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY)
 		c->options |= OPTION_PMTU_DISCOVERY;
 
-	return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->dclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
+	return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
 }
 
 static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
@@ -373,16 +375,22 @@ static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
 bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char hisport[MAX_STRING_SIZE];
 	char *hisaddress;
-	int dclass;
+	int devclass;
 	uint32_t options;
 	node_t *n;
 
-	if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &dclass, &options) != 3) {
+	if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &devclass, &options) != 3) {
 		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ACK", c->name,
 			   c->hostname);
 		return false;
 	}
 
+	if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ACK", c->name,
+			   c->hostname, "devclass invalid");
+		return false;
+	}
+
 	/* Check if we already have a node_t for him */
 
 	n = lookup_node(mesh, c->name);
@@ -411,8 +419,8 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		}
 	}
 
-	n->dclass = dclass;
-	node_write_dclass(mesh, n);
+	n->devclass = devclass;
+	node_write_devclass(mesh, n);
 
 	n->connection = c;
 	c->node = n;
@@ -442,7 +450,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	sockaddr2str(&c->address, &hisaddress, NULL);
 	c->edge->address = str2sockaddr(hisaddress, hisport);
 	free(hisaddress);
-	c->edge->weight = weight_from_dclass(dclass);
+	c->edge->weight = dev_class_traits[devclass].edge_weight;
 	c->edge->connection = c;
 	c->edge->options = c->options;