- If no PrivateKeyFile is specified, /etc/tinc/netname/rsa_key.priv is assumed.
[tinc] / src / net.c
index 016b86a..7182953 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
-                            2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
 
     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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.64 2000/11/04 15:32:05 zarq Exp $
+    $Id: net.c,v 1.35.4.153 2002/02/11 14:20:21 guus Exp $
 */
 
 #include "config.h"
 
-#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/sockios.h>
-#include <net/if.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef HAVE_LINUX
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <sys/signal.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+   and FreeBSD wants these lines below the rest. */
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
 #include <openssl/rand.h>
 #include <openssl/evp.h>
-#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/hmac.h>
 
-#ifdef HAVE_TUNTAP
-#include LINUX_IF_TUN_H
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
 #endif
 
 #include <utils.h>
 #include <xalloc.h>
+#include <avl_tree.h>
+#include <list.h>
 
 #include "conf.h"
-#include "connlist.h"
+#include "connection.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
+#include "process.h"
 #include "protocol.h"
 #include "subnet.h"
+#include "graph.h"
+#include "process.h"
+#include "route.h"
+#include "device.h"
+#include "event.h"
 
 #include "system.h"
 
-int tap_fd = -1;
-int taptype = TAP_TYPE_ETHERTAP;
-int total_tap_in = 0;
-int total_tap_out = 0;
-int total_socket_in = 0;
-int total_socket_out = 0;
+int maxtimeout = 900;
+int seconds_till_retry = 5;
 
-config_t *upstreamcfg;
-static int seconds_till_retry;
+int tcp_socket = -1;
+int udp_socket = -1;
 
 int keylifetime = 0;
 int keyexpires = 0;
 
-char *unknown = NULL;
-char *interface_name = NULL;  /* Contains the name of the interface */
+int do_prune = 0;
+int do_purge = 0;
+int sighup = 0;
+int sigalrm = 0;
 
-subnet_t mymac;
+#define MAX_SEQNO 1073741824
 
-/*
-  Execute the given script.
-  This function doesn't really belong here.
-*/
-int execute_script(const char* name)
-{
-  char *scriptname;
-  pid_t pid;
-  char *s;
+/* VPN packet I/O */
 
-  if((pid = fork()) < 0)
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-            "fork");
-      return -1;
-    }
+void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
+{
+  vpn_packet_t outpkt;
+  int outlen, outpad;
+  EVP_CIPHER_CTX ctx;
+  char hmac[EVP_MAX_MD_SIZE];
+cp
 
-  if(pid)
+  if(myself->digest && myself->maclength)
     {
-      return 0;
+      inpkt->len -= myself->maclength;
+      HMAC(myself->digest, myself->key, myself->keylength, (char *)&inpkt->seqno, inpkt->len, hmac, NULL);
+      if(memcmp(hmac, (char *)&inpkt->seqno + inpkt->len, myself->maclength))
+       {
+         syslog(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"), n->name, n->hostname);
+         return;
+       }
     }
 
-  /* Child here */
-
-  asprintf(&scriptname, "%s/%s", confbase, name);
-  asprintf(&s, "IFNAME=%s", interface_name);
-  putenv(s);
-  free(s);
+  /* Decrypt the packet */
 
-  if(netname)
-    {
-      asprintf(&s, "NETNAME=%s", netname);
-      putenv(s);
-      free(s);
-    }
+  if(myself->cipher)
+  {
+    EVP_DecryptInit(&ctx, myself->cipher, myself->key, myself->key + myself->cipher->key_len);
+    EVP_DecryptUpdate(&ctx, (char *)&outpkt.seqno, &outlen, (char *)&inpkt->seqno, inpkt->len);
+    EVP_DecryptFinal(&ctx, (char *)&outpkt.seqno + outlen, &outpad);
+    outlen += outpad;
+    outpkt.len = outlen - sizeof(outpkt.seqno);
+  }
   else
-    {
-      unsetenv("NETNAME");
-    }
+  {
+    memcpy((char *)&outpkt.seqno, (char *)&inpkt->seqno, inpkt->len);
+    outpkt.len = inpkt->len - sizeof(outpkt.seqno);
+  }
 
-  if(chdir(confbase) < 0)
-    {
-      syslog(LOG_ERR, _("Couldn't chdir to `%s': %m"),
-            confbase);
-    }
-  
-  execl(scriptname, NULL);
-  /* No return on success */
+  if (ntohl(outpkt.seqno) <= n->received_seqno)
+  {
+    syslog(LOG_DEBUG, _("Got late or replayed packet from %s (%s), seqno %d"), n->name, n->hostname, ntohl(*(unsigned int *)&outpkt.seqno));
+    return;
+  }
   
-  if(errno != ENOENT)  /* Ignore if the file does not exist */
-    syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname);
+  n->received_seqno = ntohl(outpkt.seqno);
+
+  if(n->received_seqno > MAX_SEQNO)
+    keyexpires = 0;
 
-  /* No need to free things */
-  exit(0);
+  receive_packet(n, &outpkt);
+cp
 }
 
-int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
+void receive_tcppacket(connection_t *c, char *buffer, int len)
 {
   vpn_packet_t outpkt;
-  int outlen, outpad;
-  EVP_CIPHER_CTX ctx;
 cp
-  outpkt.len = inpkt->len;
-  
-  /* Encrypt the packet */
-  
-  EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
-  EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
-  EVP_EncryptFinal(&ctx, outpkt.data + outlen, &outpad);
-  outlen += outpad + 2;
+  outpkt.len = len;
+  memcpy(outpkt.data, buffer, len);
 
-/* Bypass
-  outlen = outpkt.len + 2;
-  memcpy(&outpkt, inpkt, outlen);
-*/  
-
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
-           outlen, cl->name, cl->hostname);
-
-  total_socket_out += outlen;
-
-  cl->want_ping = 1;
-
-  if((send(cl->socket, (char *) &(outpkt.len), outlen, 0)) < 0)
-    {
-      syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
-             cl->name, cl->hostname);
-      return -1;
-    }
+  receive_packet(c->node, &outpkt);
 cp
-  return 0;
 }
 
-int xrecv(vpn_packet_t *inpkt)
+void receive_packet(node_t *n, vpn_packet_t *packet)
 {
-  vpn_packet_t outpkt;
-  int outlen, outpad;
-  EVP_CIPHER_CTX ctx;
 cp
-  outpkt.len = inpkt->len;
-
-  /* Decrypt the packet */
-
-  EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->key_len);
-  EVP_DecryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len + 8);
-  EVP_DecryptFinal(&ctx, outpkt.data + outlen, &outpad);
-  outlen += outpad;
-
-/* Bypass
-  outlen = outpkt.len+2;
-  memcpy(&outpkt, inpkt, outlen);
-*/
-     
   if(debug_lvl >= DEBUG_TRAFFIC)
-    syslog(LOG_ERR, _("Writing packet of %d bytes to tap device"),
-           outpkt.len, outlen);
-
-  /* Fix mac address */
-
-  memcpy(outpkt.data, mymac.net.mac.address.x, 6);
+    syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, n->name, n->hostname);
 
-  if(taptype == TAP_TYPE_TUNTAP)
-    {
-      if(write(tap_fd, outpkt.data, outpkt.len) < 0)
-        syslog(LOG_ERR, _("Can't write to tun/tap device: %m"));
-      else
-        total_tap_out += outpkt.len;
-    }
-  else /* ethertap */
-    {
-      if(write(tap_fd, outpkt.data - 2, outpkt.len + 2) < 0)
-        syslog(LOG_ERR, _("Can't write to ethertap device: %m"));
-      else
-        total_tap_out += outpkt.len + 2;
-    }
+  route_incoming(n, packet);
 cp
-  return 0;
 }
 
-/*
-  add the given packet of size s to the
-  queue q, be it the send or receive queue
-*/
-void add_queue(packet_queue_t **q, void *packet, size_t s)
+void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 {
-  queue_element_t *e;
+  vpn_packet_t outpkt;
+  int outlen, outpad;
+  EVP_CIPHER_CTX ctx;
+  struct sockaddr_in to;
+  socklen_t tolen = sizeof(to);
+  vpn_packet_t *copy;
 cp
-  e = xmalloc(sizeof(*e));
-  e->packet = xmalloc(s);
-  memcpy(e->packet, packet, s);
-
-  if(!*q)
+  if(!n->status.validkey)
     {
-      *q = xmalloc(sizeof(**q));
-      (*q)->head = (*q)->tail = NULL;
-    }
+      if(debug_lvl >= DEBUG_TRAFFIC)
+       syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
+              n->name, n->hostname);
 
-  e->next = NULL;                      /* We insert at the tail */
+      /* Since packet is on the stack of handle_tap_input(),
+         we have to make a copy of it first. */
 
-  if((*q)->tail)                       /* Do we have a tail? */
-    {
-      (*q)->tail->next = e;
-      e->prev = (*q)->tail;
-    }
-  else                                 /* No tail -> no head too */
-    {
-      (*q)->head = e;
-      e->prev = NULL;
-    }
+      copy = xmalloc(sizeof(vpn_packet_t));
+      memcpy(copy, inpkt, sizeof(vpn_packet_t));
 
-  (*q)->tail = e;
-cp
-}
-
-/* Remove a queue element */
-void del_queue(packet_queue_t **q, queue_element_t *e)
-{
-cp
-  free(e->packet);
+      list_insert_tail(n->queue, copy);
 
-  if(e->next)                          /* There is a successor, so we are not tail */
-    {
-      if(e->prev)                      /* There is a predecessor, so we are not head */
-        {
-          e->next->prev = e->prev;
-          e->prev->next = e->next;
-        }
-      else                             /* We are head */
-        {
-          e->next->prev = NULL;
-          (*q)->head = e->next;
-        }
-    }
-  else                                 /* We are tail (or all alone!) */
-    {          
-      if(e->prev)                      /* We are not alone :) */
-        {
-          e->prev->next = NULL;
-          (*q)->tail = e->prev;
-        }
-      else                             /* Adieu */
-        {
-          free(*q);
-          *q = NULL;
-        }
+      if(!n->status.waitingforkey)
+       send_req_key(n->nexthop->connection, myself, n);
+      return;
     }
-    
-  free(e);
-cp
-}
 
-/*
-  flush a queue by calling function for
-  each packet, and removing it when that
-  returned a zero exit code
-*/
-void flush_queue(conn_list_t *cl, packet_queue_t **pq,
-                int (*function)(conn_list_t*,void*))
-{
-  queue_element_t *p, *next = NULL;
-cp
-  for(p = (*pq)->head; p != NULL; )
-    {
-      next = p->next;
+  /* Encrypt the packet. */
 
-      if(!function(cl, p->packet))
-        del_queue(pq, p);
-        
-      p = next;
-    }
+  inpkt->seqno = htonl(++(n->sent_seqno));
 
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    syslog(LOG_DEBUG, _("Queue flushed"));
-cp
-}
+  if(n->cipher)
+  {
+    EVP_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len);
+    EVP_EncryptUpdate(&ctx, (char *)&outpkt.seqno, &outlen, (char *)&inpkt->seqno, inpkt->len + sizeof(inpkt->seqno));
+    EVP_EncryptFinal(&ctx, (char *)&outpkt.seqno + outlen, &outpad);
+    outlen += outpad;
+  }
+  else
+  {
+    memcpy((char *)&outpkt.seqno, (char *)&inpkt->seqno, inpkt->len + sizeof(inpkt->seqno));
+    outlen = inpkt->len + sizeof(inpkt->seqno);
+  }
 
-/*
-  flush the send&recv queues
-  void because nothing goes wrong here, packets
-  remain in the queue if something goes wrong
-*/
-void flush_queues(conn_list_t *cl)
-{
-cp
-  if(cl->sq)
+  if(n->digest && n->maclength)
     {
-      if(debug_lvl >= DEBUG_TRAFFIC)
-       syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
-              cl->name, cl->hostname);
-      flush_queue(cl, &(cl->sq), xsend);
+      HMAC(n->digest, n->key, n->keylength, (char *)&outpkt.seqno, outlen, (char *)&outpkt.seqno + outlen, &outpad);
+      outlen += n->maclength;
     }
 
-  if(cl->rq)
+  to.sin_family = AF_INET;
+  to.sin_addr.s_addr = htonl(n->address);
+  to.sin_port = htons(n->port);
+
+  if((sendto(udp_socket, (char *)&outpkt.seqno, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
     {
-      if(debug_lvl >=  DEBUG_TRAFFIC)
-       syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
-              cl->name, cl->hostname);
-      flush_queue(cl, &(cl->rq), xrecv);
+      syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
+             n->name, n->hostname);
+      return;
     }
 cp
 }
@@ -344,139 +232,94 @@ cp
 /*
   send a packet to the given vpn ip.
 */
-int send_packet(ip_t to, vpn_packet_t *packet)
+void send_packet(node_t *n, vpn_packet_t *packet)
 {
-  conn_list_t *cl;
-  subnet_t *subnet;
+  node_t *via;
 cp
-  if((subnet = lookup_subnet_ipv4(to)) == NULL)
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+           packet->len, n->name, n->hostname);
+
+  if(n == myself)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
         {
-          syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
-                IP_ADDR_V(to));
+          syslog(LOG_NOTICE, _("Packet is looping back to us!"));
         }
 
-      return -1;
-   }
-
-  cl = subnet->owner;
-    
-  /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
-
-  /* FIXME - check for indirection and reprogram it The Right Way(tm) this time. */
-  
-  if(!cl->status.dataopen)
-    if(setup_vpn_connection(cl) < 0)
-      {
-        syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"),
-              cl->name, cl->hostname);
-        return -1;
-      }
-      
-  if(!cl->status.validkey)
+      return;
+    }
+  if(!n->status.reachable)
     {
-/* FIXME: Don't queue until everything else is fixed.
       if(debug_lvl >= DEBUG_TRAFFIC)
-       syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
-              cl->name, cl->hostname);
-      add_queue(&(cl->sq), packet, packet->len + 2);
-*/
-      if(!cl->status.waitingforkey)
-       send_req_key(myself, cl);                       /* Keys should be sent to the host running the tincd */
-      return 0;
+       syslog(LOG_INFO, _("Node %s (%s) is not reachable"),
+              n->name, n->hostname);
+      return;
     }
 
-  if(!cl->status.active)
+  via = (n->via == myself)?n->nexthop:n->via;
+
+  if(via != n && debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),
+           n->name, via->name, n->via->hostname);
+
+  if((myself->options | via->options) & OPTION_TCPONLY)
     {
-/* FIXME: Don't queue until everything else is fixed.
-      if(debug_lvl >= DEBUG_TRAFFIC)
-       syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"),
-              cl->name, cl->hostname);
-      add_queue(&(cl->sq), packet, packet->len + 2);
-*/
-      return 0; /* We don't want to mess up, do we? */
+      if(send_tcppacket(via->connection, packet))
+        terminate_connection(via->connection, 1);
     }
-
-  /* can we send it? can we? can we? huh? */
-cp
-  return xsend(cl, packet);
+  else
+    send_udppacket(via, packet);
 }
 
-/*
-  open the local ethertap device
-*/
-int setup_tap_fd(void)
+/* Broadcast a packet using the minimum spanning tree */
+
+void broadcast_packet(node_t *from, vpn_packet_t *packet)
 {
-  int nfd;
-  const char *tapfname;
-  config_t const *cfg;
-  struct ifreq ifr;
-
-cp  
-  if((cfg = get_config_val(config, tapdevice)))
-    tapfname = cfg->data.ptr;
-  else
-#ifdef HAVE_TUNTAP
-    tapfname = "/dev/misc/net/tun";
-#else
-    tapfname = "/dev/tap0";
-#endif
+  avl_node_t *node;
+  connection_t *c;
 cp
-  if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+          packet->len, from->name, from->hostname);
+
+  for(node = connection_tree->head; node; node = node->next)
     {
-      syslog(LOG_ERR, _("Could not open %s: %m"), tapfname);
-      return -1;
+      c = (connection_t *)node->data;
+      if(c->status.active && c->status.mst && c != from->nexthop->connection)
+        send_packet(c->node, packet);
     }
 cp
-  tap_fd = nfd;
+}
 
-  /* Set default MAC address for ethertap devices */
-  
-  taptype = TAP_TYPE_ETHERTAP;
-  mymac.type = SUBNET_MAC;
-  mymac.net.mac.address.x[0] = 0xfe;
-  mymac.net.mac.address.x[1] = 0xfd;
-  mymac.net.mac.address.x[2] = 0x00;
-  mymac.net.mac.address.x[3] = 0x00;
-  mymac.net.mac.address.x[4] = 0x00;
-  mymac.net.mac.address.x[5] = 0x00;
-
-#ifdef HAVE_TUNTAP
-  /* Ok now check if this is an old ethertap or a new tun/tap thingie */
-  memset(&ifr, 0, sizeof(ifr));
-cp
-  ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
-  if (netname)
-    strncpy(ifr.ifr_name, netname, IFNAMSIZ);
+void flush_queue(node_t *n)
+{
+  list_node_t *node, *next;
 cp
-  if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
-  { 
-    syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
-    taptype = TAP_TYPE_TUNTAP;
-  }
-#endif
-
-  /* Add name of network interface to environment (for scripts) */
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname);
 
-  ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr);
-  interface_name = xmalloc(strlen(ifr.ifr_name));
-  strcpy(interface_name, ifr.ifr_name);
-  
+  for(node = n->queue->head; node; node = next)
+    {
+      next = node->next;
+      send_udppacket(n, (vpn_packet_t *)node->data);
+      list_delete_node(n->queue, node);
+    }
 cp
-  return 0;
 }
 
-/*
-  set up the socket that we listen on for incoming
-  (tcp) connections
-*/
-int setup_listen_meta_socket(int port)
+/* Setup sockets */
+
+int setup_listen_socket(port_t port)
 {
   int nfd, flags;
   struct sockaddr_in a;
-  const int one = 1;
-  config_t const *cfg;
+  int option;
+  ipv4_t *address;
+#ifdef HAVE_LINUX
+  char *interface;
+#endif
 cp
   if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
@@ -484,54 +327,56 @@ cp
       return -1;
     }
 
-  if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-            "setsockopt");
-      return -1;
-    }
-
-  if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-            "setsockopt");
-      return -1;
-    }
-
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
+      close(nfd);
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
             "fcntl");
       return -1;
     }
 
-  if((cfg = get_config_val(config, interface)))
-    {
-      if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
-        {
-          syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
-          return -1;
-        }
-    }
+  /* Optimize TCP settings */
+
+  option = 1;
+  setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+  setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
+  setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+
+  option = IPTOS_LOWDELAY;
+  setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
+
+  if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
+    if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
+      {
+        close(nfd);
+        syslog(LOG_ERR, _("Can't bind to interface %s: %m"), interface);
+        return -1;
+      }
+#endif
 
   memset(&a, 0, sizeof(a));
   a.sin_family = AF_INET;
+  a.sin_addr.s_addr = htonl(INADDR_ANY);
   a.sin_port = htons(port);
-  
-  if((cfg = get_config_val(config, interfaceip)))
-    a.sin_addr.s_addr = htonl(cfg->data.ip->address);
-  else
-    a.sin_addr.s_addr = htonl(INADDR_ANY);
+
+  if(get_config_address(lookup_config(config_tree, "BindToAddress"), &address))
+    {
+      a.sin_addr.s_addr = htonl(*address);
+      free(address);
+    }
 
   if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
     {
+      close(nfd);
       syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port);
       return -1;
     }
 
   if(listen(nfd, 3))
     {
+      close(nfd);
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
             "listen");
       return -1;
@@ -540,11 +385,7 @@ cp
   return nfd;
 }
 
-/*
-  setup the socket for incoming encrypted
-  data (the udp part)
-*/
-int setup_vpn_in_socket(int port)
+int setup_vpn_in_socket(port_t port)
 {
   int nfd, flags;
   struct sockaddr_in a;
@@ -552,20 +393,17 @@ int setup_vpn_in_socket(int port)
 cp
   if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
     {
+      close(nfd);
       syslog(LOG_ERR, _("Creating socket failed: %m"));
       return -1;
     }
 
-  if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-            "setsockopt");
-      return -1;
-    }
+  setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
+      close(nfd);
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
             "fcntl");
       return -1;
@@ -578,6 +416,7 @@ cp
 
   if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
     {
+      close(nfd);
       syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
       return -1;
     }
@@ -585,289 +424,516 @@ cp
   return nfd;
 }
 
-/*
-  setup an outgoing meta (tcp) socket
-*/
-int setup_outgoing_meta_socket(conn_list_t *cl)
+void retry_outgoing(outgoing_t *outgoing)
+{
+  event_t *event;
+cp
+  outgoing->timeout += 5;
+  if(outgoing->timeout > maxtimeout)
+    outgoing->timeout = maxtimeout;
+
+  event = new_event();
+  event->handler = (event_handler_t)setup_outgoing_connection;
+  event->time = time(NULL) + outgoing->timeout;
+  event->data = outgoing;
+  event_add(event);
+
+  if(debug_lvl >= DEBUG_CONNECTIONS)
+    syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), outgoing->timeout);
+cp
+}
+
+int setup_outgoing_socket(connection_t *c)
 {
   int flags;
   struct sockaddr_in a;
-  config_t const *cfg;
 cp
   if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
+    syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
 
-  if((cfg = get_config_val(cl->config, port)) == NULL)
-    cl->port = 655;
-  else
-    cl->port = cfg->data.val;
+  c->socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
-  cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if(cl->meta_socket == -1)
+  if(c->socket == -1)
     {
       syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
-             cl->hostname, cl->port);
+             c->hostname, c->port);
       return -1;
     }
 
+  /* Bind first to get a fix on our source port???
+
   a.sin_family = AF_INET;
-  a.sin_port = htons(cl->port);
-  a.sin_addr.s_addr = htonl(cl->address);
+  a.sin_port = htons(0);
+  a.sin_addr.s_addr = htonl(INADDR_ANY);
 
-  if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
+  if(bind(c->socket, (struct sockaddr *)&a, sizeof(struct sockaddr)))
     {
-      syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port);
+      close(c->socket);
+      syslog(LOG_ERR, _("System call `%s' failed: %m"), "bind");
       return -1;
     }
 
-  flags = fcntl(cl->meta_socket, F_GETFL);
-  if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
+  */
+
+  /* Optimize TCP settings?
+
+  option = 1;
+  setsockopt(c->socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
+  setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+
+  option = IPTOS_LOWDELAY;
+  setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+#endif
+
+  */
+
+  /* Connect */
+
+  a.sin_family = AF_INET;
+  a.sin_port = htons(c->port);
+  a.sin_addr.s_addr = htonl(c->address);
+
+  if(connect(c->socket, (struct sockaddr *)&a, sizeof(a)) == -1)
+    {
+      close(c->socket);
+      syslog(LOG_ERR, _("%s port %hd: %m"), c->hostname, c->port);
+      return -1;
+    }
+
+  flags = fcntl(c->socket, F_GETFL);
+
+  if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
     {
+      close(c->socket);
       syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
-             cl->hostname, cl->port);
+             c->hostname, c->port);
       return -1;
     }
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_INFO, _("Connected to %s port %hd"),
-         cl->hostname, cl->port);
-
-  cl->status.meta = 1;
+         c->hostname, c->port);
 cp
   return 0;
 }
 
-/*
-  setup an outgoing connection. It's not
-  necessary to also open an udp socket as
-  well, because the other host will initiate
-  an authentication sequence during which
-  we will do just that.
-*/
-int setup_outgoing_connection(char *name)
+void setup_outgoing_connection(outgoing_t *outgoing)
 {
-  conn_list_t *ncn;
+  connection_t *c;
+  node_t *n;
   struct hostent *h;
-  config_t const *cfg;
 cp
-  if(check_id(name))
-    {
-      syslog(LOG_ERR, _("Invalid name for outgoing connection"));
-      return -1;
-    }
+  n = lookup_node(outgoing->name);
+  
+  if(n)
+    if(n->connection)
+      {
+        if(debug_lvl >= DEBUG_CONNECTIONS)       
+          syslog(LOG_INFO, _("Already connected to %s"), outgoing->name);
+        n->connection->outgoing = outgoing;
+        return;
+      }
 
-  ncn = new_conn_list();
-  asprintf(&ncn->name, "%s", name);
-    
-  if(read_host_config(ncn))
-    {
-      syslog(LOG_ERR, _("Error reading host configuration file for %s"));
-      free_conn_list(ncn);
-      return -1;
-    }
-    
-  if(!(cfg = get_config_val(ncn->config, address)))
+  c = new_connection();
+  c->name = xstrdup(outgoing->name);
+
+  init_configuration(&c->config_tree);
+  read_connection_config(c);
+  
+  if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname))
     {
-      syslog(LOG_ERR, _("No address specified for %s"));
-      free_conn_list(ncn);
-      return -1;
+      syslog(LOG_ERR, _("No address specified for %s"), c->name);
+      free_connection(c);
+      free(outgoing->name);
+      free(outgoing);
+      return;
     }
-    
-  if(!(h = gethostbyname(cfg->data.ptr)))
+
+  if(!get_config_port(lookup_config(c->config_tree, "Port"), &c->port))
+    c->port = 655;
+
+  if(!(h = gethostbyname(c->hostname)))
     {
-      syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
-      free_conn_list(ncn);
-      return -1;
+      syslog(LOG_ERR, _("Error looking up `%s': %m"), c->hostname);
+      free_connection(c);
+      retry_outgoing(outgoing);
+      return;
     }
 
-  ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
-  ncn->hostname = hostlookup(htonl(ncn->address));
-  
-  if(setup_outgoing_meta_socket(ncn) < 0)
+  c->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
+  c->hostname = hostlookup(htonl(c->address));
+
+  if(setup_outgoing_socket(c) < 0)
     {
-      syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
-             ncn->hostname);
-      free_conn_list(ncn);
-      return -1;
+      syslog(LOG_ERR, _("Could not set up a meta connection to %s (%s)"),
+             c->name, c->hostname);
+      retry_outgoing(outgoing);
+      return;
     }
 
-  ncn->status.outgoing = 1;
-  ncn->buffer = xmalloc(MAXBUFSIZE);
-  ncn->buflen = 0;
-  ncn->last_ping_time = time(NULL);
-  ncn->want_ping = 0;
+  c->outgoing = outgoing;
+  c->last_ping_time = time(NULL);
 
-  conn_list_add(ncn);
+  connection_add(c);
 
-  send_id(ncn);
+  send_id(c);
 cp
-  return 0;
 }
 
-/*
-  Configure conn_list_t myself and set up the local sockets (listen only)
-*/
-int setup_myself(void)
+int read_rsa_public_key(connection_t *c)
 {
-  config_t const *cfg;
-  subnet_t *net;
+  FILE *fp;
+  char *fname;
+  char *key;
 cp
-  myself = new_conn_list();
+  if(!c->rsa_key)
+    c->rsa_key = RSA_new();
 
-  asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
-  myself->flags = 0;
-  myself->protocol_version = PROT_CURRENT;
+  /* First, check for simple PublicKey statement */
 
-  if(!(cfg = get_config_val(config, tincname))) /* Not acceptable */
+  if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key))
     {
-      syslog(LOG_ERR, _("Name for tinc daemon required!"));
-      return -1;
+      BN_hex2bn(&c->rsa_key->n, key);
+      BN_hex2bn(&c->rsa_key->e, "FFFF");
+      free(key);
+      return 0;
     }
-  else
-    asprintf(&myself->name, "%s", (char*)cfg->data.val);
 
-  if(check_id(myself->name))
+  /* Else, check for PublicKeyFile statement and read it */
+
+  if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
     {
-      syslog(LOG_ERR, _("Invalid name for myself!"));
+      if(is_safe_path(fname))
+        {
+          if((fp = fopen(fname, "r")) == NULL)
+            {
+              syslog(LOG_ERR, _("Error reading RSA public key file `%s': %m"),
+                    fname);
+              free(fname);
+              return -1;
+            }
+          free(fname);
+          c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
+          fclose(fp);
+          if(!c->rsa_key)
+            {
+              syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"),
+                    fname);
+              return -1;
+            }
+          return 0;
+        }
+      else
+        {
+          free(fname);
+          return -1;
+       }
+    }
+
+  /* Else, check if a harnessed public key is in the config file */
+
+  asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+  if((fp = fopen(fname, "r")))
+    {
+      c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
+      fclose(fp);
+    }
+
+  free(fname);
+
+  if(c->rsa_key)
+    return 0;
+  else
+    {
+      syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
       return -1;
     }
+}
+
+int read_rsa_private_key(void)
+{
+  FILE *fp;
+  char *fname, *key;
 cp
-  if(!(cfg = get_config_val(config, privatekey)))
+  if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key))
     {
-      syslog(LOG_ERR, _("Private key for tinc daemon required!"));
-      return -1;
+      myself->connection->rsa_key = RSA_new();
+      BN_hex2bn(&myself->connection->rsa_key->d, key);
+      BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
+      free(key);
+      return 0;
+    }
+
+  if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
+    asprintf(&fname, "%s/rsa_key.priv", confbase);
+
+  if(is_safe_path(fname))
+    {
+      if((fp = fopen(fname, "r")) == NULL)
+        {
+          syslog(LOG_ERR, _("Error reading RSA private key file `%s': %m"),
+                fname);
+          free(fname);
+          return -1;
+        }
+      free(fname);
+      myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
+      fclose(fp);
+      if(!myself->connection->rsa_key)
+        {
+          syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
+                fname);
+          return -1;
+        }
+      return 0;
+    }
+
+  free(fname);
+  return -1;
+}
+
+int check_rsa_key(RSA *rsa_key)
+{
+  char *test1, *test2, *test3;
+cp
+  if(rsa_key->p && rsa_key->q)
+    {
+      if(RSA_check_key(rsa_key) != 1)
+         return -1;
     }
   else
     {
-      myself->rsa_key = RSA_new();
-      BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr);
-      BN_hex2bn(&myself->rsa_key->e, "FFFF");
+      test1 = xmalloc(RSA_size(rsa_key));
+      test2 = xmalloc(RSA_size(rsa_key));
+      test3 = xmalloc(RSA_size(rsa_key));
+
+      if(RSA_public_encrypt(RSA_size(rsa_key), test1, test2, rsa_key, RSA_NO_PADDING) != RSA_size(rsa_key))
+         return -1;
+
+      if(RSA_private_decrypt(RSA_size(rsa_key), test2, test3, rsa_key, RSA_NO_PADDING) != RSA_size(rsa_key))
+         return -1;
+
+      if(memcmp(test1, test3, RSA_size(rsa_key)))
+         return -1;
     }
+cp
+  return 0;
+}
+
+/*
+  Configure node_t myself and set up the local sockets (listen only)
+*/
+int setup_myself(void)
+{
+  config_t *cfg;
+  subnet_t *subnet;
+  char *name, *mode, *cipher, *digest;
+  int choice;
+cp
+  myself = new_node();
+  myself->connection = new_connection();
+  init_configuration(&myself->connection->config_tree);
+
+  asprintf(&myself->hostname, _("MYSELF"));
+  asprintf(&myself->connection->hostname, _("MYSELF"));
 
-  if(read_host_config(myself))
+  myself->connection->options = 0;
+  myself->connection->protocol_version = PROT_CURRENT;
+
+  if(!get_config_string(lookup_config(config_tree, "Name"), &name)) /* Not acceptable */
     {
-      syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
+      syslog(LOG_ERR, _("Name for tinc daemon required!"));
       return -1;
     }
-cp  
-  if(!(cfg = get_config_val(myself->config, publickey)))
+
+  if(check_id(name))
     {
-      syslog(LOG_ERR, _("Public key for tinc daemon required!"));
+      syslog(LOG_ERR, _("Invalid name for myself!"));
+      free(name);
       return -1;
     }
-  else
+
+  myself->name = name;
+  myself->connection->name = xstrdup(name);
+
+cp
+  if(read_rsa_private_key())
+    return -1;
+
+  if(read_connection_config(myself->connection))
     {
-      BN_hex2bn(&myself->rsa_key->n, cfg->data.ptr);
+      syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
+      return -1;
     }
-/*
-  if(RSA_check_key(myself->rsa_key) != 1)
+
+  if(read_rsa_public_key(myself->connection))
+    return -1;
+cp
+
+  if(check_rsa_key(myself->connection->rsa_key))
     {
       syslog(LOG_ERR, _("Invalid public/private keypair!"));
       return -1;
     }
-*/
-  if(!(cfg = get_config_val(myself->config, port)))
-    myself->port = 655;
-  else
-    myself->port = cfg->data.val;
 
-  if((cfg = get_config_val(myself->config, indirectdata)))
-    if(cfg->data.val == stupid_true)
-      myself->flags |= EXPORTINDIRECTDATA;
+  if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port))
+    myself->port = 655;
 
-  if((cfg = get_config_val(myself->config, tcponly)))
-    if(cfg->data.val == stupid_true)
-      myself->flags |= TCPONLY;
+  myself->connection->port = myself->port;
 
 /* Read in all the subnets specified in the host configuration file */
 
-  for(cfg = myself->config; (cfg = get_config_val(cfg, subnet)); cfg = cfg->next)
+  cfg = lookup_config(myself->connection->config_tree, "Subnet");
+
+  while(cfg)
+    {
+      if(!get_config_subnet(cfg, &subnet))
+        return -1;
+
+      subnet_add(myself, subnet);
+
+      cfg = lookup_config_next(myself->connection->config_tree, cfg);
+    }
+
+cp
+  /* Check some options */
+
+  if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice))
+    if(choice)
+      myself->options |= OPTION_INDIRECT;
+
+  if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice))
+    if(choice)
+      myself->options |= OPTION_TCPONLY;
+
+  if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice))
+    if(choice)
+      myself->options |= OPTION_INDIRECT;
+
+  if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice))
+    if(choice)
+      myself->options |= OPTION_TCPONLY;
+
+  if(myself->options & OPTION_TCPONLY)
+    myself->options |= OPTION_INDIRECT;
+
+  if(get_config_string(lookup_config(config_tree, "Mode"), &mode))
     {
-      net = new_subnet();
-      net->type = SUBNET_IPV4;
-      net->net.ipv4.address = cfg->data.ip->address;
-      net->net.ipv4.mask = cfg->data.ip->mask;
-      
-      /* Teach newbies what subnets are... */
-      
-      if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address)
+      if(!strcasecmp(mode, "router"))
+        routing_mode = RMODE_ROUTER;
+      else if (!strcasecmp(mode, "switch"))
+        routing_mode = RMODE_SWITCH;
+      else if (!strcasecmp(mode, "hub"))
+        routing_mode = RMODE_HUB;
+      else
         {
-          syslog(LOG_ERR, _("Network address and subnet mask do not match!"));
+          syslog(LOG_ERR, _("Invalid routing mode!"));
           return -1;
-        }        
-      
-      subnet_add(myself, net);
+        }
     }
-    
-  if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
+  else
+    routing_mode = RMODE_ROUTER;
+
+cp
+  /* Open sockets */
+  
+  if((tcp_socket = setup_listen_socket(myself->port)) < 0)
     {
-      syslog(LOG_ERR, _("Unable to set up a listening socket!"));
+      syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
       return -1;
     }
 
-  if((myself->socket = setup_vpn_in_socket(myself->port)) < 0)
+  if((udp_socket = setup_vpn_in_socket(myself->port)) < 0)
     {
-      syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket!"));
-      close(myself->meta_socket);
+      syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
       return -1;
     }
-
+cp
   /* Generate packet encryption key */
 
-  myself->cipher_pkttype = EVP_bf_cfb();
+  if(get_config_string(lookup_config(myself->connection->config_tree, "Cipher"), &cipher))
+    {
+      if(!strcasecmp(cipher, "none"))
+        {
+         myself->cipher = NULL;
+       }
+      else
+        {
+         if(!(myself->cipher = EVP_get_cipherbyname(cipher)))
+            {
+             syslog(LOG_ERR, _("Unrecognized cipher type!"));
+             return -1;
+           }
+        }
+    }
+  else
+    myself->cipher = EVP_bf_cbc();
 
-  myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len;
+  if(myself->cipher)
+    myself->keylength = myself->cipher->key_len + myself->cipher->iv_len;
+  else
+    myself->keylength = 1;
 
-  myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength);
-  RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+  myself->key = (char *)xmalloc(myself->keylength);
+  RAND_pseudo_bytes(myself->key, myself->keylength);
 
-  if(!(cfg = get_config_val(config, keyexpire)))
+  if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
     keylifetime = 3600;
-  else
-    keylifetime = cfg->data.val;
-    
-  keyexpires = time(NULL) + keylifetime;
-
-  /* Activate ourselves */
-  
-  myself->status.active = 1;
 
-  syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
-cp
-  return 0;
-}
+  keyexpires = time(NULL) + keylifetime;
 
-RETSIGTYPE
-sigalrm_handler(int a)
-{
-  config_t const *cfg;
-cp
-  cfg = get_config_val(upstreamcfg, connectto);
+  /* Check if we want to use message authentication codes... */
 
-  if(!cfg && upstreamcfg == config)
-    /* No upstream IP given, we're listen only. */
-    return;
+  if(get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
+    {
+      if(!strcasecmp(digest, "none"))
+        {
+         myself->digest = NULL;
+       }
+      else
+        {
+          if(!(myself->digest = EVP_get_digestbyname(digest)))
+           {
+             syslog(LOG_ERR, _("Unrecognized digest type!"));
+             return -1;
+            }
+       }
+    }
+  else
+    myself->digest = EVP_sha1();
 
-  while(cfg)
+  if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->maclength))
     {
-      upstreamcfg = cfg->next;
-      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
+      if(myself->digest)
         {
-          signal(SIGALRM, SIG_IGN);
-          return;
+         if(myself->maclength > myself->digest->md_size)
+            {
+             syslog(LOG_ERR, _("MAC length exceeds size of digest!"));
+             return -1;
+           }
+         else if (myself->maclength < 0)
+            {
+             syslog(LOG_ERR, _("Bogus MAC length!"));
+             return -1;
+           }
         }
-      cfg = get_config_val(upstreamcfg, connectto); /* Or else we try the next ConnectTo line */
     }
+  else
+    myself->maclength = 4;
+cp
+  /* Done */
 
-  signal(SIGALRM, sigalrm_handler);
-  upstreamcfg = config;
-  seconds_till_retry += 5;
-  if(seconds_till_retry > MAXTIMEOUT)    /* Don't wait more than MAXTIMEOUT seconds. */
-    seconds_till_retry = MAXTIMEOUT;
-  syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
-        seconds_till_retry);
-  alarm(seconds_till_retry);
+  myself->nexthop = myself;
+  myself->via = myself;
+  myself->status.active = 1;
+  node_add(myself);
+
+  graph();
+
+  syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
 cp
+  return 0;
 }
 
 /*
@@ -875,39 +941,33 @@ cp
 */
 int setup_network_connections(void)
 {
-  config_t const *cfg;
 cp
-  if((cfg = get_config_val(config, pingtimeout)) == NULL)
-    timeout = 5;
-  else
-    timeout = cfg->data.val;
+  init_connections();
+  init_subnets();
+  init_nodes();
+  init_edges();
+  init_events();
 
-  if(setup_tap_fd() < 0)
-    return -1;
+  if(get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
+    {
+      if(pingtimeout < 1)
+        {
+          pingtimeout = 86400;
+        }
+    }
+  else
+    pingtimeout = 60;
 
-  if(setup_myself() < 0)
+  if(setup_device() < 0)
     return -1;
 
   /* Run tinc-up script to further initialize the tap interface */
   execute_script("tinc-up");
-  
-  if(!(cfg = get_config_val(config, connectto)))
-    /* No upstream IP given, we're listen only. */
-    return 0;
 
-  while(cfg)
-    {
-      upstreamcfg = cfg->next;
-      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
-        return 0;
-      cfg = get_config_val(upstreamcfg, connectto); /* Or else we try the next ConnectTo line */
-    }
-    
-  signal(SIGALRM, sigalrm_handler);
-  upstreamcfg = config;
-  seconds_till_retry = MAXTIMEOUT;
-  syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
-  alarm(seconds_till_retry);
+  if(setup_myself() < 0)
+    return -1;
+
+  try_outgoing_connections();
 cp
   return 0;
 }
@@ -917,114 +977,70 @@ cp
 */
 void close_network_connections(void)
 {
-  conn_list_t *p;
+  avl_node_t *node, *next;
+  connection_t *c;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
+  for(node = connection_tree->head; node; node = next)
     {
-      p->status.active = 0;
-      terminate_connection(p);
+      next = node->next;
+      c = (connection_t *)node->data;
+      if(c->outgoing)
+        free(c->outgoing->name), free(c->outgoing);
+      terminate_connection(c, 0);
     }
 
-  if(myself)
-    if(myself->status.active)
-      {
-       close(myself->meta_socket);
-       close(myself->socket);
-        free_conn_list(myself);
-        myself = NULL;
-      }
+  if(myself && myself->connection)
+    terminate_connection(myself->connection, 0);
 
-  close(tap_fd);
+  close(udp_socket);
+  close(tcp_socket);
 
-  /* Execute tinc-down script right after shutting down the interface */
-  execute_script("tinc-down");
+  exit_events();
+  exit_edges();
+  exit_subnets();
+  exit_nodes();
+  exit_connections();
 
-  destroy_conn_list();
+  execute_script("tinc-down");
 
-  syslog(LOG_NOTICE, _("Terminating"));
+  close_device();
 cp
   return;
 }
 
-/*
-  create a data (udp) socket
-*/
-int setup_vpn_connection(conn_list_t *cl)
-{
-  int nfd, flags;
-  struct sockaddr_in a;
-cp
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
-
-  nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if(nfd == -1)
-    {
-      syslog(LOG_ERR, _("Creating UDP socket failed: %m"));
-      return -1;
-    }
-
-  a.sin_family = AF_INET;
-  a.sin_port = htons(cl->port);
-  a.sin_addr.s_addr = htonl(cl->address);
-
-  if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
-    {
-      syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
-            cl->hostname, cl->port);
-      return -1;
-    }
-
-  flags = fcntl(nfd, F_GETFL);
-  if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
-    {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
-             cl->name, cl->hostname);
-      return -1;
-    }
-
-  cl->socket = nfd;
-  cl->status.dataopen = 1;
-cp
-  return 0;
-}
-
 /*
   handle an incoming tcp connect call and open
   a connection to it.
 */
-conn_list_t *create_new_connection(int sfd)
+connection_t *create_new_connection(int sfd)
 {
-  conn_list_t *p;
+  connection_t *c;
   struct sockaddr_in ci;
   int len = sizeof(ci);
 cp
-  p = new_conn_list();
+  c = new_connection();
 
-  if(getpeername(sfd, &ci, &len) < 0)
+  if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
     {
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
             "getpeername");
+      close(sfd);
       return NULL;
     }
 
-  p->name = unknown;
-  p->address = ntohl(ci.sin_addr.s_addr);
-  p->hostname = hostlookup(ci.sin_addr.s_addr);
-  p->meta_socket = sfd;
-  p->status.meta = 1;
-  p->buffer = xmalloc(MAXBUFSIZE);
-  p->buflen = 0;
-  p->last_ping_time = time(NULL);
-  p->want_ping = 0;
-  
+  c->address = ntohl(ci.sin_addr.s_addr);
+  c->hostname = hostlookup(ci.sin_addr.s_addr);
+  c->port = htons(ci.sin_port);
+  c->socket = sfd;
+  c->last_ping_time = time(NULL);
+
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection from %s port %d"),
-         p->hostname, htons(ci.sin_port));
+         c->hostname, c->port);
 
-  p->allow_request = ID;
+  c->allow_request = ID;
 cp
-  return p;
+  return c;
 }
 
 /*
@@ -1032,21 +1048,20 @@ cp
 */
 void build_fdset(fd_set *fs)
 {
-  conn_list_t *p;
+  avl_node_t *node;
+  connection_t *c;
 cp
   FD_ZERO(fs);
 
-  for(p = conn_list; p != NULL; p = p->next)
+  for(node = connection_tree->head; node; node = node->next)
     {
-      if(p->status.meta)
-       FD_SET(p->meta_socket, fs);
-      if(p->status.dataopen)
-       FD_SET(p->socket, fs);
+      c = (connection_t *)node->data;
+      FD_SET(c->socket, fs);
     }
 
-  FD_SET(myself->meta_socket, fs);
-  FD_SET(myself->socket, fs);
-  FD_SET(tap_fd, fs);
+  FD_SET(tcp_socket, fs);
+  FD_SET(udp_socket, fs);
+  FD_SET(device_fd, fs);
 cp
 }
 
   udp socket and write it to the ethertap
   device after being decrypted
 */
-int handle_incoming_vpn_data()
+void handle_incoming_vpn_data(void)
 {
   vpn_packet_t pkt;
   int x, l = sizeof(x);
-  struct sockaddr from;
-  int lenin;
+  struct sockaddr_in from;
   socklen_t fromlen = sizeof(from);
+  node_t *n;
 cp
-  if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+  if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
-            __FILE__, __LINE__, myself->socket);
-      return -1;
+            __FILE__, __LINE__, udp_socket);
+      return;
     }
   if(x)
     {
       syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
-      return -1;
+      return;
     }
 
-  if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, &from, &fromlen)) <= 0)
+  if((pkt.len = recvfrom(udp_socket, (char *)&pkt.seqno, MAXSIZE, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
     {
       syslog(LOG_ERR, _("Receiving packet failed: %m"));
-      return -1;
+      return;
     }
 
-  if(debug_lvl >= DEBUG_TRAFFIC)
+  n = lookup_node_udp(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+
+  if(!n)
     {
-      syslog(LOG_DEBUG, _("Received packet of %d bytes"), lenin);
-    } 
+      syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+      return;
+    }
 
+/*
+  if(n->connection)
+    n->connection->last_ping_time = time(NULL);
+*/
+  receive_udppacket(n, &pkt);
 cp
-  return xrecv(&pkt);
 }
 
-/*
-  terminate a connection and notify the other
-  end before closing the sockets
-*/
-void terminate_connection(conn_list_t *cl)
+/* Purge edges and subnets of unreachable nodes. Use carefully. */
+
+void purge(void)
 {
-  conn_list_t *p;
+  avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext, *cnode;
+  node_t *n;
+  edge_t *e;
   subnet_t *s;
+  connection_t *c;
 cp
-  if(cl->status.remove)
-    return;
+  if(debug_lvl >= DEBUG_PROTOCOL)
+    syslog(LOG_DEBUG, _("Purging unreachable nodes"));
 
-  cl->status.remove = 1;
+  for(nnode = node_tree->head; nnode; nnode = nnext)
+  {
+    nnext = nnode->next;
+    n = (node_t *)nnode->data;
 
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
-           cl->name, cl->hostname);
-  if(cl->socket)
-    close(cl->socket);
-  if(cl->status.meta)
-    close(cl->meta_socket);
+    if(!n->status.reachable)
+    {
+      if(debug_lvl >= DEBUG_SCARY_THINGS)
+        syslog(LOG_DEBUG, _("Purging node %s (%s)"), n->name, n->hostname);
+
+      for(snode = n->subnet_tree->head; snode; snode = snext)
+      {
+        snext = snode->next;
+       s = (subnet_t *)snode->data;
+       
+       for(cnode = connection_tree->head; cnode; cnode = cnode->next)
+       {
+         c = (connection_t *)cnode->data;
+         if(c->status.active)
+           send_del_subnet(c, s);
+       }
+       
+       subnet_del(n, s);
+      }
+       
+      for(enode = n->edge_tree->head; enode; enode = enext)
+      {
+        enext = enode->next;
+       e = (edge_t *)enode->data;
+       
+       for(cnode = connection_tree->head; cnode; cnode = cnode->next)
+       {
+         c = (connection_t *)cnode->data;
+         if(c->status.active)
+           send_del_edge(c, e);
+       }
+       
+       edge_del(e);
+      }
 
+      node_del(n);
+    }
+  }    
 cp
-  /* Find all connections that were lost because they were behind cl
-     (the connection that was dropped). */
+}
 
-  if(cl->status.meta)
-    for(p = conn_list; p != NULL; p = p->next)
-      if((p->nexthop == cl) && (p != cl))
-        terminate_connection(p);       /* Sounds like recursion, but p does not have a meta connection :) */
+/*
+  Terminate a connection:
+  - Close the socket
+  - Remove associated edge and tell other connections about it if report = 1
+  - Check if we need to retry making an outgoing connection
+  - Deactivate the host
+*/
+void terminate_connection(connection_t *c, int report)
+{
+  avl_node_t *node;
+  connection_t *other;
+cp
+  if(c->status.remove)
+    return;
+  
+  if(debug_lvl >= DEBUG_CONNECTIONS)
+    syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+           c->name, c->hostname);
 
-  /* Inform others of termination if it was still active */
+  c->status.remove = 1;
+  
+  if(c->socket)
+    close(c->socket);
 
-  if(cl->status.active)
-    for(p = conn_list; p != NULL; p = p->next)
-      if(p->status.meta && p->status.active && p!=cl)
-        send_del_host(p, cl);
+  if(c->edge)
+    {
+      if(report)
+        {
+          for(node = connection_tree->head; node; node = node->next)
+            {
+              other = (connection_t *)node->data;
+              if(other->status.active && other != c)
+                send_del_edge(other, c->edge);
+            }
+        }
 
-  /* Remove the associated subnets */
+      edge_del(c->edge);
+    }
 
-  for(s = cl->subnets; s; s = s->next)
-    subnet_del(s);
+  /* Run MST and SSSP algorithms */
+  
+  graph();
 
   /* Check if this was our outgoing connection */
-    
-  if(cl->status.outgoing && cl->status.active)
+
+  if(c->outgoing)
     {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry = 5;
-      alarm(seconds_till_retry);
-      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+      retry_outgoing(c->outgoing);
+      c->outgoing = NULL;
     }
 
-  /* Inactivate */
+  /* Deactivate */
 
-  cl->status.active = 0;
+  c->status.active = 0;
+  if(c->node)
+    c->node->connection = NULL;
+  do_prune = 1;
 cp
 }
 
@@ -1158,38 +1239,45 @@ cp
   end does not reply in time, we consider them dead
   and close the connection.
 */
-int check_dead_connections(void)
+void check_dead_connections(void)
 {
-  conn_list_t *p;
   time_t now;
+  avl_node_t *node, *next;
+  connection_t *c;
 cp
   now = time(NULL);
-  for(p = conn_list; p != NULL; p = p->next)
+
+  for(node = connection_tree->head; node; node = next)
     {
-      if(p->status.active && p->status.meta)
-       {
-          if(p->last_ping_time + timeout < now)
+      next = node->next;
+      c = (connection_t *)node->data;
+      if(c->last_ping_time + pingtimeout < now)
+        {
+          if(c->status.active)
             {
-              if(p->status.pinged && !p->status.got_pong)
+              if(c->status.pinged)
                 {
                   if(debug_lvl >= DEBUG_PROTOCOL)
                    syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
-                          p->name, p->hostname);
-                 p->status.timeout = 1;
-                 terminate_connection(p);
+                          c->name, c->hostname);
+                 c->status.timeout = 1;
+                 terminate_connection(c, 1);
                 }
-              else if(p->want_ping)
+              else
                 {
-                  send_ping(p);
-                  p->last_ping_time = now;
-                  p->status.pinged = 1;
-                  p->status.got_pong = 0;
+                  send_ping(c);
                 }
             }
-       }
+          else
+            {
+              if(debug_lvl >= DEBUG_CONNECTIONS)
+                syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+                       c->name, c->hostname);
+              terminate_connection(c, 0);
+            }
+        }
     }
 cp
-  return 0;
 }
 
 /*
 */
 int handle_new_meta_connection()
 {
-  conn_list_t *ncn;
+  connection_t *new;
   struct sockaddr client;
-  int nfd, len = sizeof(client);
+  int fd, len = sizeof(client);
 cp
-  if((nfd = accept(myself->meta_socket, &client, &len)) < 0)
+  if((fd = accept(tcp_socket, &client, &len)) < 0)
     {
       syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
       return -1;
     }
 
-  if(!(ncn = create_new_connection(nfd)))
+  if(!(new = create_new_connection(fd)))
     {
-      shutdown(nfd, 2);
-      close(nfd);
+      shutdown(fd, 2);
+      close(fd);
       syslog(LOG_NOTICE, _("Closed attempted connection"));
       return 0;
     }
 
-  conn_list_add(ncn);
+  connection_add(new);
+
+  send_id(new);
 cp
   return 0;
 }
 
+void try_outgoing_connections(void)
+{
+  static config_t *cfg = NULL;
+  char *name;
+  outgoing_t *outgoing;
+cp
+  for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg))
+    {
+      get_config_string(cfg, &name);
+
+      if(check_id(name))
+        {
+          syslog(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line);
+          free(name);
+          continue;
+        }
+
+      outgoing = xmalloc_and_zero(sizeof(*outgoing));
+      outgoing->name = name;
+      setup_outgoing_connection(outgoing);
+    }
+}
+
 /*
   check all connections to see if anything
   happened on their sockets
 */
 void check_network_activity(fd_set *f)
 {
-  conn_list_t *p;
-  int x, l = sizeof(x);
+  connection_t *c;
+  avl_node_t *node;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
+  if(FD_ISSET(udp_socket, f))
+    handle_incoming_vpn_data();
+
+  for(node = connection_tree->head; node; node = node->next)
     {
-      if(p->status.remove)
-       continue;
+      c = (connection_t *)node->data;
+
+      if(c->status.remove)
+       return;
 
-      if(p->status.dataopen)
-       if(FD_ISSET(p->socket, f))
+      if(FD_ISSET(c->socket, f))
+       if(receive_meta(c) < 0)
          {
-           /*
-             The only thing that can happen to get us here is apparently an
-             error on this outgoing(!) UDP socket that isn't immediate (i.e.
-             something that will not trigger an error directly on send()).
-             I've once got here when it said `No route to host'.
-           */
-           getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
-           syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
-                   p->name, p->hostname, strerror(x));
-           terminate_connection(p);
+           terminate_connection(c, c->status.active);
            return;
-         }  
-
-      if(p->status.meta)
-       if(FD_ISSET(p->meta_socket, f))
-         if(receive_meta(p) < 0)
-           {
-             terminate_connection(p);
-             return;
-           } 
+         }
     }
-  
-  if(FD_ISSET(myself->socket, f))
-    handle_incoming_vpn_data();
 
-  if(FD_ISSET(myself->meta_socket, f))
+  if(FD_ISSET(tcp_socket, f))
     handle_new_meta_connection();
 cp
 }
 
-/*
-  read, encrypt and send data that is
-  available through the ethertap device
-*/
-void handle_tap_input(void)
+void prune_connections(void)
 {
-  vpn_packet_t vp;
-  int lenin;
-cp  
-  if(taptype == TAP_TYPE_TUNTAP)
-    {
-      if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
-        {
-          syslog(LOG_ERR, _("Error while reading from tun/tap device: %m"));
-          return;
-        }
-      vp.len = lenin;
-    }
-  else                 /* ethertap */
-    {
-      if((lenin = read(tap_fd, vp.data - 2, MTU)) <= 0)
-        {
-          syslog(LOG_ERR, _("Error while reading from ethertap device: %m"));
-          return;
-        }
-      vp.len = lenin - 2;
-    }
-
-  total_tap_in += lenin;
-
-  if(lenin < 32)
+  connection_t *c;
+  avl_node_t *node, *next;
+cp
+  for(node = connection_tree->head; node; node = next)
     {
-      if(debug_lvl >= DEBUG_TRAFFIC)
-       syslog(LOG_WARNING, _("Received short packet from tap device"));
-      return;
-    }
+      next = node->next;
+      c = (connection_t *)node->data;
 
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    {
-      syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
+      if(c->status.remove)
+       connection_del(c);
     }
-
-  send_packet(ntohl(*((unsigned long*)(&vp.data[30]))), &vp);
+  
+  if(!connection_tree->head)
+    purge();
 cp
 }
 
@@ -1324,20 +1395,29 @@ void main_loop(void)
   int r;
   time_t last_ping_check;
   int t;
+  event_t *event;
+  vpn_packet_t packet;
 cp
   last_ping_check = time(NULL);
 
+  srand(time(NULL));
+
   for(;;)
     {
-      tv.tv_sec = timeout;
+      tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
       tv.tv_usec = 0;
 
-      prune_conn_list();
+      if(do_prune)
+        {
+          prune_connections();
+          do_prune = 0;
+        }
+
       build_fdset(&fset);
 
       if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
         {
-         if(errno != EINTR) /* because of alarm */
+         if(errno != EINTR) /* because of a signal */
             {
               syslog(LOG_ERR, _("Error while waiting for input: %m"));
               return;
@@ -1349,27 +1429,33 @@ cp
           syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
           sighup = 0;
           close_network_connections();
-          clear_config(&config);
+          exit_configuration(&config_tree);
 
           if(read_server_config())
             {
               syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
-              exit(0);
+              exit(1);
             }
 
           sleep(5);
-          
+
           if(setup_network_connections())
             return;
-            
+
           continue;
         }
 
+      if(do_purge)
+        {
+         purge();
+         do_purge = 0;
+       }
+
       t = time(NULL);
 
       /* Let's check if everybody is still alive */
 
-      if(last_ping_check + timeout < t)
+      if(last_ping_check + pingtimeout < t)
        {
          check_dead_connections();
           last_ping_check = time(NULL);
@@ -1380,20 +1466,42 @@ cp
             {
               if(debug_lvl >= DEBUG_STATUS)
                 syslog(LOG_INFO, _("Regenerating symmetric key"));
-                
-              RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
-              send_key_changed(myself, NULL);
+
+              RAND_pseudo_bytes(myself->key, myself->keylength);
+              send_key_changed(myself->connection, myself);
               keyexpires = time(NULL) + keylifetime;
             }
        }
 
+      if(sigalrm)
+        {
+          syslog(LOG_INFO, _("Flushing event queue"));
+
+         while(event_tree->head)
+           {
+             event = (event_t *)event_tree->head->data;
+             event->handler(event->data);
+             event_del(event);
+           }
+         sigalrm = 0;
+        }
+
+      while((event = get_expired_event()))
+        {
+         event->handler(event->data);
+          free(event);
+       }
+
       if(r > 0)
         {
           check_network_activity(&fset);
 
           /* local tap data */
-          if(FD_ISSET(tap_fd, &fset))
-           handle_tap_input();
+          if(FD_ISSET(device_fd, &fset))
+            {
+              if(!read_packet(&packet))
+                route_outgoing(&packet);
+            }
         }
     }
 cp