#include "meshlink_internal.h"
#include "net.h"
#include "netutl.h"
+#include "packmsg.h"
#include "protocol.h"
#include "route.h"
#include "utils.h"
#include "xalloc.h"
+#include "submesh.h"
-bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
- if(ecdsa_active(n->ecdsa))
- return true;
+/// 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, "current", n->name, config, mesh->config_key)) {
+ return false;
+ }
+
+ in->ptr = config->buf;
+ in->len = config->len;
- splay_tree_t *config_tree;
- char *p;
+ uint32_t version = packmsg_get_uint32(in);
- init_configuration(&config_tree);
- if(!read_host_config(mesh, config_tree, n->name))
- goto exit;
+ if(version != MESHLINK_CONFIG_VERSION) {
+ logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+ config_free(config);
+ return false;
+ }
- /* First, check for simple ECDSAPublicKey statement */
+ const char *name;
+ uint32_t len = packmsg_get_str_raw(in, &name);
- if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
- n->ecdsa = ecdsa_set_base64_public_key(p);
- free(p);
+ 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;
}
-exit:
- exit_configuration(&config_tree);
- return n->ecdsa;
+ return true;
}
-bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
- if(ecdsa_active(c->ecdsa))
+/// 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)) {
return true;
+ }
- char *p;
+ config_t config;
+ packmsg_input_t in;
- if(!c->config_tree) {
- init_configuration(&c->config_tree);
- if(!read_host_config(mesh, c->config_tree, c->name))
- return false;
+ if(!node_get_config(mesh, n, &config, &in)) {
+ return false;
}
- /* First, check for simple ECDSAPublicKey statement */
+ packmsg_skip_element(&in); /* submesh */
+ packmsg_get_int32(&in); /* devclass */
+ packmsg_get_bool(&in); /* blacklisted */
+
+ const void *key;
+ uint32_t len = packmsg_get_bin_raw(&in, &key);
- if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
- c->ecdsa = ecdsa_set_base64_public_key(p);
- free(p);
- return c->ecdsa;
+ if(len != 32) {
+ config_free(&config);
+ return false;
}
- return false;
-}
+ n->ecdsa = ecdsa_set_public_key(key);
-bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
- FILE *fp;
- char filename[PATH_MAX];
+ // 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);
+ }
- snprintf(filename, PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
- fp = fopen(filename, "rb");
+ // Append any known addresses in the config file to the list we currently have
+ uint32_t known_count = 0;
- if(!fp) {
- logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
- return false;
+ for(uint32_t i = 0; i < MAX_RECENT; i++) {
+ if(n->recent[i].sa.sa_family) {
+ known_count++;
+ }
}
- mesh->self->connection->ecdsa = ecdsa_read_pem_private_key(fp);
- fclose(fp);
+ uint32_t count = packmsg_get_array(&in);
+
+ 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);
+ }
+ }
+
+ 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(!mesh->self->connection->ecdsa)
- logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
+ if(!n->last_unreachable) {
+ n->last_unreachable = last_unreachable;
+ }
- return mesh->self->connection->ecdsa;
+ config_free(&config);
+ return true;
}
-static bool read_invitation_key(meshlink_handle_t *mesh) {
- FILE *fp;
- char filename[PATH_MAX];
+/// 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;
+ }
+
+ packmsg_input_t in = {config->buf, config->len};
+ uint32_t version = packmsg_get_uint32(&in);
+
+ if(version != MESHLINK_CONFIG_VERSION) {
+ return false;
+ }
- if(mesh->invitation_key) {
- ecdsa_free(mesh->invitation_key);
- mesh->invitation_key = NULL;
+ char *name = packmsg_get_str_dup(&in);
+
+ if(!name) {
+ return false;
}
- snprintf(filename, PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+ if(n->name) {
+ if(strcmp(n->name, name)) {
+ free(name);
+ return false;
+ }
- fp = fopen(filename, "rb");
+ free(name);
+ } else {
+ n->name = name;
+ }
- if(fp) {
- mesh->invitation_key = ecdsa_read_pem_private_key(fp);
- fclose(fp);
- if(!mesh->invitation_key)
- logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+ 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) {
+ return false;
+ }
}
- return mesh->invitation_key;
-}
+ 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);
-bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) {
+ if(len) {
+ if(len != 32) {
+ return false;
+ }
- splay_tree_t *config_tree;
- char *p;
+ if(!ecdsa_active(n->ecdsa)) {
+ n->ecdsa = ecdsa_set_public_key(key);
+ }
+ }
- init_configuration(&config_tree);
- if(!read_host_config(mesh, config_tree, n->name))
- goto exit;
+ n->canonical_address = packmsg_get_str_dup(&in);
+ uint32_t count = packmsg_get_array(&in);
- if(get_config_string(lookup_config(config_tree, "DeviceClass"), &p)) {
- n->devclass = atoi(p);
- free(p);
+ for(uint32_t i = 0; i < count; i++) {
+ if(i < MAX_RECENT) {
+ n->recent[i] = packmsg_get_sockaddr(&in);
+ } else {
+ packmsg_skip_element(&in);
+ }
}
- if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
- n->devclass = _DEV_CLASS_MAX;
+ n->last_reachable = packmsg_get_int64(&in);
+ n->last_unreachable = packmsg_get_int64(&in);
-exit:
- exit_configuration(&config_tree);
- return n->devclass != 0;
+ return packmsg_done(&in);
}
-bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
+bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
+ if(!mesh->confbase) {
+ return true;
+ }
- if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
- return false;
+ uint8_t buf[4096];
+ packmsg_output_t out = {buf, sizeof(buf)};
- bool result = false;
+ packmsg_add_uint32(&out, MESHLINK_CONFIG_VERSION);
+ packmsg_add_str(&out, n->name);
+ packmsg_add_str(&out, n->submesh ? n->submesh->name : CORE_MESH);
+ packmsg_add_int32(&out, n->devclass);
+ packmsg_add_bool(&out, n->status.blacklisted);
- splay_tree_t *config_tree;
- init_configuration(&config_tree);
+ if(ecdsa_active(n->ecdsa)) {
+ packmsg_add_bin(&out, ecdsa_get_public_key(n->ecdsa), 32);
+ } else {
+ packmsg_add_bin(&out, "", 0);
+ }
- // ignore read errors; in case the file does not exist we will create it
- read_host_config(mesh, config_tree, n->name);
+ packmsg_add_str(&out, n->canonical_address ? n->canonical_address : "");
- config_t *cnf = lookup_config(config_tree, "DeviceClass");
+ uint32_t count = 0;
- if(!cnf) {
- cnf = new_config();
- cnf->variable = xstrdup("DeviceClass");
- config_add(config_tree, cnf);
+ for(uint32_t i = 0; i < MAX_RECENT; i++) {
+ if(n->recent[i].sa.sa_family) {
+ count++;
+ } else {
+ break;
+ }
}
- set_config_int(cnf, n->devclass);
+ packmsg_add_array(&out, count);
- if(!write_host_config(mesh, config_tree, n->name))
- goto fail;
+ for(uint32_t i = 0; i < count; i++) {
+ packmsg_add_sockaddr(&out, &n->recent[i]);
+ }
- result = true;
+ packmsg_add_int64(&out, n->last_reachable);
+ packmsg_add_int64(&out, n->last_unreachable);
-fail:
- exit_configuration(&config_tree);
- return result;
-}
+ if(!packmsg_output_ok(&out)) {
+ meshlink_errno = MESHLINK_EINTERNAL;
+ return false;
+ }
-void load_all_nodes(meshlink_handle_t *mesh) {
- DIR *dir;
- struct dirent *ent;
- char dname[PATH_MAX];
+ config_t config = {buf, packmsg_output_size(&out, buf)};
- snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
- dir = opendir(dname);
- if(!dir) {
- logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
- return;
+ if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+ call_error_cb(mesh, MESHLINK_ESTORAGE);
+ return false;
}
- while((ent = readdir(dir))) {
- if(!check_id(ent->d_name))
- continue;
+ return true;
+}
- node_t *n = lookup_node(mesh, ent->d_name);
- if(n)
- continue;
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+ (void)priv;
- n = new_node();
- n->name = xstrdup(ent->d_name);
- node_read_devclass(mesh, n);
- node_add(mesh, n);
+ if(!check_id(name)) {
+ return true;
}
- closedir(dir);
-}
+ node_t *n = lookup_node(mesh, name);
+ if(n) {
+ return true;
+ }
-char *get_name(meshlink_handle_t *mesh) {
- char *name = NULL;
+ n = new_node();
+ n->name = xstrdup(name);
- get_config_string(lookup_config(mesh->config, "Name"), &name);
+ config_t config;
+ packmsg_input_t in;
- if(!name)
- return NULL;
+ if(!node_get_config(mesh, n, &config, &in)) {
+ free_node(n);
+ return false;
+ }
- if(!check_id(name)) {
- logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
- free(name);
- return NULL;
+ 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;
}
- return name;
-}
+ config_free(&config);
-bool setup_myself_reloadable(meshlink_handle_t *mesh) {
- mesh->localdiscovery = true;
- keylifetime = 3600; // TODO: check if this can be removed as well
- mesh->maxtimeout = 900;
- mesh->self->options |= OPTION_PMTU_DISCOVERY;
-
- read_invitation_key(mesh);
+ node_add(mesh, n);
return true;
}
if(address) {
char *space = strchr(address, ' ');
+
if(space) {
*space++ = 0;
port = space;
}
- if(!strcmp(address, "*"))
+ if(!strcmp(address, "*")) {
*address = 0;
+ }
}
- struct addrinfo *ai, hint = {};
- hint.ai_family = addressfamily;
- hint.ai_socktype = SOCK_STREAM;
- hint.ai_protocol = IPPROTO_TCP;
- hint.ai_flags = AI_PASSIVE;
+ struct addrinfo *ai;
+
+ struct addrinfo hint = {
+ .ai_family = AF_UNSPEC,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
+ .ai_flags = AI_PASSIVE,
+ };
int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+
free(address);
if(err || !ai) {
break;
}
- if(found)
+ if(found) {
continue;
+ }
if(mesh->listen_sockets >= MAXSOCKETS) {
logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
- if(tcp_fd < 0)
+ if(tcp_fd < 0) {
continue;
+ }
int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
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;
}
Configure node_t mesh->self and set up the local sockets (listen only)
*/
bool setup_myself(meshlink_handle_t *mesh) {
- char *name;
- char *address = NULL;
+ /* Set some defaults */
- if(!(name = get_name(mesh))) {
- logger(mesh, MESHLINK_ERROR, "Name for MeshLink instance required!");
- return false;
- }
-
- mesh->self = new_node();
- mesh->self->connection = new_connection();
- mesh->self->name = name;
- mesh->self->devclass = mesh->devclass;
- mesh->self->connection->name = xstrdup(name);
- read_host_config(mesh, mesh->config, name);
-
- if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) {
- logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!");
- return false;
- }
-
- mesh->self->connection->options = 0;
- mesh->self->connection->protocol_major = PROT_MAJOR;
- mesh->self->connection->protocol_minor = PROT_MINOR;
-
- mesh->self->options |= PROT_MINOR << 24;
-
- if(!read_ecdsa_private_key(mesh))
- return false;
-
- /* Ensure mesh->myport is numeric */
-
- if(!atoi(mesh->myport)) {
- struct addrinfo *ai = str2addrinfo("localhost", mesh->myport, SOCK_DGRAM);
- sockaddr_t sa;
- if(!ai || !ai->ai_addr)
- return false;
- free(mesh->myport);
- memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
- sockaddr2str(&sa, NULL, &mesh->myport);
- }
-
- /* Check some options */
-
- if(!setup_myself_reloadable(mesh))
- return false;
-
- /* Compression */
-
- // TODO: drop compression in the packet layer?
- mesh->self->incompression = 0;
- mesh->self->connection->outcompression = 0;
+ mesh->maxtimeout = 900;
/* 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;
- node_write_devclass(mesh, mesh->self);
node_add(mesh, mesh->self);
- graph(mesh);
-
- load_all_nodes(mesh);
+ if(!config_scan_all(mesh, "current", "hosts", load_node, NULL)) {
+ logger(mesh, MESHLINK_WARNING, "Could not scan all host config files");
+ }
/* Open sockets */
mesh->listen_sockets = 0;
- if(!add_listen_address(mesh, address, NULL)) {
+ if(!add_listen_address(mesh, NULL, NULL)) {
if(strcmp(mesh->myport, "0")) {
logger(mesh, MESHLINK_INFO, "Could not bind to port %s, asking OS to choose one for us", mesh->myport);
free(mesh->myport);
mesh->myport = strdup("0");
- if(!mesh->myport)
+
+ if(!mesh->myport) {
return false;
- if(!add_listen_address(mesh, address, NULL))
+ }
+
+ if(!add_listen_address(mesh, NULL, NULL)) {
return false;
- } else
+ }
+ } else {
return false;
+ }
}
if(!mesh->listen_sockets) {
/* Done. */
mesh->last_config_check = mesh->loop.now.tv_sec;
+ mesh->last_unreachable = mesh->loop.now.tv_sec;
return true;
}
*/
bool setup_network(meshlink_handle_t *mesh) {
init_connections(mesh);
+ init_submeshes(mesh);
init_nodes(mesh);
init_edges(mesh);
init_requests(mesh);
- mesh->pinginterval = 60;
- mesh->pingtimeout = 5;
- maxoutbufsize = 10 * MTU;
-
- if(!setup_myself(mesh))
+ if(!setup_myself(mesh)) {
return false;
+ }
return true;
}
}
}
- if(mesh->outgoings)
- list_delete_list(mesh->outgoings);
-
- if(mesh->self && mesh->self->connection) {
- terminate_connection(mesh, mesh->self->connection, false);
- free_connection(mesh->self->connection);
- }
-
for(int i = 0; i < mesh->listen_sockets; i++) {
io_del(&mesh->loop, &mesh->listen_socket[i].tcp);
io_del(&mesh->loop, &mesh->listen_socket[i].udp);
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;
}