#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(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
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);
return mesh->invitation_key;
}
-bool node_read_dclass(meshlink_handle_t *mesh, node_t *n) {
- if(n->dclass != 0)
- return true;
+bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) {
splay_tree_t *config_tree;
char *p;
goto exit;
if(get_config_string(lookup_config(config_tree, "DeviceClass"), &p)) {
- n->dclass = atoi(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->dclass != 0;
+ return n->devclass != 0;
}
-bool node_write_dclass(meshlink_handle_t *mesh, node_t *n) {
+bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
- if(n->dclass == 0)
+ if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
return false;
bool result = false;
// 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");
+ config_t *cnf = lookup_config(config_tree, "DeviceClass");
- if(!cnf)
- {
+ if(!cnf) {
cnf = new_config();
cnf->variable = xstrdup("DeviceClass");
config_add(config_tree, cnf);
}
- set_config_int(cnf, n->dclass);
+ set_config_int(cnf, n->devclass);
if(!write_host_config(mesh, config_tree, n->name))
goto fail;
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(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
n = new_node();
n->name = xstrdup(ent->d_name);
- node_read_dclass(mesh, n);
+ node_read_devclass(mesh, n);
node_add(mesh, n);
}
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);
return false;
}
+ bool success = false;
+
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
// Ignore duplicate addresses
bool found = 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;
}
mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
mesh->listen_sockets++;
+ success = true;
}
freeaddrinfo(ai);
- return true;
+ return success;
}
/*
mesh->self = new_node();
mesh->self->connection = new_connection();
mesh->self->name = name;
- mesh->self->dclass = mesh->dclass;
+ mesh->self->devclass = mesh->devclass;
mesh->self->connection->name = xstrdup(name);
read_host_config(mesh, mesh->config, name);
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_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)
+ return false;
+ if(!add_listen_address(mesh, address, NULL))
+ return false;
+ } else
+ return false;
+ }
if(!mesh->listen_sockets) {
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;