#include "utils.h"
#include "xalloc.h"
-char *myport;
-
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
-proxytype_t proxytype;
-int autoconnect;
-bool disablebuggypeers;
+int autoconnect = 3;
bool node_read_ecdsa_public_key(node_t *n) {
if(ecdsa_active(n->ecdsa))
FILE *fp;
char *fname;
- xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", confbase);
+ xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
fp = fopen(fname, "r");
free(fname);
invitation_key = NULL;
}
- xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+ xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
fp = fopen(fname, "r");
return invitation_key;
}
-static timeout_t keyexpire_timeout;
-
-static void keyexpire_handler(void *data) {
- regenerate_key();
- timeout_set(data, &(struct timeval){keylifetime, rand() % 100000});
-}
-
-void regenerate_key(void) {
- logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
- send_key_changed();
-}
-
void load_all_nodes(void) {
DIR *dir;
struct dirent *ent;
char *dname;
- xasprintf(&dname, "%s" SLASH "hosts", confbase);
+ xasprintf(&dname, "%s" SLASH "hosts", mesh->confbase);
dir = opendir(dname);
if(!dir) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
char *get_name(void) {
char *name = NULL;
- get_config_string(lookup_config(config_tree, "Name"), &name);
+ get_config_string(lookup_config(mesh->config, "Name"), &name);
if(!name)
return NULL;
Add listening sockets.
*/
static bool add_listen_address(char *address, bool bindto) {
- char *port = myport;
+ char *port = mesh->myport;
if(address) {
char *space = strchr(address, ' ');
mesh->self->connection = new_connection();
mesh->self->name = name;
mesh->self->connection->name = xstrdup(name);
- read_host_config(config_tree, name);
+ read_host_config(mesh->config, name);
- if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
- myport = xstrdup("655");
+ if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
+ mesh->myport = xstrdup("655");
else
port_specified = true;
if(!read_ecdsa_private_key())
return false;
- /* Ensure myport is numeric */
+ /* Ensure mesh->myport is numeric */
- if(!atoi(myport)) {
- struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
+ if(!atoi(mesh->myport)) {
+ struct addrinfo *ai = str2addrinfo("localhost", mesh->myport, SOCK_DGRAM);
sockaddr_t sa;
if(!ai || !ai->ai_addr)
return false;
- free(myport);
+ free(mesh->myport);
memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
- sockaddr2str(&sa, NULL, &myport);
+ sockaddr2str(&sa, NULL, &mesh->myport);
}
/* Check some options */
if(!setup_myself_reloadable())
return false;
- // TODO: check whether this is used at all
- timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
-
/* Compression */
// TODO: drop compression in the packet layer?
// TODO: require Port to be set? Or use "0" and use getsockname()?
- if(!myport)
- myport = xstrdup("655");
+ if(!mesh->myport)
+ mesh->myport = xstrdup("655");
- xasprintf(&mesh->self->hostname, "MYSELF port %s", myport);
+ xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
/* Done. */
- last_config_check = now.tv_sec;
+ mesh->last_config_check = now.tv_sec;
return true;
}
exit_nodes();
exit_connections();
- if(myport) free(myport);
+ if(mesh->myport) free(mesh->myport);
return;
}