/// Helper function to start parsing a host config file
static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config, packmsg_input_t *in) {
- if(!config_read(mesh, n->name, config)) {
+ if(!config_read(mesh, "current", n->name, config, mesh->config_key)) {
return false;
}
}
}
- 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;
}
}
n->ecdsa = ecdsa_set_public_key(key);
+
+ // While we are at it, read known address information
+ if(!n->canonical_address) {
+ n->canonical_address = packmsg_get_str_dup(&in);
+ } else {
+ packmsg_skip_element(&in);
+ }
+
+ // Append any known addresses in the config file to the list we currently have
+ uint32_t known_count = 0;
+
+ for(uint32_t i = 0; i < 5; i++) {
+ if(n->recent[i].sa.sa_family) {
+ known_count++;
+ }
+ }
+
+ uint32_t count = packmsg_get_array(&in);
+
+ if(count > 5 - known_count) {
+ count = 5 - known_count;
+ }
+
+ for(uint32_t i = 0; i < count; i++) {
+ n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+ }
+
+
config_free(&config);
return true;
}
-/// Read the full host config file. Used whenever we need to start an SPTPS session.
-bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
+/// Fill in node details from a config blob.
+bool node_read_from_config(meshlink_handle_t *mesh, node_t *n, const config_t *config) {
if(n->canonical_address) {
return true;
}
- config_t config;
- packmsg_input_t in;
+ packmsg_input_t in = {config->buf, config->len};
+ uint32_t version = packmsg_get_uint32(&in);
- if(!node_get_config(mesh, n, &config, &in)) {
+ if(version != MESHLINK_CONFIG_VERSION) {
return false;
}
+ char *name = packmsg_get_str_dup(&in);
+
+ if(!name) {
+ return false;
+ }
+
+ if(n->name) {
+ if(strcmp(n->name, name)) {
+ free(name);
+ return false;
+ }
+
+ free(name);
+ } else {
+ n->name = name;
+ }
+
char *submesh_name = packmsg_get_str_dup(&in);
if(!strcmp(submesh_name, CORE_MESH)) {
}
}
- packmsg_get_int32(&in); /* devclass */
- packmsg_get_bool(&in); /* blacklisted */
+ n->devclass = packmsg_get_int32(&in);
+ n->status.blacklisted = packmsg_get_bool(&in);
const void *key;
- uint32_t len = packmsg_get_bin_raw(&in, &key); /* public key */
+ uint32_t len = packmsg_get_bin_raw(&in, &key);
if(len != 32) {
return false;
}
n->canonical_address = packmsg_get_str_dup(&in);
-
uint32_t count = packmsg_get_array(&in);
if(count > 5) {
n->recent[i] = packmsg_get_sockaddr(&in);
}
- config_free(&config);
-
return packmsg_done(&in);
}
bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
+ if(!mesh->confbase) {
+ return true;
+ }
+
uint8_t buf[4096];
packmsg_output_t out = {buf, sizeof(buf)};
packmsg_add_str(&out, n->name);
packmsg_add_str(&out, n->submesh ? n->submesh->name : CORE_MESH);
packmsg_add_int32(&out, n->devclass);
- assert(n->devclass != 3);
packmsg_add_bool(&out, n->status.blacklisted);
if(ecdsa_active(n->ecdsa)) {
}
config_t config = {buf, packmsg_output_size(&out, buf)};
- return config_write(mesh, n->name, &config);
+ return config_write(mesh, "current", n->name, &config, mesh->config_key);
}
-void load_all_nodes(meshlink_handle_t *mesh) {
- DIR *dir;
- struct dirent *ent;
- char dname[PATH_MAX];
-
- snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
- dir = opendir(dname);
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+ (void)priv;
- if(!dir) {
- logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
- return;
+ if(!check_id(name)) {
+ return true;
}
- while((ent = readdir(dir))) {
- if(!check_id(ent->d_name)) {
- continue;
- }
+ node_t *n = lookup_node(mesh, name);
- node_t *n = lookup_node(mesh, ent->d_name);
+ if(n) {
+ return true;
+ }
- if(n) {
- continue;
- }
+ n = new_node();
+ n->name = xstrdup(name);
- n = new_node();
- n->name = xstrdup(ent->d_name);
- node_read_partial(mesh, n);
- node_add(mesh, n);
+ if(!node_read_partial(mesh, n)) {
+ free_node(n);
+ return true;
}
- closedir(dir);
+ node_add(mesh, n);
+
+ return true;
}
/*
struct addrinfo *ai;
struct addrinfo hint = {
- .ai_family = addressfamily,
+ .ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
.ai_protocol = IPPROTO_TCP,
.ai_flags = AI_PASSIVE,
bool setup_myself(meshlink_handle_t *mesh) {
/* Set some defaults */
- mesh->localdiscovery = true;
- keylifetime = 3600; // TODO: check if this can be removed as well
mesh->maxtimeout = 900;
- mesh->self->options |= OPTION_PMTU_DISCOVERY;
/* Done */
mesh->self->nexthop = mesh->self;
- mesh->self->via = mesh->self;
mesh->self->status.reachable = true;
mesh->self->last_state_change = mesh->loop.now.tv_sec;
graph(mesh);
- load_all_nodes(mesh);
+ config_scan_all(mesh, "current", "hosts", load_node, NULL);
/* Open sockets */
init_edges(mesh);
init_requests(mesh);
- mesh->pinginterval = 60;
- mesh->pingtimeout = 5;
- maxoutbufsize = 10 * MTU;
-
if(!setup_myself(mesh)) {
return false;
}
exit_requests(mesh);
exit_edges(mesh);
exit_nodes(mesh);
+ exit_submeshes(mesh);
exit_connections(mesh);
- if(mesh->myport) {
- free(mesh->myport);
- }
+ free(mesh->myport);
+ mesh->myport = NULL;
+
+ mesh->self = NULL;
return;
}