Make ping intervals and timeouts configurable for each device class.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index c7d6882984e8239f7f30345fa54bb04aae2a7ebd..1193b43ce6c3b09df65a995db5a783f55f752f31 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -395,7 +395,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                return false;
        }
 
-       if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+       if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
                logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
                return false;
        }
@@ -450,13 +450,13 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
        /* Create an edge_t for this connection */
 
-       assert(devclass >= 0 && devclass <= _DEV_CLASS_MAX);
+       assert(devclass >= 0 && devclass < DEV_CLASS_COUNT);
 
        c->edge = new_edge();
        c->edge->from = mesh->self;
        c->edge->to = n;
        sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
-       c->edge->weight = dev_class_traits[devclass].edge_weight;
+       c->edge->weight = mesh->dev_class_traits[devclass].edge_weight;
        c->edge->connection = c;
 
        edge_add(mesh, c->edge);