char *p;
init_configuration(&config_tree);
- if(!read_host_config(config_tree, n->name))
+ if(!read_host_config(mesh, config_tree, n->name))
goto exit;
/* First, check for simple ECDSAPublicKey statement */
if(!c->config_tree) {
init_configuration(&c->config_tree);
- if(!read_host_config(c->config_tree, c->name))
+ if(!read_host_config(mesh, c->config_tree, c->name))
return false;
}
static bool read_ecdsa_private_key(void) {
FILE *fp;
- char *fname;
+ char filename[PATH_MAX];
- xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
- fp = fopen(fname, "r");
- free(fname);
+ snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+ fp = fopen(filename, "r");
if(!fp) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
static bool read_invitation_key(void) {
FILE *fp;
- char *fname;
+ char filename[PATH_MAX];
if(mesh->invitation_key) {
ecdsa_free(mesh->invitation_key);
mesh->invitation_key = NULL;
}
- xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
- fp = fopen(fname, "r");
+ fp = fopen(filename, "r");
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", fname, strerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
}
- free(fname);
return mesh->invitation_key;
}
void load_all_nodes(void) {
DIR *dir;
struct dirent *ent;
- char *dname;
+ char dname[PATH_MAX];
- xasprintf(&dname, "%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));
- free(dname);
return;
}
bool setup_myself_reloadable(void) {
mesh->localdiscovery = true;
keylifetime = 3600; // TODO: check if this can be removed as well
- maxtimeout = 900;
+ mesh->maxtimeout = 900;
autoconnect = 3;
mesh->self->options |= OPTION_PMTU_DISCOVERY;
continue;
}
- io_add(&mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
- io_add(&mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
+ 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) {
char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
mesh->self->connection = new_connection();
mesh->self->name = name;
mesh->self->connection->name = xstrdup(name);
- read_host_config(mesh->config, name);
+ read_host_config(mesh, mesh->config, name);
if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
mesh->myport = xstrdup("655");
mesh->self->nexthop = mesh->self;
mesh->self->via = mesh->self;
mesh->self->status.reachable = true;
- mesh->self->last_state_change = now.tv_sec;
+ mesh->self->last_state_change = mesh->loop.now.tv_sec;
node_add(mesh->self);
graph();
/* Done. */
- mesh->last_config_check = now.tv_sec;
+ mesh->last_config_check = mesh->loop.now.tv_sec;
return true;
}
init_edges();
init_requests();
- pinginterval = 60;
- pingtimeout = 5;
+ mesh->pinginterval = 60;
+ mesh->pingtimeout = 5;
maxoutbufsize = 10 * MTU;
if(!setup_myself())
}
for(int i = 0; i < mesh->listen_sockets; i++) {
- io_del(&mesh->listen_socket[i].tcp);
- io_del(&mesh->listen_socket[i].udp);
+ io_del(&mesh->loop, &mesh->listen_socket[i].tcp);
+ io_del(&mesh->loop, &mesh->listen_socket[i].udp);
close(mesh->listen_socket[i].tcp.fd);
close(mesh->listen_socket[i].udp.fd);
}