Add assert() calls to the library.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index c7d6882984e8239f7f30345fa54bb04aae2a7ebd..12e81e4c7063c4d32096c22210536dddc6f27075 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -248,6 +248,9 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 }
 
 bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+       assert(request);
+       assert(*request);
+
        char name[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
@@ -329,7 +332,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        }
 
        if(n->status.blacklisted) {
-               logger(mesh, MESHLINK_EPEER, "Peer %s is blacklisted", c->name);
+               logger(mesh, MESHLINK_WARNING, "Peer %s is blacklisted", c->name);
                return false;
        }
 
@@ -385,6 +388,9 @@ static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
 }
 
 bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+       assert(request);
+       assert(*request);
+
        char hisport[MAX_STRING_SIZE];
        int devclass;
        uint32_t options;
@@ -395,7 +401,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 +456,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);