/*
net_setup.c -- Setup.
- Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+ Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#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))
+ if(ecdsa_active(n->ecdsa)) {
return true;
+ }
splay_tree_t *config_tree;
char *p;
init_configuration(&config_tree);
- if(!read_host_config(mesh, config_tree, n->name))
+
+ if(!read_host_config(mesh, config_tree, n->name)) {
goto exit;
+ }
/* First, check for simple ECDSAPublicKey statement */
}
bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
- if(ecdsa_active(c->ecdsa))
+ if(ecdsa_active(c->ecdsa)) {
return true;
+ }
char *p;
if(!c->config_tree) {
init_configuration(&c->config_tree);
- if(!read_host_config(mesh, c->config_tree, c->name))
+
+ if(!read_host_config(mesh, c->config_tree, c->name)) {
return false;
+ }
}
/* First, check for simple ECDSAPublicKey statement */
mesh->self->connection->ecdsa = ecdsa_read_pem_private_key(fp);
fclose(fp);
- if(!mesh->self->connection->ecdsa)
+ if(!mesh->self->connection->ecdsa) {
logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
+ }
return mesh->self->connection->ecdsa;
}
if(fp) {
mesh->invitation_key = ecdsa_read_pem_private_key(fp);
fclose(fp);
- if(!mesh->invitation_key)
+
+ if(!mesh->invitation_key) {
logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+ }
}
return mesh->invitation_key;
char *p;
init_configuration(&config_tree);
- if(!read_host_config(mesh, config_tree, n->name))
+
+ if(!read_host_config(mesh, config_tree, n->name)) {
goto exit;
+ }
if(get_config_string(lookup_config(config_tree, "DeviceClass"), &p)) {
n->devclass = atoi(p);
free(p);
}
- if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX) {
n->devclass = _DEV_CLASS_MAX;
+ }
exit:
exit_configuration(&config_tree);
return n->devclass != 0;
}
+bool node_read_submesh(meshlink_handle_t *mesh, node_t *n) {
+
+ splay_tree_t *config_tree;
+ char *p;
+
+ init_configuration(&config_tree);
+
+ if(!read_host_config(mesh, config_tree, n->name)) {
+ goto exit;
+ }
+
+ if(get_config_string(lookup_config(config_tree, "SubMesh"), &p)) {
+ n->submesh = NULL;
+
+ for list_each(submesh_t, s, mesh->submeshes) {
+ if(!strcmp(p, s->name)) {
+ n->submesh = s;
+ break;
+ }
+ }
+
+ if(!n->submesh) {
+ n->submesh = (submesh_t *)meshlink_submesh_open(mesh, p);
+ }
+
+ free(p);
+ }
+
+exit:
+ exit_configuration(&config_tree);
+ return n->submesh != NULL;
+}
+
bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
- if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX) {
return false;
+ }
bool result = false;
set_config_int(cnf, n->devclass);
- if(!write_host_config(mesh, config_tree, n->name))
+ if(!write_host_config(mesh, config_tree, n->name)) {
+ goto fail;
+ }
+
+ result = true;
+
+fail:
+ exit_configuration(&config_tree);
+ return result;
+}
+
+bool node_write_submesh(meshlink_handle_t *mesh, node_t *n) {
+
+ if(!n->submesh) {
+ return false;
+ }
+
+ bool result = false;
+
+ splay_tree_t *config_tree;
+ init_configuration(&config_tree);
+
+ // ignore read errors; in case the file does not exist we will create it
+ read_host_config(mesh, config_tree, n->name);
+
+ config_t *cnf = lookup_config(config_tree, "SubMesh");
+
+ if(!cnf) {
+ cnf = new_config();
+ cnf->variable = xstrdup("SubMesh");
+ config_add(config_tree, cnf);
+ }
+
+ set_config_string(cnf, n->submesh->name);
+
+ if(!write_host_config(mesh, config_tree, n->name)) {
goto fail;
+ }
result = true;
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;
}
while((ent = readdir(dir))) {
- if(!check_id(ent->d_name))
+ if(!check_id(ent->d_name)) {
continue;
+ }
node_t *n = lookup_node(mesh, ent->d_name);
- if(n)
+
+ if(n) {
+ if(n == mesh->self && !n->submesh) {
+ node_read_submesh(mesh, n);
+ }
+
continue;
+ }
n = new_node();
n->name = xstrdup(ent->d_name);
node_read_devclass(mesh, n);
+ node_read_submesh(mesh, n);
node_add(mesh, n);
}
get_config_string(lookup_config(mesh->config, "Name"), &name);
- if(!name)
+ if(!name) {
return NULL;
+ }
if(!check_id(name)) {
logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
if(address) {
char *space = strchr(address, ' ');
+
if(space) {
*space++ = 0;
port = space;
}
- if(!strcmp(address, "*"))
+ if(!strcmp(address, "*")) {
*address = 0;
+ }
}
- struct addrinfo *ai, hint = {0};
- 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 = addressfamily,
+ .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);
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;
+ int port = check_port(mesh);
+
+ if(port == 0) {
+ return false;
+ }
+
+ xasprintf(&mesh->myport, "%d", port);
}
mesh->self->connection->options = 0;
mesh->self->options |= PROT_MINOR << 24;
- if(!read_ecdsa_private_key(mesh))
+ 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)
+
+ 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))
+ if(!setup_myself_reloadable(mesh)) {
return false;
+ }
/* Compression */
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, address, NULL)) {
return false;
- } else
+ }
+ } else {
return false;
+ }
}
if(!mesh->listen_sockets) {
*/
bool setup_network(meshlink_handle_t *mesh) {
init_connections(mesh);
+ init_submeshes(mesh);
init_nodes(mesh);
init_edges(mesh);
init_requests(mesh);
mesh->pingtimeout = 5;
maxoutbufsize = 10 * MTU;
- if(!setup_myself(mesh))
+ if(!setup_myself(mesh)) {
return false;
+ }
return true;
}
}
}
- if(mesh->outgoings)
+ if(mesh->outgoings) {
list_delete_list(mesh->outgoings);
+ }
if(mesh->self && mesh->self->connection) {
terminate_connection(mesh, mesh->self->connection, false);
exit_nodes(mesh);
exit_connections(mesh);
- if(mesh->myport) free(mesh->myport);
+ if(mesh->myport) {
+ free(mesh->myport);
+ }
return;
}
projects / meshlink / blobdiff