#include "system.h"
-#include "splay_tree.h"
#include "cipher.h"
#include "conf.h"
#include "connection.h"
char *proxyuser;
char *proxypass;
proxytype_t proxytype;
+int autoconnect;
char *scriptinterpreter;
char *scriptextension;
result = rsa_read_pem_public_key(&c->rsa, fp);
fclose(fp);
- if(!result)
+ if(!result)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
free(fname);
return result;
result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
fclose(fp);
- if(!result)
+ if(!result)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
return result;
result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
fclose(fp);
- if(!result)
+ if(!result)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
return result;
timeout_set(&keyexpire_event, keyexpire_handler, NULL);
}
- event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+ event_add(&keyexpire_event, &(struct timeval){keylifetime, rand() % 100000});
}
/*
DIR *dir;
struct dirent *ent;
char *dname;
- char *fname;
- splay_tree_t *config_tree;
- config_t *cfg;
- subnet_t *s, *s2;
- node_t *n;
xasprintf(&dname, "%s" SLASH "hosts", confbase);
dir = opendir(dname);
if(!check_id(ent->d_name))
continue;
- n = lookup_node(ent->d_name);
+ node_t *n = lookup_node(ent->d_name);
#ifdef _DIRENT_HAVE_D_TYPE
//if(ent->d_type != DT_REG)
// continue;
#endif
+ char *fname;
xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
+
+ splay_tree_t *config_tree;
init_configuration(&config_tree);
read_config_options(config_tree, ent->d_name);
read_config_file(config_tree, fname);
node_add(n);
}
- for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+ for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+ subnet_t *s, *s2;
+
if(!get_config_subnet(cfg, &s))
continue;
closedir(dir);
}
+void load_all_nodes(void) {
+ DIR *dir;
+ struct dirent *ent;
+ char *dname;
+
+ xasprintf(&dname, "%s" SLASH "hosts", confbase);
+ dir = opendir(dname);
+ if(!dir) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+ free(dname);
+ return;
+ }
+
+ while((ent = readdir(dir))) {
+ if(!check_id(ent->d_name))
+ continue;
+
+ node_t *n = lookup_node(ent->d_name);
+ if(n)
+ continue;
+
+ n = new_node();
+ n->name = xstrdup(ent->d_name);
+ node_add(n);
+ }
+
+ closedir(dir);
+}
+
+
char *get_name(void) {
char *name = NULL;
char *envname = getenv(name + 1);
if(!envname) {
if(strcmp(name + 1, "HOST")) {
- fprintf(stderr, "Invalid Name: environment variable %s does not exist\n", name + 1);
+ logger(DEBUG_ALWAYS, LOG_ERR, "Invalid Name: environment variable %s does not exist\n", name + 1);
return false;
}
- envname = alloca(32);
+ char envname[32];
if(gethostname(envname, 32)) {
- fprintf(stderr, "Could not get hostname: %s\n", strerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
return false;
}
envname[31] = 0;
scriptinterpreter = NULL;
get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
-
+
free(scriptextension);
if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension))
#ifdef HAVE_MINGW
get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
-
+
if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
if(!strcasecmp(rmode, "router"))
routing_mode = RMODE_ROUTER;
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
+ get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+
return true;
}
Configure node_t myself and set up the local sockets (listen only)
*/
static bool setup_myself(void) {
- config_t *cfg;
- subnet_t *subnet;
char *name, *hostname, *cipher, *digest, *type;
char *fname = NULL;
char *address = NULL;
- char *envp[5];
- struct addrinfo *ai, *aip, hint = {0};
- int i, err;
- int replaywin_int;
if(!(name = get_name())) {
logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
/* Read in all the subnets specified in the host configuration file */
- cfg = lookup_config(config_tree, "Subnet");
+ for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+ subnet_t *subnet;
- while(cfg) {
if(!get_config_subnet(cfg, &subnet))
return false;
subnet_add(myself, subnet);
-
- cfg = lookup_config_next(config_tree, cfg);
}
/* Check some options */
}
}
+ int replaywin_int;
if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
if(replaywin_int < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "ReplayWindow cannot be negative!");
return false;
}
replaywin = (unsigned)replaywin_int;
+ sptps_replaywin = replaywin;
}
/* Generate packet encryption key */
return false;
}
+ free(cipher);
+
regenerate_key();
/* Check if we want to use message authentication codes... */
return false;
}
+ free(digest);
+
/* Compression */
if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
if(strictsubnets)
load_all_subnets();
+ else if(autoconnect)
+ load_all_nodes();
/* Open device */
}
/* Run tinc-up script to further initialize the tap interface */
+ char *envp[5];
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
execute_script("tinc-up", envp);
- for(i = 0; i < 4; i++)
+ for(int i = 0; i < 4; i++)
free(envp[i]);
/* Run subnet-up scripts for our own subnets */
return false;
}
- for(i = 0; i < listen_sockets; i++) {
+ for(int i = 0; i < listen_sockets; i++) {
salen = sizeof sa;
if(getsockname(i + 3, &sa.sa, &salen) < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(errno));
listen_socket[i].tcp = i + 3;
#ifdef FD_CLOEXEC
- fcntl(i + 3, F_SETFD, FD_CLOEXEC);
+ fcntl(i + 3, F_SETFD, FD_CLOEXEC);
#endif
listen_socket[i].udp = setup_vpn_in_socket(&sa);
}
} else {
listen_sockets = 0;
- cfg = lookup_config(config_tree, "BindToAddress");
+ config_t *cfg = lookup_config(config_tree, "BindToAddress");
do {
get_config_string(cfg, &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;
- err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+ int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
free(address);
if(err || !ai) {
return false;
}
- for(aip = ai; aip; aip = aip->ai_next) {
+ for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
if(listen_sockets >= MAXSOCKETS) {
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
return false;
close all open network connections
*/
void close_network_connections(void) {
- splay_node_t *node, *next;
- connection_t *c;
- char *envp[5];
- int i;
-
- for(node = connection_tree->head; node; node = next) {
+ for(list_node_t *node = connection_list->head, *next; node; node = next) {
next = node->next;
- c = node->data;
+ connection_t *c = node->data;
/* Keep control connections open until the end, so they know when we really terminated */
if(c->status.control)
c->socket = -1;
free_connection(myself->connection);
}
- for(i = 0; i < listen_sockets; i++) {
+ for(int i = 0; i < listen_sockets; i++) {
event_del(&listen_socket[i].ev_tcp);
event_del(&listen_socket[i].ev_udp);
close(listen_socket[i].tcp);
close(listen_socket[i].udp);
}
+ char *envp[5];
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
if(myport) free(myport);
- for(i = 0; i < 4; i++)
+ for(int i = 0; i < 4; i++)
free(envp[i]);
devops.close();