#include "utils.h"
#include "xalloc.h"
-int autoconnect = 3;
-
bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
if(ecdsa_active(n->ecdsa))
return true;
FILE *fp;
char filename[PATH_MAX];
- snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
- fp = fopen(filename, "r");
+ snprintf(filename, PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+ fp = fopen(filename, "rb");
if(!fp) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
return false;
}
fclose(fp);
if(!mesh->self->connection->ecdsa)
- logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
return mesh->self->connection->ecdsa;
}
mesh->invitation_key = NULL;
}
- snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+ snprintf(filename, PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
- fp = fopen(filename, "r");
+ fp = fopen(filename, "rb");
if(fp) {
mesh->invitation_key = ecdsa_read_pem_private_key(fp);
fclose(fp);
if(!mesh->invitation_key)
- logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
}
return mesh->invitation_key;
}
+bool node_read_devclass(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, "DeviceClass"), &p)) {
+ n->devclass = atoi(p);
+ free(p);
+ }
+
+ if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ n->devclass = _DEV_CLASS_MAX;
+
+exit:
+ exit_configuration(&config_tree);
+ return n->devclass != 0;
+}
+
+bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
+
+ if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ 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, "DeviceClass");
+
+ if(!cnf) {
+ cnf = new_config();
+ cnf->variable = xstrdup("DeviceClass");
+ config_add(config_tree, cnf);
+ }
+
+ set_config_int(cnf, n->devclass);
+
+ if(!write_host_config(mesh, config_tree, n->name))
+ goto fail;
+
+ result = true;
+
+fail:
+ exit_configuration(&config_tree);
+ return result;
+}
+
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);
+ snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
dir = opendir(dname);
if(!dir) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
return;
}
n = new_node();
n->name = xstrdup(ent->d_name);
+ node_read_devclass(mesh, n);
node_add(mesh, n);
}
return NULL;
if(!check_id(name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!");
+ logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
free(name);
return NULL;
}
mesh->localdiscovery = true;
keylifetime = 3600; // TODO: check if this can be removed as well
mesh->maxtimeout = 900;
- autoconnect = 3;
mesh->self->options |= OPTION_PMTU_DISCOVERY;
read_invitation_key(mesh);
free(address);
if(err || !ai) {
- logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
+ logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
return false;
}
continue;
if(mesh->listen_sockets >= MAXSOCKETS) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+ logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
return false;
}
int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
- if(tcp_fd < 0) {
+ if(udp_fd < 0) {
close(tcp_fd);
continue;
}
io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
- if(mesh->debug_level >= DEBUG_CONNECTIONS) {
+ if(mesh->log_level >= MESHLINK_INFO) {
char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
- logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+ logger(mesh, MESHLINK_INFO, "Listening on %s", hostname);
free(hostname);
}
char *address = NULL;
if(!(name = get_name(mesh))) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Name for MeshLink instance required!");
+ 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(DEBUG_ALWAYS, LOG_ERR, "Port for MeshLink instance required!");
+ logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!");
return false;
}
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);
- if(autoconnect)
- load_all_nodes(mesh);
+ load_all_nodes(mesh);
/* Open sockets */
mesh->listen_sockets = 0;
- if(!add_listen_address(mesh, address, NULL))
- return false;
+ if(!add_listen_address(mesh, address, NULL)) {
+ if(!strcmp(mesh->myport, "0")) {
+ logger(mesh, MESHLINK_WARNING, "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)
+ return false;
+ if(!add_listen_address(mesh, address, NULL))
+ return false;
+ } else
+ return false;
+ }
if(!mesh->listen_sockets) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+ logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!");
return false;
}
- xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
- mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
-
/* Done. */
mesh->last_config_check = mesh->loop.now.tv_sec;
projects / meshlink / blobdiff