/*
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2013 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2010 Brandon Black <blblack@gmail.com>
#include "ecdsa.h"
#include "graph.h"
#include "logger.h"
+#include "names.h"
#include "net.h"
#include "netutl.h"
#include "process.h"
#include "xalloc.h"
char *myport;
-static struct event device_ev;
+static io_t device_io;
devops_t devops;
char *proxyhost;
char *proxyuser;
char *proxypass;
proxytype_t proxytype;
+int autoconnect;
+bool disablebuggypeers;
char *scriptinterpreter;
char *scriptextension;
bool node_read_ecdsa_public_key(node_t *n) {
- if(ecdsa_active(&n->ecdsa))
+ if(ecdsa_active(n->ecdsa))
return true;
splay_tree_t *config_tree;
FILE *fp;
- char *pubname = NULL, *hcfname = NULL;
+ char *pubname = NULL;
char *p;
- bool result = false;
-
- xasprintf(&hcfname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
init_configuration(&config_tree);
- if(!read_config_file(config_tree, hcfname))
+ if(!read_host_config(config_tree, n->name))
goto exit;
/* First, check for simple ECDSAPublicKey statement */
if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
- result = ecdsa_set_base64_public_key(&n->ecdsa, p);
+ n->ecdsa = ecdsa_set_base64_public_key(p);
free(p);
goto exit;
}
goto exit;
}
- result = ecdsa_read_pem_public_key(&n->ecdsa, fp);
+ n->ecdsa = ecdsa_read_pem_public_key(fp);
fclose(fp);
exit:
exit_configuration(&config_tree);
- free(hcfname);
free(pubname);
- return result;
+ return n->ecdsa;
}
bool read_ecdsa_public_key(connection_t *c) {
+ if(ecdsa_active(c->ecdsa))
+ return true;
+
FILE *fp;
char *fname;
char *p;
- bool result;
+
+ if(!c->config_tree) {
+ init_configuration(&c->config_tree);
+ if(!read_host_config(c->config_tree, c->name))
+ return false;
+ }
/* First, check for simple ECDSAPublicKey statement */
if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
- result = ecdsa_set_base64_public_key(&c->ecdsa, p);
+ c->ecdsa = ecdsa_set_base64_public_key(p);
free(p);
- return result;
+ return c->ecdsa;
}
/* Else, check for ECDSAPublicKeyFile statement and read it */
return false;
}
- result = ecdsa_read_pem_public_key(&c->ecdsa, fp);
+ c->ecdsa = ecdsa_read_pem_public_key(fp);
fclose(fp);
- if(!result)
+ if(!c->ecdsa)
logger(DEBUG_ALWAYS, LOG_ERR, "Parsing ECDSA public key file `%s' failed.", fname);
free(fname);
- return result;
+ return c->ecdsa;
}
bool read_rsa_public_key(connection_t *c) {
+ if(ecdsa_active(c->ecdsa))
+ return true;
+
FILE *fp;
char *fname;
char *n;
- bool result;
/* First, check for simple PublicKey statement */
if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
- result = rsa_set_hex_public_key(&c->rsa, n, "FFFF");
+ c->rsa = rsa_set_hex_public_key(n, "FFFF");
free(n);
- return result;
+ return c->rsa;
}
/* Else, check for PublicKeyFile statement and read it */
return false;
}
- result = rsa_read_pem_public_key(&c->rsa, fp);
+ c->rsa = rsa_read_pem_public_key(fp);
fclose(fp);
- if(!result)
+ if(!c->rsa)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
free(fname);
- return result;
+ return c->rsa;
}
static bool read_ecdsa_private_key(void) {
FILE *fp;
char *fname;
- bool result;
/* Check for PrivateKeyFile statement and read it */
if(!fp) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
+ if(errno == ENOENT)
+ logger(DEBUG_ALWAYS, LOG_INFO, "Create an ECDSA keypair with `tinc -n %s generate-ecdsa-keys'.", netname ?: ".");
free(fname);
return false;
}
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
#endif
- result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
+ myself->connection->ecdsa = ecdsa_read_pem_private_key(fp);
fclose(fp);
- if(!result)
+ if(!myself->connection->ecdsa)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
- return result;
+ return myself->connection->ecdsa;
}
static bool read_rsa_private_key(void) {
FILE *fp;
char *fname;
char *n, *d;
- bool result;
/* First, check for simple PrivateKey statement */
free(d);
return false;
}
- result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
+ myself->connection->rsa = rsa_set_hex_private_key(n, "FFFF", d);
free(n);
free(d);
- return result;
+ return myself->connection->rsa;
}
/* Else, check for PrivateKeyFile statement and read it */
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
#endif
- result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
+ myself->connection->rsa = rsa_read_pem_private_key(fp);
fclose(fp);
- if(!result)
+ if(!myself->connection->rsa)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
- return result;
+ return myself->connection->rsa;
}
-static struct event keyexpire_event;
+static timeout_t keyexpire_timeout;
-static void keyexpire_handler(int fd, short events, void *data) {
+static void keyexpire_handler(void *data) {
regenerate_key();
+ timeout_set(data, &(struct timeval){keylifetime, rand() % 100000});
}
void regenerate_key(void) {
- if(timeout_initialized(&keyexpire_event)) {
- logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
- event_del(&keyexpire_event);
- send_key_changed();
- } else {
- timeout_set(&keyexpire_event, keyexpire_handler, NULL);
- }
-
- event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+ logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
+ send_key_changed();
}
/*
// 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);
- free(fname);
+ read_host_config(config_tree, ent->d_name);
if(!n) {
n = new_node();
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;
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)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
return false;
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
+ get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+
+ get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
+
return true;
}
*/
static bool setup_myself(void) {
char *name, *hostname, *cipher, *digest, *type;
- char *fname = NULL;
char *address = NULL;
if(!(name = get_name())) {
myself->connection = new_connection();
myself->name = name;
myself->connection->name = xstrdup(name);
- xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
- read_config_options(config_tree, name);
- read_config_file(config_tree, fname);
- free(fname);
+ read_host_config(config_tree, name);
if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
myport = xstrdup("655");
if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
cipher = xstrdup("blowfish");
- if(!cipher_open_by_name(&myself->incipher, cipher)) {
+ if(!(myself->incipher = cipher_open_by_name(cipher))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
return false;
}
free(cipher);
- regenerate_key();
+ send_key_changed();
+ timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
/* Check if we want to use message authentication codes... */
if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
digest = xstrdup("sha1");
- if(!digest_open_by_name(&myself->indigest, digest, maclength)) {
+ if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
return false;
}
myself->nexthop = myself;
myself->via = myself;
myself->status.reachable = true;
- myself->last_state_change = time(NULL);
+ myself->last_state_change = now.tv_sec;
myself->status.sptps = experimental;
node_add(myself);
if(strictsubnets)
load_all_subnets();
+ else if(autoconnect)
+ load_all_nodes();
/* Open device */
if(!devops.setup())
return false;
- if(device_fd >= 0) {
- event_set(&device_ev, device_fd, EV_READ|EV_PERSIST, handle_device_data, NULL);
-
- if (event_add(&device_ev, NULL) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
- devops.close();
- return false;
- }
- }
+ if(device_fd >= 0)
+ io_add(&device_io, handle_device_data, NULL, device_fd, IO_READ);
/* Run tinc-up script to further initialize the tap interface */
char *envp[5];
/* Open sockets */
+#ifndef HAVE_MINGW
+ int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if(unix_fd < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(errno));
+ return false;
+ }
+
+ struct sockaddr_un sa;
+ sa.sun_family = AF_UNIX;
+ strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path);
+
+ if(connect(unix_fd, (struct sockaddr *)&sa, sizeof sa) >= 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
+ return false;
+ }
+
+ unlink(unixsocketname);
+
+ if(bind(unix_fd, (struct sockaddr *)&sa, sizeof sa) < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(errno));
+ return false;
+ }
+
+ if(listen(unix_fd, 3) < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(errno));
+ return false;
+ }
+
+ io_add(&unix_socket, handle_new_unix_connection, &unix_socket, unix_fd, IO_READ);
+#endif
+
if(!do_detach && getenv("LISTEN_FDS")) {
sockaddr_t sa;
socklen_t salen;
return false;
}
- listen_socket[i].tcp = i + 3;
-
#ifdef FD_CLOEXEC
fcntl(i + 3, F_SETFD, FD_CLOEXEC);
#endif
- listen_socket[i].udp = setup_vpn_in_socket(&sa);
- if(listen_socket[i].udp < 0)
+ int udp_fd = setup_vpn_in_socket(&sa);
+ if(udp_fd < 0)
return false;
- event_set(&listen_socket[i].ev_tcp, listen_socket[i].tcp, EV_READ|EV_PERSIST, handle_new_meta_connection, NULL);
- if(event_add(&listen_socket[i].ev_tcp, NULL) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
- abort();
- }
-
- event_set(&listen_socket[i].ev_udp, listen_socket[i].udp, EV_READ|EV_PERSIST, handle_incoming_vpn_data, (void *)(intptr_t)listen_sockets);
- if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
- abort();
- }
+ io_add(&listen_socket[i].tcp, (io_cb_t)handle_new_meta_connection, &listen_socket[i], i + 3, IO_READ);
+ io_add(&listen_socket[i].udp, (io_cb_t)handle_incoming_vpn_data, &listen_socket[i], udp_fd, IO_READ);
if(debug_level >= DEBUG_CONNECTIONS) {
hostname = sockaddr2hostname(&sa);
return false;
}
- listen_socket[listen_sockets].tcp =
- setup_listen_socket((sockaddr_t *) aip->ai_addr);
+ int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
- if(listen_socket[listen_sockets].tcp < 0)
+ if(tcp_fd < 0)
continue;
- listen_socket[listen_sockets].udp =
- setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+ int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
- if(listen_socket[listen_sockets].udp < 0) {
- close(listen_socket[listen_sockets].tcp);
+ if(tcp_fd < 0) {
+ close(tcp_fd);
continue;
}
- event_set(&listen_socket[listen_sockets].ev_tcp,
- listen_socket[listen_sockets].tcp,
- EV_READ|EV_PERSIST,
- handle_new_meta_connection, NULL);
- if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
- abort();
- }
-
- event_set(&listen_socket[listen_sockets].ev_udp,
- listen_socket[listen_sockets].udp,
- EV_READ|EV_PERSIST,
- handle_incoming_vpn_data, (void *)(intptr_t)listen_sockets);
- if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
- abort();
- }
+ io_add(&listen_socket[listen_sockets].tcp, handle_new_meta_connection, &listen_socket[listen_sockets], tcp_fd, IO_READ);
+ io_add(&listen_socket[listen_sockets].udp, handle_incoming_vpn_data, &listen_socket[listen_sockets], udp_fd, IO_READ);
if(debug_level >= DEBUG_CONNECTIONS) {
hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
return false;
}
- last_config_check = time(NULL);
+ last_config_check = now.tv_sec;
return true;
}
}
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);
+ io_del(&listen_socket[i].tcp);
+ io_del(&listen_socket[i].udp);
+ close(listen_socket[i].tcp.fd);
+ close(listen_socket[i].udp.fd);
}
+#ifndef HAVE_MINGW
+ io_del(&unix_socket);
+ close(unix_socket.fd);
+#endif
+
char *envp[5];
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
projects / tinc / blobdiff