]> git.meshlink.io Git - meshlink/blobdiff - src/net_setup.c
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[meshlink] / src / net_setup.c
index 0718a8c5725acd0576b32110e7600f28e57e0ea4..207ce42543b4c9da1c542aa4f7484b580953a425 100644 (file)
@@ -1,8 +1,9 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
+                  2010      Brandon Black <blblack@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 #include "system.h"
 
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
-#include "event.h"
+#include "digest.h"
+#include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
 #include "process.h"
 #include "protocol.h"
 #include "route.h"
+#include "rsa.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
 char *myport;
+static struct event device_ev;
+devops_t devops;
 
-bool read_rsa_public_key(connection_t *c) {
+bool node_read_ecdsa_public_key(node_t *n) {
+       if(ecdsa_active(&n->ecdsa))
+               return true;
+
+       splay_tree_t *config_tree;
        FILE *fp;
        char *fname;
-       char *key;
+       char *p;
+       bool result = false;
 
-       if(!c->rsa_key) {
-               c->rsa_key = RSA_new();
-//             RSA_blinding_on(c->rsa_key, NULL);
-       }
+       xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
 
-       /* First, check for simple PublicKey statement */
+       init_configuration(&config_tree);
+       if(!read_config_file(config_tree, fname))
+               goto exit;
 
-       if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) {
-               BN_hex2bn(&c->rsa_key->n, key);
-               BN_hex2bn(&c->rsa_key->e, "FFFF");
-               free(key);
-               return true;
+       /* 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);
+               free(p);
+               goto exit;
        }
 
-       /* Else, check for PublicKeyFile statement and read it */
+       /* Else, check for ECDSAPublicKeyFile statement and read it */
 
-       if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) {
-               fp = fopen(fname, "r");
+       free(fname);
 
-               if(!fp) {
-                       logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-                                  fname, strerror(errno));
-                       free(fname);
-                       return false;
-               }
+       if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &fname))
+               xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
 
-               free(fname);
-               c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-               fclose(fp);
+       fp = fopen(fname, "r");
 
-               if(c->rsa_key)
-                       return true;            /* Woohoo. */
+       if(!fp) {
+               logger(LOG_ERR, "Error reading ECDSA public key file `%s': %s", fname, strerror(errno));
+               goto exit;
+       }
 
-               /* If it fails, try PEM_read_RSA_PUBKEY. */
-               fp = fopen(fname, "r");
+       result = ecdsa_read_pem_public_key(&n->ecdsa, fp);
+       fclose(fp);
 
-               if(!fp) {
-                       logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-                                  fname, strerror(errno));
-                       free(fname);
-                       return false;
-               }
+exit:
+       exit_configuration(&config_tree);
+       free(fname);
+       return result;
+}
 
-               free(fname);
-               c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-               fclose(fp);
+bool read_ecdsa_public_key(connection_t *c) {
+       FILE *fp;
+       char *fname;
+       char *p;
+       bool result;
 
-               if(c->rsa_key) {
-//                             RSA_blinding_on(c->rsa_key, NULL);
-                       return true;
-               }
+       /* First, check for simple ECDSAPublicKey statement */
 
-               logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s",
+       if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
+               result = ecdsa_set_base64_public_key(&c->ecdsa, p);
+               free(p);
+               return result;
+       }
+
+       /* Else, check for ECDSAPublicKeyFile statement and read it */
+
+       if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
+               xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+
+       fp = fopen(fname, "r");
+
+       if(!fp) {
+               logger(LOG_ERR, "Error reading ECDSA public key file `%s': %s",
                           fname, strerror(errno));
+               free(fname);
                return false;
        }
 
-       /* Else, check if a harnessed public key is in the config file */
+       result = ecdsa_read_pem_public_key(&c->ecdsa, fp);
+       fclose(fp);
+
+       if(!result) 
+               logger(LOG_ERR, "Reading ECDSA public key file `%s' failed: %s", fname, strerror(errno));
+       free(fname);
+       return result;
+}
+
+bool read_rsa_public_key(connection_t *c) {
+       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");
+               free(n);
+               return result;
+       }
+
+       /* Else, check for PublicKeyFile statement and read it */
+
+       if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
+               xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 
-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
        fp = fopen(fname, "r");
 
-       if(fp) {
-               c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-               fclose(fp);
+       if(!fp) {
+               logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
+               free(fname);
+               return false;
        }
 
+       result = rsa_read_pem_public_key(&c->rsa, fp);
+       fclose(fp);
+
+       if(!result) 
+               logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
        free(fname);
+       return result;
+}
 
-       if(c->rsa_key)
-               return true;
+static bool read_ecdsa_private_key(void) {
+       FILE *fp;
+       char *fname;
+       bool result;
 
-       /* Try again with PEM_read_RSA_PUBKEY. */
+       /* Check for PrivateKeyFile statement and read it */
+
+       if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
+               xasprintf(&fname, "%s/ecdsa_key.priv", confbase);
 
-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
        fp = fopen(fname, "r");
 
-       if(fp) {
-               c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-//             RSA_blinding_on(c->rsa_key, NULL);
-               fclose(fp);
+       if(!fp) {
+               logger(LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
+               free(fname);
+               return false;
        }
 
-       free(fname);
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+       struct stat s;
 
-       if(c->rsa_key)
-               return true;
+       if(fstat(fileno(fp), &s)) {
+               logger(LOG_ERR, "Could not stat ECDSA private key file `%s': %s'", fname, strerror(errno));
+               free(fname);
+               return false;
+       }
 
-       logger(LOG_ERR, "No public key for %s specified!", c->name);
+       if(s.st_mode & ~0100700)
+               logger(LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
+#endif
+
+       result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
+       fclose(fp);
 
-       return false;
+       if(!result) 
+               logger(LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+       free(fname);
+       return result;
 }
 
-bool read_rsa_private_key(void) {
+static bool read_rsa_private_key(void) {
        FILE *fp;
-       char *fname, *key, *pubkey;
-       struct stat s;
+       char *fname;
+       char *n, *d;
+       bool result;
+
+       /* First, check for simple PrivateKey statement */
 
-       if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
-               if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &pubkey)) {
+       if(get_config_string(lookup_config(config_tree, "PrivateKey"), &d)) {
+               if(!get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
                        logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
+                       free(d);
                        return false;
                }
-               myself->connection->rsa_key = RSA_new();
-//             RSA_blinding_on(myself->connection->rsa_key, NULL);
-               BN_hex2bn(&myself->connection->rsa_key->d, key);
-               BN_hex2bn(&myself->connection->rsa_key->n, pubkey);
-               BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
-               free(key);
-               free(pubkey);
+               result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
+               free(n);
+               free(d);
                return true;
        }
 
+       /* Else, check for PrivateKeyFile statement and read it */
+
        if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
                xasprintf(&fname, "%s/rsa_key.priv", confbase);
 
@@ -176,9 +241,10 @@ bool read_rsa_private_key(void) {
        }
 
 #if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+       struct stat s;
+
        if(fstat(fileno(fp), &s)) {
-               logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'",
-                               fname, strerror(errno));
+               logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
                free(fname);
                return false;
        }
@@ -187,42 +253,119 @@ bool read_rsa_private_key(void) {
                logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
 #endif
 
-       myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
+       result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
        fclose(fp);
 
-       if(!myself->connection->rsa_key) {
-               logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s",
-                          fname, strerror(errno));
+       if(!result) 
+               logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
+       free(fname);
+       return result;
+}
+
+static struct event keyexpire_event;
+
+static void keyexpire_handler(int fd, short events, void *data) {
+       regenerate_key();
+}
+
+void regenerate_key(void) {
+       if(timeout_initialized(&keyexpire_event)) {
+               ifdebug(STATUS) logger(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});
+}
+
+/*
+  Read Subnets from all host config files
+*/
+void load_all_subnets(void) {
+       DIR *dir;
+       struct dirent *ent;
+       char *dname;
+       char *fname;
+       splay_tree_t *config_tree;
+       config_t *cfg;
+       subnet_t *s, *s2;
+       node_t *n;
+       bool result;
+
+       xasprintf(&dname, "%s/hosts", confbase);
+       dir = opendir(dname);
+       if(!dir) {
+               logger(LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+               free(dname);
+               return;
+       }
+
+       while((ent = readdir(dir))) {
+               if(!check_id(ent->d_name))
+                       continue;
+
+               n = lookup_node(ent->d_name);
+               #ifdef _DIRENT_HAVE_D_TYPE
+               //if(ent->d_type != DT_REG)
+               //      continue;
+               #endif
+
+               xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
+               init_configuration(&config_tree);
+               result = read_config_file(config_tree, fname);
                free(fname);
-               return false;
+               if(!result)
+                       continue;
+
+               if(!n) {
+                       n = new_node();
+                       n->name = xstrdup(ent->d_name);
+                       node_add(n);
+               }
+
+               for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+                       if(!get_config_subnet(cfg, &s))
+                               continue;
+
+                       if((s2 = lookup_subnet(n, s))) {
+                               s2->expires = -1;
+                       } else {
+                               subnet_add(n, s);
+                       }
+               }
+
+               exit_configuration(&config_tree);
        }
 
-       free(fname);
-       return true;
+       closedir(dir);
 }
 
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
-bool setup_myself(void) {
+static bool setup_myself(void) {
        config_t *cfg;
        subnet_t *subnet;
-       char *name, *hostname, *mode, *afname, *cipher, *digest;
+       char *name, *hostname, *mode, *afname, *cipher, *digest, *type;
+       char *fname = NULL;
        char *address = NULL;
        char *envp[5];
        struct addrinfo *ai, *aip, hint = {0};
        bool choice;
        int i, err;
+       int replaywin_int;
 
        myself = new_node();
        myself->connection = new_connection();
-       init_configuration(&myself->connection->config_tree);
 
        myself->hostname = xstrdup("MYSELF");
        myself->connection->hostname = xstrdup("MYSELF");
 
        myself->connection->options = 0;
-       myself->connection->protocol_version = PROT_CURRENT;
+       myself->connection->protocol_major = PROT_MAJOR;
+       myself->connection->protocol_minor = PROT_MINOR;
 
        if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {     /* Not acceptable */
                logger(LOG_ERR, "Name for tinc daemon required!");
@@ -237,21 +380,35 @@ bool setup_myself(void) {
 
        myself->name = name;
        myself->connection->name = xstrdup(name);
+       xasprintf(&fname, "%s/hosts/%s", confbase, name);
+       read_config_options(config_tree, name);
+       read_config_file(config_tree, fname);
+       free(fname);
+
+       get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
 
-       if(!read_connection_config(myself->connection)) {
-               logger(LOG_ERR, "Cannot open host configuration file for myself!");
+       if(experimental && !read_ecdsa_private_key())
                return false;
-       }
 
        if(!read_rsa_private_key())
                return false;
 
-       if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
+       if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
                myport = xstrdup("655");
 
+       if(!atoi(myport)) {
+               struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
+               sockaddr_t sa;
+               if(!ai || !ai->ai_addr)
+                       return false;
+               free(myport);
+               memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
+               sockaddr2str(&sa, NULL, &myport);
+       }
+
        /* Read in all the subnets specified in the host configuration file */
 
-       cfg = lookup_config(myself->connection->config_tree, "Subnet");
+       cfg = lookup_config(config_tree, "Subnet");
 
        while(cfg) {
                if(!get_config_subnet(cfg, &subnet))
@@ -259,7 +416,7 @@ bool setup_myself(void) {
 
                subnet_add(myself, subnet);
 
-               cfg = lookup_config_next(myself->connection->config_tree, cfg);
+               cfg = lookup_config_next(config_tree, cfg);
        }
 
        /* Check some options */
@@ -270,16 +427,13 @@ bool setup_myself(void) {
        if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
                myself->options |= OPTION_TCPONLY;
 
-       if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice)
-               myself->options |= OPTION_INDIRECT;
-
-       if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
-               myself->options |= OPTION_TCPONLY;
-
        if(myself->options & OPTION_TCPONLY)
                myself->options |= OPTION_INDIRECT;
 
+       get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
+       get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
        get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+       strictsubnets |= tunnelserver;
 
        if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
                if(!strcasecmp(mode, "router"))
@@ -293,17 +447,35 @@ bool setup_myself(void) {
                        return false;
                }
                free(mode);
-       } else
-               routing_mode = RMODE_ROUTER;
+       }
 
-       // Enable PMTUDiscovery by default if we are in router mode.
+       if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
+               if(!strcasecmp(mode, "off"))
+                       forwarding_mode = FMODE_OFF;
+               else if(!strcasecmp(mode, "internal"))
+                       forwarding_mode = FMODE_INTERNAL;
+               else if(!strcasecmp(mode, "kernel"))
+                       forwarding_mode = FMODE_KERNEL;
+               else {
+                       logger(LOG_ERR, "Invalid forwarding mode!");
+                       return false;
+               }
+               free(mode);
+       }
 
-       choice = routing_mode == RMODE_ROUTER;
-       get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
-       if(choice)      
+       choice = true;
+       get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
+       if(choice)
                myself->options |= OPTION_PMTU_DISCOVERY;
 
+       choice = true;
+       get_config_bool(lookup_config(config_tree, "ClampMSS"), &choice);
+       if(choice)
+               myself->options |= OPTION_CLAMP_MSS;
+
        get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+       get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
+       get_config_bool(lookup_config(config_tree, "Broadcast"), &broadcast);
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
        if(priorityinheritance)
@@ -321,6 +493,28 @@ bool setup_myself(void) {
        } else
                maxtimeout = 900;
 
+       if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
+               if(udp_rcvbuf <= 0) {
+                       logger(LOG_ERR, "UDPRcvBuf cannot be negative!");
+                       return false;
+               }
+       }
+
+       if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
+               if(udp_sndbuf <= 0) {
+                       logger(LOG_ERR, "UDPSndBuf cannot be negative!");
+                       return false;
+               }
+       }
+
+       if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
+               if(replaywin_int < 0) {
+                       logger(LOG_ERR, "ReplayWindow cannot be negative!");
+                       return false;
+               }
+               replaywin = (unsigned)replaywin_int;
+       }
+
        if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
                if(!strcasecmp(afname, "IPv4"))
                        addressfamily = AF_INET;
@@ -339,69 +533,40 @@ bool setup_myself(void) {
 
        /* Generate packet encryption key */
 
-       if(get_config_string
-          (lookup_config(myself->connection->config_tree, "Cipher"), &cipher)) {
-               if(!strcasecmp(cipher, "none")) {
-                       myself->incipher = NULL;
-               } else {
-                       myself->incipher = EVP_get_cipherbyname(cipher);
-
-                       if(!myself->incipher) {
-                               logger(LOG_ERR, "Unrecognized cipher type!");
-                               return false;
-                       }
-               }
-       } else
-               myself->incipher = EVP_bf_cbc();
-
-       if(myself->incipher)
-               myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
-       else
-               myself->inkeylength = 1;
+       if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
+               cipher = xstrdup("blowfish");
 
-       myself->connection->outcipher = EVP_bf_ofb();
+       if(!cipher_open_by_name(&myself->incipher, cipher)) {
+               logger(LOG_ERR, "Unrecognized cipher type!");
+               return false;
+       }
 
        if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
                keylifetime = 3600;
 
-       keyexpires = now + keylifetime;
-       
-       /* Check if we want to use message authentication codes... */
+       regenerate_key();
 
-       if(get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest)) {
-               if(!strcasecmp(digest, "none")) {
-                       myself->indigest = NULL;
-               } else {
-                       myself->indigest = EVP_get_digestbyname(digest);
+       /* Check if we want to use message authentication codes... */
 
-                       if(!myself->indigest) {
-                               logger(LOG_ERR, "Unrecognized digest type!");
-                               return false;
-                       }
-               }
-       } else
-               myself->indigest = EVP_sha1();
+       int maclength = 4;
+       get_config_int(lookup_config(config_tree, "MACLength"), &maclength);
 
-       myself->connection->outdigest = EVP_sha1();
+       if(maclength < 0) {
+               logger(LOG_ERR, "Bogus MAC length!");
+               return false;
+       }
 
-       if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
-               if(myself->indigest) {
-                       if(myself->inmaclength > myself->indigest->md_size) {
-                               logger(LOG_ERR, "MAC length exceeds size of digest!");
-                               return false;
-                       } else if(myself->inmaclength < 0) {
-                               logger(LOG_ERR, "Bogus MAC length!");
-                               return false;
-                       }
-               }
-       } else
-               myself->inmaclength = 4;
+       if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
+               digest = xstrdup("sha1");
 
-       myself->connection->outmaclength = 0;
+       if(!digest_open_by_name(&myself->indigest, digest, maclength)) {
+               logger(LOG_ERR, "Unrecognized digest type!");
+               return false;
+       }
 
        /* Compression */
 
-       if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->incompression)) {
+       if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
                if(myself->incompression < 0 || myself->incompression > 11) {
                        logger(LOG_ERR, "Bogus compression level!");
                        return false;
@@ -420,11 +585,41 @@ bool setup_myself(void) {
 
        graph();
 
+       if(strictsubnets)
+               load_all_subnets();
+
        /* Open device */
 
-       if(!setup_device())
+       devops = os_devops;
+
+       if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
+               if(!strcasecmp(type, "dummy"))
+                       devops = dummy_devops;
+               else if(!strcasecmp(type, "raw_socket"))
+                       devops = raw_socket_devops;
+#ifdef ENABLE_UML
+               else if(!strcasecmp(type, "uml"))
+                       devops = uml_devops;
+#endif
+#ifdef ENABLE_VDE
+               else if(!strcasecmp(type, "vde"))
+                       devops = vde_devops;
+#endif
+       }
+
+       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(LOG_ERR, "event_add failed: %s", strerror(errno));
+                       devops.close();
+                       return false;
+               }
+       }
+
        /* Run tinc-up script to further initialize the tap interface */
        xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@@ -434,7 +629,7 @@ bool setup_myself(void) {
 
        execute_script("tinc-up", envp);
 
-       for(i = 0; i < 5; i++)
+       for(i = 0; i < 4; i++)
                free(envp[i]);
 
        /* Run subnet-up scripts for our own subnets */
@@ -443,47 +638,78 @@ bool setup_myself(void) {
 
        /* Open sockets */
 
-       get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
+       listen_sockets = 0;
+       cfg = lookup_config(config_tree, "BindToAddress");
 
-       hint.ai_family = addressfamily;
-       hint.ai_socktype = SOCK_STREAM;
-       hint.ai_protocol = IPPROTO_TCP;
-       hint.ai_flags = AI_PASSIVE;
+       do {
+               get_config_string(cfg, &address);
+               if(cfg)
+                       cfg = lookup_config_next(config_tree, cfg);
 
-       err = getaddrinfo(address, myport, &hint, &ai);
+               hint.ai_family = addressfamily;
+               hint.ai_socktype = SOCK_STREAM;
+               hint.ai_protocol = IPPROTO_TCP;
+               hint.ai_flags = AI_PASSIVE;
 
-       if(err || !ai) {
-               logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
-                          gai_strerror(err));
-               return false;
-       }
+               err = getaddrinfo(address, myport, &hint, &ai);
+               free(address);
 
-       listen_sockets = 0;
+               if(err || !ai) {
+                       logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
+                                  gai_strerror(err));
+                       return false;
+               }
 
-       for(aip = ai; aip; aip = aip->ai_next) {
-               listen_socket[listen_sockets].tcp =
-                       setup_listen_socket((sockaddr_t *) aip->ai_addr);
+               for(aip = ai; aip; aip = aip->ai_next) {
+                       if(listen_sockets >= MAXSOCKETS) {
+                               logger(LOG_ERR, "Too many listening sockets");
+                               return false;
+                       }
 
-               if(listen_socket[listen_sockets].tcp < 0)
-                       continue;
+                       listen_socket[listen_sockets].tcp =
+                               setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-               listen_socket[listen_sockets].udp =
-                       setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+                       if(listen_socket[listen_sockets].tcp < 0)
+                               continue;
 
-               if(listen_socket[listen_sockets].udp < 0)
-                       continue;
+                       listen_socket[listen_sockets].udp =
+                               setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-               ifdebug(CONNECTIONS) {
-                       hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-                       logger(LOG_NOTICE, "Listening on %s", hostname);
-                       free(hostname);
-               }
+                       if(listen_socket[listen_sockets].udp < 0) {
+                               close(listen_socket[listen_sockets].tcp);
+                               continue;
+                       }
 
-               memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-               listen_sockets++;
-       }
+                       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(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(LOG_ERR, "event_add failed: %s", strerror(errno));
+                               abort();
+                       }
+
+                       ifdebug(CONNECTIONS) {
+                               hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+                               logger(LOG_NOTICE, "Listening on %s", hostname);
+                               free(hostname);
+                       }
 
-       freeaddrinfo(ai);
+                       memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+                       listen_sockets++;
+               }
+
+               freeaddrinfo(ai);
+       } while(cfg);
 
        if(listen_sockets)
                logger(LOG_NOTICE, "Ready");
@@ -499,9 +725,6 @@ bool setup_myself(void) {
   initialize network
 */
 bool setup_network(void) {
-       now = time(NULL);
-
-       init_events();
        init_connections();
        init_subnets();
        init_nodes();
@@ -533,7 +756,7 @@ bool setup_network(void) {
   close all open network connections
 */
 void close_network_connections(void) {
-       avl_node_t *node, *next;
+       splay_node_t *node, *next;
        connection_t *c;
        char *envp[5];
        int i;
@@ -545,13 +768,6 @@ void close_network_connections(void) {
                terminate_connection(c, false);
        }
 
-       for(list_node_t *node = outgoing_list->head; node; node = node->next) {
-               outgoing_t *outgoing = node->data;
-
-               if(outgoing->event)
-                       event_del(outgoing->event);
-       }
-
        list_delete_list(outgoing_list);
 
        if(myself && myself->connection) {
@@ -561,6 +777,8 @@ void close_network_connections(void) {
        }
 
        for(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);
        }
@@ -576,7 +794,6 @@ void close_network_connections(void) {
        exit_subnets();
        exit_nodes();
        exit_connections();
-       exit_events();
 
        execute_script("tinc-down", envp);
 
@@ -585,7 +802,7 @@ void close_network_connections(void) {
        for(i = 0; i < 4; i++)
                free(envp[i]);
 
-       close_device();
+       devops.close();
 
        return;
 }