Merge branch 'master' into 1.1

Conflicts:
	NEWS
	README
	doc/tinc.conf.5.in
	doc/tinc.texi
	po/nl.po
	src/conf.c
	src/connection.c
	src/event.c
	src/graph.c
	src/net.c
	src/net_packet.c
	src/net_socket.c
	src/node.c
	src/node.h
	src/openssl/rsagen.h
	src/protocol_auth.c
	src/protocol_key.c
	src/protocol_misc.c
	src/subnet.c
	src/subnet.h
	src/tincd.c

diff --cc NEWS
index 2ad93e5a222bf6f46c4816f32571742ea1e43174,736f5e69db55fb690f78262365a4a7086fdc593a..a993df5ca8b09f85b6fa79197bee939da496bbea
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,9 -1,20 +1,26 @@@
 +Version 1.1-cvs              Work in progress
 +
 + * Use libevent to handle I/O events and timeouts.
 +
 + * Use splay trees instead of AVL trees.
 +
+ Version 1.0.9                Dec 26 2008
+ 
+  * Fixed tinc as a service under Windows 2003.
+ 
+  * Fixed reading configuration files that do not end with a newline.
+ 
+  * Fixed crashes in situations where hostnames could not be resolved or hosts
+    would disconnect at the same time as session keys were exchanged.
+ 
+  * Improved default settings of tun and tap devices on BSD platforms.
+ 
+  * Make IPv6 sockets bind only to IPv6 on Linux.
+ 
+  * Enable path MTU discovery by default.
+ 
+  * Fixed a memory leak that occured when connections were closed.
+ 
  Version 1.0.8                May 16 2007
  
   * Fixed some memory and resource leaks.

diff --cc README
index b7ba7b6ff2880980e611441ff06c189f0cd86c3c,23b24581dd56073977b820192d66ee276617701e..c324e2b7726f9be28e889975f37a0c357f89d04c
--- 1/README
--- 2/README
+++ b/README
@@@ -1,7 -1,7 +1,7 @@@
 -This is the README file for tinc version 1.0.9. Installation
 +This is the README file for tinc version 1.1-cvs. Installation
  instructions may be found in the INSTALL file.
  
- tinc is Copyright (C) 1998-2007 by:
 -tinc is Copyright (C) 1998-2008 by:
++tinc is Copyright (C) 1998-2009 by:
  
  Ivo Timmermans,
  Guus Sliepen <guus@tinc-vpn.org>,

diff --cc doc/tinc.texi
Simple merge

diff --cc src/bsd/device.c
Simple merge

diff --cc src/conf.c
Simple merge

diff --cc src/conf.h
index ee20c29cce4a22850a3cacd22667cb365937e7e8,d1eae978e2ae0c155f02745356a10f83cb1c46f2..dfa1123100142dad2b2416e7afc55a5b26383577
--- 1/src/conf.h
--- 2/src/conf.h
+++ b/src/conf.h
@@@ -56,9 -56,10 +56,10 @@@ extern bool get_config_string(const con
  extern bool get_config_address(const config_t *, struct addrinfo **);
  extern bool get_config_subnet(const config_t *, struct subnet_t **);
  
 -extern int read_config_file(avl_tree_t *, const char *);
 +extern int read_config_file(splay_tree_t *, const char *);
  extern bool read_server_config(void);
 -extern FILE *ask_and_open(const char *, const char *);
 +extern FILE *ask_and_open(const char *, const char *, const char *);
  extern bool is_safe_path(const char *);
+ extern bool disable_old_keys(FILE *);
  
  #endif                                                        /* __TINC_CONF_H__ */

diff --cc src/connection.c
index 84d2ac4de2f743fa6f106507794d35756266dd3e,9fd4002ba52a557453c1310b75bdc35fbf5c3a84..230ec4ede6b48ca3ae3560ba3ae0844c5407f647
--- 1/src/connection.c
--- 2/src/connection.c
+++ b/src/connection.c
@@@ -80,11 -106,14 +80,14 @@@ void free_connection(connection_t *c) 
        if(c->hischallenge)
                free(c->hischallenge);
  
 -      if(c->outbuf)
 -              free(c->outbuf);
 -
 -      if(c->rsa_key)
 -              RSA_free(c->rsa_key);
+       if(c->config_tree)
+               exit_configuration(&c->config_tree);
+ 
 +      if(c->buffer)
 +              bufferevent_free(c->buffer);
 +      
 +      if(event_initialized(&c->inevent))
 +              event_del(&c->inevent);
  
        free(c);
  }
@@@ -107,19 -139,20 +110,19 @@@ int dump_connections(struct evbuffer *o
  
        cp();
  
 -      logger(LOG_DEBUG, _("Connections:"));
 -
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
 -              logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
 -                         c->name, c->hostname, c->options, c->socket, c->status.value,
 -                         c->outbufsize, c->outbufstart, c->outbuflen);
 +              if(evbuffer_add_printf(out,
-                                                          _(" %s at %s options %lx socket %d status %04x\n"),
-                                                          c->name, c->hostname, c->options, c->socket,
-                                                          c->status.value) == -1)
++                                 _(" %s at %s options %lx socket %d status %04x\n"),
++                                 c->name, c->hostname, c->options, c->socket,
++                                 c->status.value) == -1)
 +                      return errno;
        }
  
 -      logger(LOG_DEBUG, _("End of connections."));
 +      return 0;
  }
  
 -bool read_connection_config(connection_t *c)
 -{
 +bool read_connection_config(connection_t *c) {
        char *fname;
        int x;
  

diff --cc src/cygwin/device.c
index 6b0dbea4819f782da832be2dd0b2dc86f901c5bb,c6e6f35392a4f0e76704f75d1991255bafe20977..97b2a38d0c60ef327317efec5359d032c9e3bd58
--- 1/src/cygwin/device.c
--- 2/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@@ -225,10 -227,14 +225,13 @@@ void close_device(void) 
        CloseHandle(device_handle);
  
        kill(reader_pid, SIGKILL);
+ 
+       free(device);
+       free(iface);
  }
  
 -bool read_packet(vpn_packet_t *packet)
 -{
 -      int lenin;
 +bool read_packet(vpn_packet_t *packet) {
 +      int inlen;
  
        cp();
  

diff --cc src/graph.c
index 02e8494f4d82b860490a410cc28c1c91954237b8,e0c48d42890425e337ab62cee1b9ec2c09a8fb17..8e801b3d55e567c36b3eb8fc80d79d951a8b8e62
--- 1/src/graph.c
--- 2/src/graph.c
+++ b/src/graph.c
@@@ -431,19 -366,19 +431,20 @@@ int dump_graph(struct evbuffer *out) 
        /* now dump all edges */
        for(node = edge_weight_tree->head; node; node = node->next) {
                e = node->data;
 -              fprintf(file, " %s -> %s;\n", e->from->name, e->to->name);
 +              if(evbuffer_add_printf(out, "   %s -> %s;\n",
 +                                                         e->from->name, e->to->name) == -1)
 +                      return errno;
        }
  
 -      fprintf(file, "}\n");   
 -      
 -      if(filename[0] == '|') {
 -              pclose(file);
 -      } else {
 -              fclose(file);
 -#ifdef HAVE_MINGW
 -              unlink(filename);
 -#endif
 -              rename(tmpname, filename);
 -              free(tmpname);
 -      }
 +      if(evbuffer_add_printf(out, "}\n") == -1)
 +              return errno;
 +
 +      return 0;
 +}
 +
 +void graph(void) {
++    subnet_cache_flush();
 +      sssp_dijkstra();
 +      check_reachability();
 +      mst_kruskal();
  }

diff --cc src/linux/device.c
index 5be210a582f6eb2b33b8916fab0b8b92dcd9b229,2e447556ae8b0b277557400c8e550449731cdc57..b02e88e721ff3d06bf51f2bec0d136d5243cdbfd
--- 1/src/linux/device.c
--- 2/src/linux/device.c
+++ b/src/linux/device.c
@@@ -115,10 -122,14 +120,13 @@@ void close_device(void) 
        cp();
        
        close(device_fd);
+ 
+       free(device);
+       free(iface);
  }
  
 -bool read_packet(vpn_packet_t *packet)
 -{
 -      int lenin;
 +bool read_packet(vpn_packet_t *packet) {
 +      int inlen;
        
        cp();
  

diff --cc src/mingw/device.c
index d6dde92d6d2e990db7f4ad65ce47510121665ac9,e025cf78f564be93eb43941de3956fbc46b28127..915256f502d4a18108cf199f87ca19011c11750f
--- 1/src/mingw/device.c
--- 2/src/mingw/device.c
+++ b/src/mingw/device.c
@@@ -311,9 -313,13 +311,12 @@@ void close_device(void) 
        cp();
  
        CloseHandle(device_handle);
+ 
+       free(device);
+       free(iface);
  }
  
 -bool read_packet(vpn_packet_t *packet)
 -{
 +bool read_packet(vpn_packet_t *packet) {
        unsigned char bufno;
  
        cp();

diff --cc src/net.c
Simple merge

diff --cc src/net.h
index 1f7b4576327592ea2abc94dd408bcdb445632340,e07e6465866b0b6effe4ecbc365196d55ee1526a..d320c15af6e537644e130a04b9fe144cc0d69166
--- 1/src/net.h
--- 2/src/net.h
+++ b/src/net.h
@@@ -33,13 -33,11 +33,11 @@@
  #define MTU 1518                              /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
  #endif
  
 -#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)      /* MTU + seqno + padding + HMAC + compressor overhead */
 +#define MAXSIZE (MTU + 4 + CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20)     /* MTU + seqno + padding + HMAC + compressor overhead */
  #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)  /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
  
 -#define MAXSOCKETS 128                        /* Overkill... */
 +#define MAXSOCKETS 8                  /* Probably overkill... */
  
- #define MAXQUEUELENGTH 8              /* Maximum number of packats in a single queue */
- 
  typedef struct mac_t {
        uint8_t x[6];
  } mac_t;
@@@ -87,20 -85,7 +85,9 @@@ typedef struct vpn_packet_t 
        uint8_t data[MAXSIZE];
  } vpn_packet_t;
  
- typedef struct queue_element_t {
-       void *packet;
-       struct queue_element_t *prev;
-       struct queue_element_t *next;
- } queue_element_t;
- 
- typedef struct packet_queue_t {
-       queue_element_t *head;
-       queue_element_t *tail;
- } packet_queue_t;
- 
  typedef struct listen_socket_t {
 +      struct event ev_tcp;
 +      struct event ev_udp;
        int tcp;
        int udp;
        sockaddr_t sa;
@@@ -114,9 -100,10 +102,11 @@@ typedef struct outgoing_t 
        struct config_t *cfg;
        struct addrinfo *ai;
        struct addrinfo *aip;
 +      struct event ev;
  } outgoing_t;
  
+ extern list_t *outgoing_list;
+ 
  extern int maxoutbufsize;
  extern int seconds_till_retry;
  extern int addressfamily;

diff --cc src/net_packet.c
index 754e669964ca58a5e5153fb56aa5c8e67e5268c4,544bbde775024a951d85525571406ca6ce0657c6..7d640cb6c804f90a799dbd7e0e93d69e30581655
--- 1/src/net_packet.c
--- 2/src/net_packet.c
+++ b/src/net_packet.c
@@@ -81,8 -88,9 +81,9 @@@ static void send_mtu_probe_handler(int 
                        len = 64;
                
                memset(packet.data, 0, 14);
 -              RAND_pseudo_bytes(packet.data + 14, len - 14);
 +              randomize(packet.data + 14, len - 14);
                packet.len = len;
+               packet.priority = 0;
  
                ifdebug(TRAFFIC) logger(LOG_INFO, _("Sending MTU probe length %d to %s (%s)"), len, n->name, n->hostname);
  
@@@ -244,6 -265,11 +245,8 @@@ static void receive_udppacket(node_t *n
                inpkt = outpkt;
        }
  
 -      if(n->connection)
 -              n->connection->last_ping_time = now;
 -
+       inpkt->priority = 0;
+ 
        if(!inpkt->data[12] && !inpkt->data[13])
                mtu_probe_h(n, inpkt);
        else
@@@ -268,8 -300,7 +275,7 @@@ static void send_udppacket(node_t *n, v
        int nextpkt = 0;
        vpn_packet_t *outpkt;
        int origlen;
 -      int outlen, outpad;
 +      size_t outlen;
-       vpn_packet_t *copy;
        static int priority = 0;
        int origpriority;
        int sock;
@@@ -438,21 -476,8 +445,8 @@@ void broadcast_packet(const node_t *fro
        }
  }
  
- void flush_queue(node_t *n) {
-       list_node_t *node, *next;
- 
-       cp();
- 
-       ifdebug(TRAFFIC) logger(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname);
- 
-       for(node = n->queue->head; node; node = next) {
-               next = node->next;
-               send_udppacket(n, node->data);
-               list_delete_node(n->queue, node);
-       }
- }
- 
- void handle_incoming_vpn_data(int sock, short events, void *data) {
 -void handle_incoming_vpn_data(int sock)
++void handle_incoming_vpn_data(int sock, short events, void *data)
+ {
        vpn_packet_t pkt;
        char *hostname;
        sockaddr_t from;

diff --cc src/net_setup.c
index 033bf3761eb773bd728e4827cf30de6ec72de723,3eb564411e5affc45d1d8c52d0c2c84067c91d12..43adbc8434fa59703bd3fab75958a6d9fdf00207
--- 1/src/net_setup.c
--- 2/src/net_setup.c
+++ b/src/net_setup.c
@@@ -552,6 -603,11 +548,8 @@@ void close_network_connections(void) 
  
        execute_script("tinc-down", envp);
  
 -      EVP_CIPHER_CTX_cleanup(&packet_ctx);
 -
+       if(myport) free(myport);
+ 
        for(i = 0; i < 4; i++)
                free(envp[i]);
  

diff --cc src/net_socket.c
index 808e1c660d0c8ef36a0c06475e5d6b045e7c5638,82213e91b1ac50852e5fc7cbf8d386bf1f7694d7..43b8ada2924bc4f3f18f41c1646d621608c7d3ff
--- 1/src/net_socket.c
--- 2/src/net_socket.c
+++ b/src/net_socket.c
@@@ -484,15 -451,41 +475,39 @@@ void handle_new_meta_connection(int soc
  
        c->allow_request = ID;
        send_id(c);
 -
 -      return true;
  }
  
- void try_outgoing_connections(void) {
+ void free_outgoing(outgoing_t *outgoing) {
+       if(outgoing->ai)
+               freeaddrinfo(outgoing->ai);
+ 
+       if(outgoing->name)
+               free(outgoing->name);
+ 
+       free(outgoing);
+ }
+ 
+ void try_outgoing_connections(void)
+ {
        static config_t *cfg = NULL;
        char *name;
        outgoing_t *outgoing;
- 
+       connection_t *c;
 -      avl_node_t *node;
++      splay_node_t *node;
+       
        cp();
  
+       if(outgoing_list) {
+               for(node = connection_tree->head; node; node = node->next) {
+                       c = node->data;
+                       c->outgoing = NULL;
+               }
+ 
+               list_delete_list(outgoing_list);
+       }
+ 
+       outgoing_list = list_alloc((list_action_t)free_outgoing);
+                       
        for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
                get_config_string(cfg, &name);
  
@@@ -504,8 -497,9 +519,9 @@@
                        continue;
                }
  
 -              outgoing = xmalloc_and_zero(sizeof(*outgoing));
 +              outgoing = xmalloc_and_zero(sizeof *outgoing);
                outgoing->name = name;
+               list_insert_tail(outgoing_list, outgoing);
                setup_outgoing_connection(outgoing);
        }
  }

diff --cc src/node.c
index a71a87356804a6e3e7bb50b676f29dd75f7fe894,4ee9ce72a36f9a775880862f4e892bd6513424c1..80d28d64112c8cc49e1ad3616b4fb06cb432c463
--- 1/src/node.c
--- 2/src/node.c
+++ b/src/node.c
@@@ -73,19 -78,20 +73,15 @@@ node_t *new_node(void) 
  
        n->subnet_tree = new_subnet_tree();
        n->edge_tree = new_edge_tree();
-       n->queue = list_alloc((list_action_t) free);
 -      EVP_CIPHER_CTX_init(&n->packet_ctx);
        n->mtu = MTU;
        n->maxmtu = MTU;
  
        return n;
  }
  
 -void free_node(node_t *n)
 -{
 +void free_node(node_t *n) {
        cp();
  
-       if(n->queue)
-               list_delete_list(n->queue);
 -      if(n->key)
 -              free(n->key);
--
        if(n->subnet_tree)
                free_subnet_tree(n->subnet_tree);
  

diff --cc src/node.h
index 7b777288c82639719930e63e4a14b134c797d351,55a1b5305f5f7848db958b8a983ef1a194383df7..f4fc88bbc5fc887a7f0740c37810ef12578226c1
--- 1/src/node.h
--- 2/src/node.h
+++ b/src/node.h
@@@ -60,9 -61,6 +60,7 @@@ typedef struct node_t 
  
        int compression;                        /* Compressionlevel, 0 = no compression */
  
-       list_t *queue;                          /* Queue for packets awaiting to be encrypted */
- 
 +      int distance;
        struct node_t *nexthop;                 /* nearest node from us to him */
        struct node_t *via;                     /* next hop for UDP packets */
  

diff --cc src/process.c
Simple merge

diff --cc src/protocol_auth.c
Simple merge

diff --cc src/protocol_key.c
Simple merge

diff --cc src/protocol_misc.c
index 95a240e18d8ffdbce7f2fe8aa599625ddc68c7d2,8f56aee50aff918a20f6a0791aa0c9acd7323a6b..02e3859810d2d9f76880abca5be513d852666767
--- 1/src/protocol_misc.c
--- 2/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@@ -151,9 -155,10 +151,10 @@@ bool send_tcppacket(connection_t *c, vp
  {
        cp();
  
-       /* If there already is a lot of data in the outbuf buffer, discard this packet. */
+       /* If there already is a lot of data in the outbuf buffer, discard this packet.
+            We use a very simple Random Early Drop algorithm. */
  
-       if(c->buffer->output->off > maxoutbufsize)
 -      if(2.0 * c->outbuflen / (double)maxoutbufsize - 1 > drand48())
++      if(2.0 * c->buffer->output->off / (double)maxoutbufsize - 1 > drand48())
                return true;
  
        if(!send_request(c, "%d %hd", PACKET, packet->len))

diff --cc src/protocol_subnet.c
Simple merge

diff --cc src/raw_socket/device.c
index 3694cb128e7a95c50e03f0bd80a06bbe28b00cdc,f2a135d3de57bea591b83d94447660d0db6a5caf..412ba41be55d6683e0fe43042820614437d68eda
--- 1/src/raw_socket/device.c
--- 2/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@@ -88,10 -90,14 +88,13 @@@ void close_device(void) 
        cp();
  
        close(device_fd);
+ 
+       free(device);
+       free(iface);
  }
  
 -bool read_packet(vpn_packet_t *packet)
 -{
 -      int lenin;
 +bool read_packet(vpn_packet_t *packet) {
 +      int inlen;
  
        cp();
  

diff --cc src/route.c
index f3622f59c195b08c47ef5941c94c1f0c360a9146,e79fae51f130a9ce4f5182d789022b41ab74aeda..8acabb1b02999b931ca5fb607e1a7335c10ef25b
--- 1/src/route.c
--- 2/src/route.c
+++ b/src/route.c
@@@ -575,10 -574,12 +589,12 @@@ static void route_neighborsol(node_t *s
  
        /* Generate checksum */
  
 -      checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
 +      checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
        checksum = inet_checksum(&ns, ns_size, checksum);
-       checksum = inet_checksum(&opt, opt_size, checksum);
-       checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+       if(has_opt) {
+               checksum = inet_checksum(&opt, opt_size, checksum);
+               checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+       }
  
        if(checksum) {
                ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: checksum error for neighbor solicitation request"));
@@@ -632,10 -637,12 +652,12 @@@
  
        /* Generate checksum */
  
 -      checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
 +      checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
        checksum = inet_checksum(&ns, ns_size, checksum);
-       checksum = inet_checksum(&opt, opt_size, checksum);
-       checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+       if(has_opt) {
+               checksum = inet_checksum(&opt, opt_size, checksum);
+               checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+       }
  
        ns.nd_ns_hdr.icmp6_cksum = checksum;
  

diff --cc src/solaris/device.c
index 25f66f389c822f63b51ecae82758b8e78b0f58aa,748b54597b809773a12685b2e41045ba289faaad..295a2f882d431d27c9f455e0e61d1c7173a88bc3
--- 1/src/solaris/device.c
--- 2/src/solaris/device.c
+++ b/src/solaris/device.c
@@@ -111,10 -114,14 +112,13 @@@ void close_device(void) 
        cp();
  
        close(device_fd);
+ 
+       free(device);
+       free(iface);
  }
  
 -bool read_packet(vpn_packet_t *packet)
 -{
 -      int lenin;
 +bool read_packet(vpn_packet_t *packet) {
 +      int inlen;
  
        cp();
  

diff --cc src/subnet.c
index 446d38b15f4c86ec34a583b5126705419616bcdf,9547829fa74b7563478c9f04fe1828282ae81b37..75fe31f886237c40bafc3f65a2518a0f884edc5d
--- 1/src/subnet.c
--- 2/src/subnet.c
+++ b/src/subnet.c
@@@ -35,16 -35,38 +35,38 @@@
  
  /* lists type of subnet */
  
 -avl_tree_t *subnet_tree;
 +splay_tree_t *subnet_tree;
  
+ /* Subnet lookup cache */
+ 
+ static ipv4_t cache_ipv4_address[2];
+ static subnet_t *cache_ipv4_subnet[2];
+ static bool cache_ipv4_valid[2];
+ static int cache_ipv4_slot;
+ 
+ static ipv6_t cache_ipv6_address[2];
+ static subnet_t *cache_ipv6_subnet[2];
+ static bool cache_ipv6_valid[2];
+ static int cache_ipv6_slot;
+ 
+ void subnet_cache_flush() {
+       cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
+       cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
+ }
+ 
  /* Subnet comparison */
  
  static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
  {
        int result;
  
 -      result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
 +      result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof a->net.mac.address);
  
+       if(result)
+               return result;
+       
+       result = a->weight - b->weight;
+ 
        if(result || !a->owner || !b->owner)
                return result;
  
@@@ -117,7 -149,9 +149,9 @@@ void init_subnets(void
  {
        cp();
  
 -      subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
 +      subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
+ 
+       subnet_cache_flush();
  }
  
  void exit_subnets(void)
@@@ -165,16 -199,20 +199,20 @@@ void subnet_add(node_t *n, subnet_t *su
  
        subnet->owner = n;
  
 -      avl_insert(subnet_tree, subnet);
 -      avl_insert(n->subnet_tree, subnet);
 +      splay_insert(subnet_tree, subnet);
 +      splay_insert(n->subnet_tree, subnet);
+ 
+       subnet_cache_flush();
  }
  
  void subnet_del(node_t *n, subnet_t *subnet)
  {
        cp();
  
 -      avl_delete(n->subnet_tree, subnet);
 -      avl_delete(subnet_tree, subnet);
 +      splay_delete(n->subnet_tree, subnet);
 +      splay_delete(subnet_tree, subnet);
+ 
+       subnet_cache_flush();
  }
  
  /* Ascii representation of subnets */
@@@ -332,7 -381,9 +381,9 @@@ subnet_t *lookup_subnet_mac(const mac_
  
  subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
  {
-       subnet_t *p, subnet = {0};
+       subnet_t *p, *r = NULL, subnet = {0};
 -      avl_node_t *n;
++      splay_node_t *n;
+       int i;
  
        cp();
  
@@@ -372,7 -428,9 +428,9 @@@
  
  subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
  {
-       subnet_t *p, subnet = {0};
+       subnet_t *p, *r = NULL, subnet = {0};
 -      avl_node_t *n;
++      splay_node_t *n;
+       int i;
  
        cp();
  

diff --cc src/subnet.h
index 48eec520f53a85213905aba8479c63c158143989,3efed1bea5d82cc3affe771c534ae1d0d2ef2d25..22af0d3a006ec9ba21e382fdc9092a1e69e8f962
--- 1/src/subnet.h
--- 2/src/subnet.h
+++ b/src/subnet.h
@@@ -81,6 -82,7 +82,7 @@@ extern subnet_t *lookup_subnet(const st
  extern subnet_t *lookup_subnet_mac(const mac_t *);
  extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
  extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
 -extern void dump_subnets(void);
 +extern int dump_subnets(struct evbuffer *);
+ extern void subnet_cache_flush(void);
  
  #endif                                                        /* __TINC_SUBNET_H__ */

diff --cc src/tincd.c
index 3e3b7b0dfd9586b435912958d2c275c2f9a70fca,f909d9a0aec25a93ecd2b3daaa5da7de5e169471..ac0cbc6c39cbe2683249b7119158d7cd80e74766
--- 1/src/tincd.c
--- 2/src/tincd.c
+++ b/src/tincd.c
@@@ -229,6 -399,14 +229,14 @@@ static void make_names(void
        }
  }
  
 -      if (pidfilename) free(pidfilename);
+ static void free_names() {
+       if (identname) free(identname);
+       if (netname) free(netname);
++      if (controlsocketname) free(controlsocketname);
+       if (logfilename) free(logfilename);
+       if (confbase) free(confbase);
+ }
+ 
  int main(int argc, char **argv)
  {
        program_name = argv[0];

diff --cc src/uml_socket/device.c
index 27fdd337aea77445a1268c1d1e06877ac1f35702,62a6f2eb65a762f4a940a7e77b13e4dddf91fc69..30194d9cf325b026c930d9bb05f7c1cc51b213d4
--- 1/src/uml_socket/device.c
--- 2/src/uml_socket/device.c
+++ b/src/uml_socket/device.c
@@@ -169,10 -171,14 +169,13 @@@ void close_device(void) 
                close(write_fd);
  
        unlink(device);
+ 
+       free(device);
+       if(iface) free(iface);
  }
  
 -bool read_packet(vpn_packet_t *packet)
 -{
 -      int lenin;
 +bool read_packet(vpn_packet_t *packet) {
 +      int inlen;
  
        cp();