Rename mesh_mutex to mutex.

[meshlink] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 12ab228f664e033dfa0f6c8480523de5d420c83f..e817114b3b8072690a21fcfbd97f9717799a4a57 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -74,7 +74,7 @@ bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, in
                s = e->to->submesh;
        }
 
-       x = send_request(mesh, c, s, "%d %x %s %d %s %s %s %s %d %s %x %d %d", ADD_EDGE, rand(),
+       x = send_request(mesh, c, s, "%d %x %s %d %s %s %s %s %d %s %x %d %d", ADD_EDGE, prng(mesh, UINT_MAX),
                         e->from->name, e->from->devclass, from_submesh, e->to->name, address, port,
                         e->to->devclass, to_submesh, OPTION_PMTU_DISCOVERY, e->weight, contradictions);
        free(address);
@@ -84,6 +84,9 @@ bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, in
 }
 
 bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+       assert(request);
+       assert(*request);
+
        edge_t *e;
        node_t *from, *to;
        char from_name[MAX_STRING_SIZE];
@@ -108,12 +111,12 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
        // Check if devclasses are valid
 
-       if(from_devclass < 0 || from_devclass > _DEV_CLASS_MAX) {
+       if(from_devclass < 0 || from_devclass >= DEV_CLASS_COUNT) {
                logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "from devclass invalid");
                return false;
        }
 
-       if(to_devclass < 0 || to_devclass > _DEV_CLASS_MAX) {
+       if(to_devclass < 0 || to_devclass >= DEV_CLASS_COUNT) {
                logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "to devclass invalid");
                return false;
        }
@@ -201,7 +204,6 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                                logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not match existing entry",
                                       "ADD_EDGE", c->name);
                                edge_del(mesh, e);
-                               graph(mesh);
                        }
                } else {
                        return true;
@@ -271,11 +273,14 @@ bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, in
                s = e->to->submesh;
        }
 
-       return send_request(mesh, c, s, "%d %x %s %s %d", DEL_EDGE, rand(),
+       return send_request(mesh, c, s, "%d %x %s %s %d", DEL_EDGE, prng(mesh, UINT_MAX),
                            e->from->name, e->to->name, contradictions);
 }
 
 bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+       assert(request);
+       assert(*request);
+
        edge_t *e;
        char from_name[MAX_STRING_SIZE];
        char to_name[MAX_STRING_SIZE];