uint32_t version = packmsg_get_uint32(in);
if(version != MESHLINK_CONFIG_VERSION) {
+ logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
config_free(config);
return false;
}
uint32_t len = packmsg_get_str_raw(in, &name);
if(len != strlen(n->name) || !name || strncmp(name, n->name, len)) {
+ logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
config_free(config);
return false;
}
return true;
}
-/// Read device class, blacklist status and submesh from a host config file. Used at startup when reading all host config files.
-bool node_read_partial(meshlink_handle_t *mesh, node_t *n) {
- config_t config;
- packmsg_input_t in;
-
- if(!node_get_config(mesh, n, &config, &in)) {
- return false;
- }
-
- char *submesh_name = packmsg_get_str_dup(&in);
-
- if(!strcmp(submesh_name, CORE_MESH)) {
- free(submesh_name);
- n->submesh = NULL;
- } else {
- n->submesh = lookup_or_create_submesh(mesh, submesh_name);
- free(submesh_name);
-
- if(!n->submesh) {
- config_free(&config);
- return false;
- }
- }
-
- 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_COUNT) {
- return false;
- }
-
- n->devclass = devclass;
- n->status.blacklisted = blacklisted;
- return true;
-}
-
/// Read the public key from a host config file. Used whenever we need to start an SPTPS session.
bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
if(ecdsa_active(n->ecdsa)) {
const void *key;
uint32_t len = packmsg_get_bin_raw(&in, &key);
- if(len != 32) {
- return false;
- }
+ if(len) {
+ if(len != 32) {
+ return false;
+ }
- if(!ecdsa_active(n->ecdsa)) {
- n->ecdsa = ecdsa_set_public_key(key);
+ if(!ecdsa_active(n->ecdsa)) {
+ n->ecdsa = ecdsa_set_public_key(key);
+ }
}
n->canonical_address = packmsg_get_str_dup(&in);
config_t config = {buf, packmsg_output_size(&out, buf)};
if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
- call_error_cb(mesh);
+ call_error_cb(mesh, MESHLINK_ESTORAGE);
return false;
}
n = new_node();
n->name = xstrdup(name);
- if(!node_read_partial(mesh, n)) {
+ config_t config;
+ packmsg_input_t in;
+
+ if(!node_get_config(mesh, n, &config, &in)) {
free_node(n);
- return true;
+ return false;
+ }
+
+ if(!node_read_from_config(mesh, n, &config)) {
+ logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+ config_free(&config);
+ free_node(n);
+ return false;
}
+ config_free(&config);
+
node_add(mesh, n);
return true;