Remove unused functions, and make more functions static.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index ccfaacce0bb1e9e33f345a991240b0de09b73017..e79550327d1ec5bf15cdc79a4f03a4bda6a3f5ad 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -53,7 +53,7 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
        const char *name;
        uint32_t len = packmsg_get_str_raw(in, &name);
 
-       if(len != strlen(n->name) || strncmp(name, n->name, len)) {
+       if(len != strlen(n->name) || !name || strncmp(name, n->name, len)) {
                config_free(config);
                return false;
        }
@@ -85,11 +85,11 @@ bool node_read_partial(meshlink_handle_t *mesh, node_t *n) {
                }
        }
 
-       int32_t devclass = packmsg_get_int32(&in);
+       dev_class_t devclass = packmsg_get_int32(&in);
        bool blacklisted = packmsg_get_bool(&in);
        config_free(&config);
 
-       if(!packmsg_input_ok(&in) || devclass < 0 || devclass > _DEV_CLASS_MAX) {
+       if(!packmsg_input_ok(&in) || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
                return false;
        }
 
@@ -453,9 +453,6 @@ bool setup_network(meshlink_handle_t *mesh) {
        init_edges(mesh);
        init_requests(mesh);
 
-       mesh->pinginterval = 60;
-       mesh->pingtimeout = 5;
-
        if(!setup_myself(mesh)) {
                return false;
        }