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;
}
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)) {
+ 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)) {
// 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++) {
+ for(uint32_t i = 0; i < MAX_RECENT; 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++) {
+ if(i < MAX_RECENT - known_count) {
+ n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+ } else {
+ packmsg_skip_element(&in);
+ }
}
- for(uint32_t i = 0; i < count; i++) {
- n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+ time_t last_reachable = packmsg_get_int64(&in);
+ time_t last_unreachable = packmsg_get_int64(&in);
+
+ if(!n->last_reachable) {
+ n->last_reachable = last_reachable;
}
+ if(!n->last_unreachable) {
+ n->last_unreachable = last_unreachable;
+ }
config_free(&config);
return true;
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);
uint32_t count = packmsg_get_array(&in);
- if(count > 5) {
- count = 5;
- }
-
for(uint32_t i = 0; i < count; i++) {
- n->recent[i] = packmsg_get_sockaddr(&in);
+ if(i < MAX_RECENT) {
+ n->recent[i] = packmsg_get_sockaddr(&in);
+ } else {
+ packmsg_skip_element(&in);
+ }
}
+ n->last_reachable = packmsg_get_int64(&in);
+ n->last_unreachable = packmsg_get_int64(&in);
+
return packmsg_done(&in);
}
uint32_t count = 0;
- for(uint32_t i = 0; i < 5; i++) {
+ for(uint32_t i = 0; i < MAX_RECENT; i++) {
if(n->recent[i].sa.sa_family) {
count++;
} else {
packmsg_add_sockaddr(&out, &n->recent[i]);
}
+ packmsg_add_int64(&out, n->last_reachable);
+ packmsg_add_int64(&out, n->last_unreachable);
+
if(!packmsg_output_ok(&out)) {
+ meshlink_errno = MESHLINK_EINTERNAL;
return false;
}
config_t config = {buf, packmsg_output_size(&out, buf)};
- return config_write(mesh, "current", n->name, &config, mesh->config_key);
+
+ if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+ call_error_cb(mesh, MESHLINK_ESTORAGE);
+ return false;
+ }
+
+ return true;
}
static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
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;
mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+ memcpy(&mesh->listen_socket[mesh->listen_sockets].broadcast_sa, aip->ai_addr, aip->ai_addrlen);
+
+ if(aip->ai_family == AF_INET6) {
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x0] = 0xff;
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x1] = 0x02;
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0xf] = 0x01;
+ } else {
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in.sin_addr.s_addr = 0xffffffff;
+ }
+
mesh->listen_sockets++;
success = true;
}
/* Done */
mesh->self->nexthop = mesh->self;
- mesh->self->status.reachable = true;
- mesh->self->last_state_change = mesh->loop.now.tv_sec;
node_add(mesh, mesh->self);
- graph(mesh);
-
- config_scan_all(mesh, "current", "hosts", load_node, NULL);
+ if(!config_scan_all(mesh, "current", "hosts", load_node, NULL)) {
+ logger(mesh, MESHLINK_WARNING, "Could not scan all host config files");
+ }
/* Open sockets */
/* Done. */
mesh->last_config_check = mesh->loop.now.tv_sec;
+ mesh->last_unreachable = mesh->loop.now.tv_sec;
return true;
}
init_edges(mesh);
init_requests(mesh);
- mesh->pinginterval = 60;
- mesh->pingtimeout = 5;
-
if(!setup_myself(mesh)) {
return false;
}