X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=2081edc642a0be9c421027974ef51f215fd6d6c0;hp=2416599d4a0efe09cfbbae7fa761df67f77dd300;hb=9c75350ac6c14886195b6d368af2f118fd5d60e0;hpb=ff87f385c3a81499eff6b848aed8548cf6e5132e

diff --git a/src/protocol.c b/src/protocol.c
index 2416599d..2081edc6 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.23 2000/08/08 13:47:57 guus Exp $
+    $Id: protocol.c,v 1.28.4.29 2000/09/11 10:05:34 guus Exp $
 */
 
 #include "config.h"
@@ -44,1047 +44,807 @@
 
 #include "system.h"
 
-char buffer[MAXBUFSIZE+1];
-int buflen;
+/* Generic outgoing request routine - takes care of logging and error detection as well */
 
-/* Outgoing request routines */
-
-int send_ack(conn_list_t *cl)
+int send_request(conn_list_t *cl, const char *format, int request, /*args*/ ...)
 {
+  va_list args;
+  char *buffer = NULL;
 cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending ACK to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
+  if(debug_lvl >= DEBUG_PROTOCOL)
+    syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), requestname[request], cl->id, cl->hostname);
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
+  va_start(args, format);
+  len = vasprintf(&buffer, format, args);
+  va_end(args);
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
+  if(len < 0 || !buffer)
     {
-      syslog(LOG_ERR, _("Send failed: %d:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Error during vasprintf(): %m"));
       return -1;
     }
-cp
-  return 0;
-}
-
-int send_termreq(conn_list_t *cl)
-{
-cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
+  if(debug_lvl >= DEBUG_META)
+    syslog(LOG_DEBUG, _("Sending meta data to %s (%s): %s"), cl->id, cl->hostname, buffer);
 
-  if(write(cl->meta_socket, buffer, buflen) < 0)
+  if(cl->status.encryptout)
     {
-      if(debug_lvl > 1)
-	syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
+      /* FIXME: Do encryption */
     }
-cp
-  return 0;
-}
-
-int send_timeout(conn_list_t *cl)
-{
-cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
-
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
 
   if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Sending meta data failed:  %m"));
       return -1;
     }
-cp
-  return 0;
+cp  
 }
 
-int send_del_host(conn_list_t *cl, conn_list_t *new_host)
-{
-cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending DEL_HOST for %s (%s) to %s (%s)"),
-	   new_host->vpn_hostname, new_host->real_hostname, cl->vpn_hostname, cl->real_hostname);
+/* Connection protocol:
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
+   Client               Server
+   send_id(*)
+                        send_challenge
+   send_chal_reply(*)                   
+                        send_id
+   send_challenge
+                        send_chal_reply
+   send_ack
+			send_ack
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
+   (*) Unencrypted.
+*/      
+
+int send_id(conn_list_t *cl)
+{
 cp
-  return 0;
+  return send_request(cl, "%d %s %d %s", ID, myself->id, myself->version, opt2str(myself->options));
 }
 
-/* Evil hack - TCP tunneling is bad */
-int send_tcppacket(conn_list_t *cl, void *data, int len)
+int id_h(conn_list_t *cl)
 {
+  conn_list_t *old;
+  char *options;
 cp
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
-
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len);
-
-  if((write(cl->meta_socket, buffer, buflen)) != buflen)
+  if(sscanf(cl->buffer, "%*d %as %d %as", &cl->id, &cl->version, &options) != 3)
+    {
+       syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
+       return -1;
+    }
+    
+  /* Check if version matches */
+  
+  if(cl->version != myself->version)
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Peer %s uses incompatible version %d"), cl->hostname, cl->min_version, cl->max_version);
       return -1;
     }
 
-  if((write(cl->meta_socket, data, len)) != len)
+  /* Check if option string is valid */
+  
+  if((cl->options = str2opt(options)) == -1)
     {
-      syslog(LOG_ERR, _("Sending PACKET data failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Peer %s uses invalid option string"), cl->hostname);
       return -1;
     }
+    
+  /* Check if identity is a valid name */
   
-cp
-  return 0;
-}
-
-int send_ping(conn_list_t *cl)
-{
-cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
-
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
-
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
+  if(!check_id(cl->id))
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
       return -1;
     }
-cp
-  return 0;
-}
-
-int send_pong(conn_list_t *cl)
-{
-cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
-
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
-
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
+    
+  /* Load information about peer */
+  
+  if(!read_id(cl))
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->id);
       return -1;
     }
-cp
-  return 0;
-}
 
-int send_add_host(conn_list_t *cl, conn_list_t *new_host)
-{
-  ip_t real_ip;
-  int flags;
-  char *hostname;
-cp
-  real_ip = new_host->real_ip;
-  hostname = new_host->real_hostname;
-  flags = new_host->flags;
-  
-  /* If we need to propagate information about a new host that wants us to export
-   * it's indirectdata flag, we set the INDIRECTDATA flag and unset the EXPORT...
-   * flag, and set it's real_ip to our vpn_ip, so that net.c send_packet() will
-   * work correctly.
+
+  /* First check if the host we connected to is already in our
+     connection list. If so, we are probably making a loop, which
+     is not desirable.
    */
-     
-  if(flags & EXPORTINDIRECTDATA)
+
+  if(cl->status.outgoing)
     {
-      flags &= ~EXPORTINDIRECTDATA;
-      flags |= INDIRECTDATA;
-      real_ip = myself->vpn_ip;
-      hostname = myself->real_hostname;
+      if((old=lookup_id(cl->id)))
+        {
+          if(debug_lvl > DEBUG_CONNECTIONS)
+            syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->id, cl->hostname);
+          cl->status.outgoing = 0;
+          old->status.outgoing = 1;
+          terminate_connection(cl);
+          return 0;
+        }
     }
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
-	   new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);
+  /* Since we know the identity now, we can encrypt the meta channel */
+  
+  cl->status.encryptout = 1;
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
+  /* Send a challenge to verify the identity */
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
+  cl->allow_request = CHAL_REPLY;
 cp
-  return 0;
+  return send_challenge(cl);
 }
 
-int send_key_changed(conn_list_t *cl, conn_list_t *src)
+int send_challenge(conn_list_t *cl)
 {
+  char *buffer;
+  int keylength;
+  int x;
 cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin %s to %s (%s)"),
-	   src->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
+  if(cl->chal_hash)
+    free(cl->chal_hash);
+  
+  /* Allocate buffers for the challenge and the hash */
+  
+  cl->chal_hash = xmalloc(SHA_DIGEST_LEN);
+  keylength = BN_num_bytes(cl->metakey.n);
+  buffer = xmalloc(keylength*2);
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
+  /* Copy random data and the public key to the buffer */
+  
+  RAND_bytes(buffer, keylength);
+  BN_bn2bin(cl->metakey.n, buffer+keylength);
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
+  /* Calculate the hash from that */
+
+  SHA1(buffer, keylength*2, cl->chal_hash);
+
+  /* Convert the random data to a hexadecimal formatted string */
+
+  bin2hex(buffer,buffer,keylength);
+  buffer[keylength*2] = '\0';
+
+  /* Send the challenge */
+  
+  cl->allow_request = CHAL_REPLY;
+  x = send_request(cl, "%d %s", CHALLENGE, buffer);
+  free(buffer);
 cp
-  return 0;
+  return x;
 }
 
-void send_key_changed_all(void)
+int challenge_h(conn_list_t *cl)
 {
-  conn_list_t *p;
+  char *challenge;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p->status.meta && p->status.active)
-      send_key_changed(p, myself);
+  if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1)
+    {
+       syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->id, cl->hostname);
+       return -1;
+    }
+
+  /* Rest is done by send_chal_reply() */
+  
+  x = send_chal_reply(cl, challenge);
+  free(challenge);
 cp
+  return x;
 }
 
-int send_basic_info(conn_list_t *cl)
+int send_chal_reply(conn_list_t *cl, char *challenge)
 {
+  char *buffer;
+  int keylength;
+  char *hash;
+  int x;
 cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
-	   cl->real_hostname);
+  keylength = BN_num_bytes(myself->meyakey.n);
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x %d\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port, myself->flags);
+  /* Check if the length of the challenge is all right */
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
+  if(strlen(challenge) != keylength*2)
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERROR, _("Intruder: wrong challenge length from %s (%s)"), cl->id, cl->hostname);
       return -1;
     }
-cp
-  return 0;
-}
 
-int send_passphrase(conn_list_t *cl)
-{
-  passphrase_t tmp;
-cp
-  encrypt_passphrase(&tmp);
+  /* Allocate buffers for the challenge and the hash */
+  
+  buffer = xmalloc(keylength*2);
+  hash = xmalloc(SHA_DIGEST_LEN*2+1);
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PASSPHRASE to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
+  /* Copy the incoming random data and our public key to the buffer */
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
+  hex2bin(challenge, buffer, keylength); 
+  BN_bn2bin(myself->metakey.n, buffer+keylength);
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
-cp
-  return 0;
-}
+  /* Calculate the hash from that */
+  
+  SHA1(buffer, keylength*2, hash);
+  free(buffer);
 
-int send_public_key(conn_list_t *cl)
-{
-cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to %s (%s)"),
-	   cl->vpn_hostname, cl->real_hostname);
+  /* Convert the hash to a hexadecimal formatted string */
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
+  bin2hex(hash,hash,SHA_DIGEST_LEN);
+  hash[SHA_DIGEST_LEN*2] = '\0';
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
+  /* Send the reply */
+
+  if(cl->status.outgoing)
+    cl->allow_resuest = ID;
+  else
+    cl->allow_request = ACK;
+
+  x = send_request(cl, "%d %s", CHAL_REPLY, hash);
+  free(hash);
 cp
-  return 0;
-}
+  return x;
+} 
 
-/* WDN doet deze functie? (GS)
-int send_calculate(conn_list_t *cl, char *k)
+int chal_reply_h(conn_list_t *cl)
 {
+  char *hash;
 cp
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", CALCULATE, k);
+  if(sscanf(cl->buffer, "%*d %as", &cl->id, &hash) != 2)
+    {
+       syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->id, cl->hostname);
+       return -1;
+    }
 
-  if((write(cl->meta_socket, buffer, buflen)) < 0)
+  /* Check if the length of the hash is all right */
+  
+  if(strlen(hash) != SHA_DIGEST_LEN*2)
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERROR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->id, cl->hostname);
       return -1;
     }
-cp
-  return 0;
-}
-*/
-
-int send_key_request(ip_t to)
-{
-  conn_list_t *fw;
-cp
-  fw = lookup_conn(to);
-  if(!fw)
+    
+  /* Convert the hash to binary format */
+  
+  hex2bin(hash, hash, SHA_DIGEST_LEN);
+  
+  /* Verify the incoming hash with the calculated hash */
+  
+  if{!memcmp(hash, cl->chal_hash, SHA_DIGEST_LEN)}
     {
-      syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),
-	     IP_ADDR_V(to));
+      syslog(LOG_ERROR, _("Intruder: wrong challenge reply from %s (%s)"), cl->id, cl->hostname);
       return -1;
     }
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending REQ_KEY to %s (%s)"),
-	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
+  /* Identity has now been positively verified.
+     If we are accepting this new connection, then send our identity,
+     if we are making this connecting, acknowledge.
+   */
+   
+  free(hash);
+  free(cl->chal_hash);
 
-  if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+cp
+  if(cl->status.outgoing)
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
+      cl->allow_request = ACK;
+      return send_ack(cl);
     }
-  fw->status.waitingforkey = 1;
+  else
+    {
+      cl->allow_request = CHALLENGE;
+      return send_id(cl);
+    }
+}
+
+int send_ack(conn_list_t *cl)
+{
 cp
-  return 0;
+  return send_request(cl, "%d", ACK);
 }
 
-int send_key_answer(conn_list_t *cl, ip_t to)
+int ack_h(conn_list_t *cl)
 {
-  conn_list_t *fw;
+  conn_list_t old;
 cp
+  /* Okay, before we active the connection, we check if there is another entry
+     in the connection list with the same vpn_ip. If so, it presumably is an
+     old connection that has timed out but we don't know it yet.
+   */
 
-  fw = lookup_conn(to);
-  
-  if(!fw)
+  while((old = lookup_id(cl->id))) 
     {
-      syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),
-	     IP_ADDR_V(to));
-      return -1;
+      if(debug_lvl > DEBUG_CONNECTIONS)
+        syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
+        cl->id, old->hostname, cl->hostname);
+      old->status.active = 0;
+      terminate_connection(old);
     }
 
- if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
-	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
+  /* Activate this connection */
 
-  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
+  cl->allow_request = ALL;
+  cl->status.active = 1;
+
+  if(debug_lvl > DEBUG_CONNECTIONS)
+    syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->id, cl->hostname);
+
+  /* Exchange information about other tinc daemons */
+
+  notify_others(cl, NULL, send_add_host);
+  notify_one(cl);
+
+  upstreamindex = 0;
 
-  if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
 cp
-  return 0;
+  if(cl->status.outgoing)
+    return 0;
+  else
+    return send_ack(cl);
 }
 
-/*
-  notify all my direct connections of a new host
-  that was added to the vpn, with the exception
-  of the source of the announcement.
-*/
-int notify_others(conn_list_t *new, conn_list_t *source,
-		  int (*function)(conn_list_t*, conn_list_t*))
+/* Address and subnet information exchange */
+
+int send_add_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet)
 {
-  conn_list_t *p;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p != new && p != source && p->status.meta && p->status.active)
-      function(p, new);
-cp
-  return 0;
+  return send_request(cl, "%d %s %d %s", ADD_SUBNET, other->id, subnet->type, net2str(subnet));
 }
 
-/*
-  notify one connection of everything
-  i have connected
-*/
-int notify_one(conn_list_t *new)
+int add_subnet_h(conn_list_t *cl)
+{
+}
+
+int send_del_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet)
 {
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p != new && p->status.active)
-      send_add_host(new, p);
 cp
-  return 0;
+  return send_request(cl, "%d %s %d %s", DEL_SUBNET, other->id, subnet->type, net2str(subnet));
 }
 
-/*
-  The incoming request handlers
-*/
+int del_subnet_h(conn_list_t *cl)
+{
+}
 
-int basic_info_h(conn_list_t *cl)
+/* New and closed connections notification */
+
+int send_add_host(conn_list_t *cl, conn_list_t *other)
 {
-  conn_list_t *old;
 cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->real_hostname);
+  return send_request(cl, "%d %s %lx:%d %s", ADD_HOST, other->id, other->address, other->port, opt2str(other->options));
+}
 
-  if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
+int add_host_h(conn_list_t *cl)
+{
+  char *options;
+  conn_list_t *old, *new;
+cp
+  new = new_conn_list();
+
+  if(sscanf(cl->buffer, "%*d %as %lx:%d %as", &new->id, &new->address, &new->port, &options) != 4)
     {
-       syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
-              cl->real_hostname);
+       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->id, cl->hostname);
        return -1;
-    }
-    
-  cl->vpn_hostname = hostlookup(htonl(cl->vpn_ip));
+    }  
 
-  if(cl->protocol_version != PROT_CURRENT)
+  /* Check if option string is valid */
+  
+  if((new->options = str2opt(options) == -1)
     {
-      syslog(LOG_ERR, _("Peer uses incompatible protocol version %d"),
-	     cl->protocol_version);
+      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid option string"), cl->hostname);
       return -1;
     }
 
-  if(cl->status.outgoing)
+  /* Check if identity is a valid name */
+  
+  if(!check_id(new->id))
     {
-      /* First check if the host we connected to is already in our
-         connection list. If so, we are probably making a loop, which
-         is not desirable.
-       */
-       
-      if((old=lookup_conn(cl->vpn_ip)))
-        {
-          if(debug_lvl>0)
-            syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"),
-              cl->vpn_hostname, cl->real_hostname);
-          cl->status.outgoing = 0;
-          old->status.outgoing = 1;
-          terminate_connection(cl);
-          return 0;
-        }
-
-      if(setup_vpn_connection(cl) < 0)
-	return -1;
-      send_basic_info(cl);
+      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->id, cl->hostname);
+      return -1;
     }
-  else
+    
+  /* Check if somebody tries to add ourself */
+  
+  if(!strcmp(new->id, myself->id))
     {
-        
-      if(setup_vpn_connection(cl) < 0)
-	return -1;
-      send_passphrase(cl);
+      syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->id, cl->hostname);
+      sighup = 1;
+      return 0;
     }
-cp
-  return 0;
-}
 
-int passphrase_h(conn_list_t *cl)
-{
-cp
-  cl->pp = xmalloc(sizeof(*(cl->pp)));
+  /* Fill in more of the new conn_list structure */
+
+  new->hostname = hostlookup(htonl(new->address));
+  
+  /* Check if the new host already exists in the connnection list */
 
-  if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
+  if((old = lookup_id(id))
     {
-      syslog(LOG_ERR, _("Got bad PASSPHRASE from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
+      if((new->address == old->address) && (new->port == old->port))
+        {
+          if(debug_lvl > DEBUG_CONNECTIONS)
+            syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"), old->id, old->hostname, new->id, new->hostname);
+	  return 0;
+        }
+      else
+        {
+          if(debug_lvl > DEBUG_CONNECTIONS)
+            syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"), old->id, old->hostname);
+          old->status.active = 0;
+          terminate_connection(old);
+        }
     }
-  cl->pp->len = strlen(cl->pp->phrase);
-    
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PASSPHRASE from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
 
-  if(cl->status.outgoing)
-    send_passphrase(cl);
-  else
-    send_public_key(cl);
+  /* Fill in rest of conn_list structure */
+
+  new->nexthop = cl;
+  new->status.active = 1;
+  
+  /* Hook it up into the conn_list */
+
+  conn_list_add(conn_list, new);
+
+  /* Tell the rest about the new host */
+  
+  notify_others(new, cl, send_add_host);
+  
 cp
   return 0;
 }
 
-int public_key_h(conn_list_t *cl)
+int send_del_host(conn_list_t *cl, conn_list_t *other)
+{
+cp
+  return send_request(cl, "%d %s %lx:%d", DEL_HOST, other->id, other->address, other->port);
+}
+
+int del_host_h(conn_list_t *cl)
 {
-  char *g_n;
+  char *id;
+  ip_t address;
+  port_t port;
   conn_list_t *old;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
+  if(sscanf(cl->buffer, "%*d %as %lx:%d", &id, &address, &port) != 3)
     {
-       syslog(LOG_ERR, _("Got bad PUBLIC_KEY from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
+       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"), cl->id, cl->hostname);
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PUBLIC_KEY from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-
-  if(verify_passphrase(cl, g_n))
+  /* Check if somebody tries to delete ourself */
+  
+  if(!strcmp(id, myself->id))
     {
-      /* intruder! */
-      syslog(LOG_ERR, _("Intruder from %s: passphrase for %s does not match!"),
-              cl->real_hostname, cl->vpn_hostname);
-      return -1;
+      syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"), cl->id, cl->hostname);
+      sighup = 1;
+      return 0;
     }
 
-  if(cl->status.outgoing)
-    send_public_key(cl);
-  else
+  /* Check if the new host already exists in the connnection list */
+
+  if((old = lookup_id(id))
     {
-      send_ack(cl);
+      if((address == old->address) && (port == old->port))
+        {
+          notify_others(old, cl, send_del_host);
 
-      /* Okay, before we active the connection, we check if there is another entry
-         in the connection list with the same vpn_ip. If so, it presumably is an
-         old connection that has timed out but we don't know it yet.
-       */
+          fw->status.termreq = 1;
+          fw->status.active = 0;
 
-      while((old = lookup_conn(cl->vpn_ip))) 
-        {
-          if(debug_lvl > 1)
-            syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
-            cl->vpn_hostname, old->real_hostname, cl->real_hostname);
-          old->status.active = 0;
-          terminate_connection(old);
+          terminate_connection(fw);
+cp
+          return 0;
         }
-        
-      cl->status.active = 1;
-
-      if(debug_lvl > 0)
-        syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
-                           cl->vpn_hostname, cl->real_hostname);
+    }
 
-      notify_others(cl, NULL, send_add_host);
-      notify_one(cl);
+  if(debug_lvl > DEBUG_CONNECTIONS)
+    {
+      syslog(LOG_NOTICE, _("Got DEL_HOST for %s from %s (%s) which is not in our connection list"), id, cl->id, cl->hostname);
     }
 cp
   return 0;
 }
 
-int ack_h(conn_list_t *cl)
+/* Status and error notification routines */
+
+int send_status(conn_list_t *cl, int statusno, char *statusstring)
 {
 cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got ACK from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-  
-  cl->status.active = 1;
-
-  if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
-              cl->vpn_hostname, cl->real_hostname);
-
-  notify_others(cl, NULL, send_add_host);
-  notify_one(cl);
-
-  upstreamindex = 0;
+  if(!statusstring)
+    statusstring = status_text[statusno];
 cp
-  return 0;
+  return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
 }
 
-int termreq_h(conn_list_t *cl)
+int status_h(conn_list_t *cl)
 {
+  int statusno;
+  char *statusstring;
 cp
-  if(!cl->status.active)
+  if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2)
     {
-      syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
+       syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"), cl->id, cl->hostname);
+       return -1;
     }
-    
-  if(debug_lvl > 1)
-   syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
-             cl->vpn_hostname, cl->real_hostname);
-  
-  cl->status.termreq = 1;
-
-  terminate_connection(cl);
-cp
-  return 0;
-}
 
-int timeout_h(conn_list_t *cl)
-{
-cp
-  if(!cl->status.active)
+  if(debug_lvl > DEBUG_STATUS)
     {
-      syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
+      syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"), cl->id, cl->hostname, status_text[statusno], statusstring);
     }
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-
-  cl->status.termreq = 1;
-  terminate_connection(cl);
 cp
+  free(statusstring);
   return 0;
 }
 
-int del_host_h(conn_list_t *cl)
+int send_error(conn_list_t *cl, int errno, char *errstring)
 {
-  ip_t vpn_ip;
-  conn_list_t *fw;
 cp
-  if(!cl->status.active)
-    {
-      syslog(LOG_ERR, _("Got unauthorized DEL_HOST from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
+  if(!errorstring)
+    errorstring = error_text[errno];
+  return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+}
 
-  if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
+int error_h(conn_list_t *cl)
+{
+  int errno;
+  char *errorstring;
+cp
+  if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
     {
-       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
+       syslog(LOG_ERR, _("Got bad error from %s (%s)"), cl->id, cl->hostname);
        return -1;
-    }  
-
-  if(!(fw = lookup_conn(vpn_ip)))
-    {
-      syslog(LOG_ERR, _("Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"),
-	     IP_ADDR_V(vpn_ip), cl->vpn_hostname, cl->real_hostname);
-      return 0;
     }
 
-  /* Connections lists are really messed up if this happens */
-  if(vpn_ip == myself->vpn_ip)
+  if(debug_lvl > DEBUG_error)
     {
-      syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
-               cl->vpn_hostname, cl->real_hostname);
-      sighup = 1;
-      return 0;
+      syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"), cl->id, cl->hostname, error_text[errno], errorstring);
     }
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
-           fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
-
-  notify_others(fw, cl, send_del_host);
-
-  fw->status.termreq = 1;
-  fw->status.active = 0;
-
-  terminate_connection(fw);
+  free(errorstring);
+  cl->status.termreq = 1;
+  terminate_connection(cl);
 cp
   return 0;
 }
 
-int tcppacket_h(conn_list_t *cl)
+int send_termreq(conn_list_t *cl)
 {
-  real_packet_t rp;
-  int len, count = 0, result;
-  conn_list_t *f;
 cp
-  if(!cl->status.active)
-    {
-      syslog(LOG_ERR, _("Got unauthorized PACKET from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-
-  if(sscanf(cl->buffer, "%*d %d", &len) != 1)
-    {
-       syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-       return -1;
-    }  
-
-  if(len > MTU)
-    {
-       syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-       return -1;
-    }  
-
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
-              cl->vpn_hostname, cl->real_hostname);
-
-  /* Evil kludge comming up */
-  while(len)
-    {
-       if(debug_lvl > 3)
-         syslog(LOG_DEBUG, _("Direct read count=%d len=%d rp=%p socket=%d"), count, len, ((char *)&rp)+count, cl->meta_socket);
-
-       result=read(cl->meta_socket,((char *)&rp)+count,len);
-       if(result<0)
-         {
-           syslog(LOG_ERR, _("Error while receiving PACKET data from %s (%s): %m"),
-              cl->vpn_hostname, cl->real_hostname);
-           return -1;
-         }
-       count+=result;
-       len-=result;
-    }
-
-  total_socket_in += len;
-
-  rp.data.len = ntohs(rp.data.len);
-  rp.len = ntohs(rp.len);
-  rp.from = ntohl(rp.from);
+  return send_request(cl, "%d", TERMREQ);
+}
 
-  if(rp.len >= 0)
-    {
-      f = lookup_conn(rp.from);
-      if(!f)
-	{
-	  syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
-		 cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from));
-	  return -1;
-	}
-
-      if(f->status.validkey)
-	xrecv(f, &rp);
-      else
-	{
-/*	  add_queue(&(f->rq), &rp, rp.len);  We can't do this since rp is on the stack */
-	  if(!cl->status.waitingforkey)
-	    send_key_request(rp.from);
-	}
-
-      if(my_key_expiry <= time(NULL))
-	regenerate_keys();
-    }
+int termreq_h(conn_list_t *cl)
+{
+cp
+  cl->status.termreq = 1;
+  terminate_connection(cl);
 cp
   return 0;
 }
 
+/* Keepalive routines - FIXME: needs a closer look */
+
+int send_ping(conn_list_t *cl)
+{
+  cl->status.pinged = 1;
+cp
+  return send_request(cl, "%d", PING);
+}
 
 int ping_h(conn_list_t *cl)
 {
 cp
-  if(!cl->status.active)
-    {
-      syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
+  return send_pong(cl);
+}
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
+int send_pong(conn_list_t *cl)
+{
+cp
+  return send_request(cl, "%d", PONG);
+}
 
-  cl->status.pinged = 0;
+int pong_h(conn_list_t *cl)
+{
+cp
   cl->status.got_pong = 1;
-
-  send_pong(cl);
 cp
   return 0;
 }
 
-int pong_h(conn_list_t *cl)
+/* Key exchange */
+
+int send_key_changed(conn_list_t *from, conn_list_t *cl)
 {
+  conn_list_t *p;
 cp
-  if(!cl->status.active)
+  for(p = conn_list; p != NULL; p = p->next)
     {
-      syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
+      if(p!=cl && p->status.meta && p->status.active)
+        send_request(p, "%d %s", KEY_CHANGED, from->id);
     }
-
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-
-  cl->status.got_pong = 1;
 cp
   return 0;
 }
 
-int add_host_h(conn_list_t *cl)
+int key_changed_h(conn_list_t *cl)
 {
-  ip_t real_ip;
-  ip_t vpn_ip;
-  ip_t vpn_mask;
-  unsigned short port;
-  int flags;
-  conn_list_t *ncn, *old;
+  char *from_id;
+  conn_list_t *from;
 cp
-  if(!cl->status.active)
+  if(sscanf(cl->buffer, "%*d %as", &from_id) != 1)
     {
-      syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-    
-  if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
-    {
-       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
+       syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), cl->id, cl->hostname);
        return -1;
     }  
 
-  if((old = lookup_conn(vpn_ip)))
+  if(!(from = lookup_id(from_id)))
     {
-      if((real_ip==old->real_ip) && (vpn_mask==old->vpn_mask) && (port==old->port))
-        {
-          if(debug_lvl>1)
-            syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
-                   old->vpn_hostname, old->real_hostname, cl->vpn_hostname, cl->real_hostname);
-          goto skip_add_host;  /* One goto a day keeps the deeply nested if constructions away. */
-        }
-      else
-        {
-          if(debug_lvl>1)
-            syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"),
-                   old->vpn_hostname, old->real_hostname);
-          old->status.active = 0;
-          terminate_connection(old);
-        }
-    }
-  
-  /* Connections lists are really messed up if this happens */
-  if(vpn_ip == myself->vpn_ip)
-    {
-      syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"),
-               cl->vpn_hostname, cl->real_hostname);
-      sighup = 1;
-      return 0;
+      syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist in our connection list"), cl->id, cl->hostname, from_id);
+      free(from_id);
+      return -1;
     }
+
+  free(from_id);
     
-  ncn = new_conn_list();
-  ncn->real_ip = real_ip;
-  ncn->real_hostname = hostlookup(htonl(real_ip));
-  ncn->vpn_ip = vpn_ip;
-  ncn->vpn_mask = vpn_mask;
-  ncn->vpn_hostname = hostlookup(htonl(vpn_ip));
-  ncn->port = port;
-  ncn->flags = flags;
-  ncn->nexthop = cl;
-  ncn->next = conn_list;
-  conn_list = ncn;
-  ncn->status.active = 1;
-
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
-           ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
-
-  notify_others(ncn, cl, send_add_host);
-
-skip_add_host:
+  from->status.validkey = 0;
+  from->status.waitingforkey = 0;
+  
+  send_key_changed(from, cl);
 cp
   return 0;
 }
+  
+int send_req_key(conn_list_t *from, conn_list_t *to)
+{
+cp
+  return send_request(to->nexthop, "%d %s %s", REQ_KEY, from->id, to->id);
+}
 
 int req_key_h(conn_list_t *cl)
 {
-  ip_t to;
-  ip_t from;
-  conn_list_t *fw;
+  char *from_id, *to_id;
+  conn_list_t *from, *to;
 cp
-  if(!cl->status.active)
+  if(sscanf(cl->buffer, "%*d %as %as", &from_id, &to_id) != 2)
     {
-      syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-
-  if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
-    {
-       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
+       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"), cl->id, cl->hostname);
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
-           IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
-
-  if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
-    {  /* hey! they want something from ME! :) */
-      send_key_answer(cl, from);
-      return 0;
-    }
-
-  fw = lookup_conn(to);
-  
-  if(!fw)
+  if(!(from = lookup_id(from_id)))
     {
-      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),
-	     IP_ADDR_V(to));
+      syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"), cl->id, cl->hostname, from_id);
+      free(from_id); free(to_id);
       return -1;
     }
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
-	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-  
-  cl->buffer[cl->reqlen-1] = '\n';
-  
-  if(write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
-cp
-  return 0;
-}
+  /* Check if this key request is for us */
 
-void set_keys(conn_list_t *cl, int expiry, char *key)
-{
-  char *ek;
-cp
-  if(!cl->public_key)
+  if(!strcmp(id, myself->strcmp))
     {
-      cl->public_key = xmalloc(sizeof(*cl->key));
-      cl->public_key->key = NULL;
+      send_ans_key(myself, from, myself->datakey);
     }
-    
-  if(cl->public_key->key)
-    free(cl->public_key->key);
-  cl->public_key->length = strlen(key);
-  cl->public_key->expiry = expiry;
-  cl->public_key->key = xmalloc(cl->public_key->length + 1);
-  strcpy(cl->public_key->key, key);
-
-  ek = make_shared_key(key);
-  
-  if(!cl->key)
+  else
     {
-      cl->key = xmalloc(sizeof(*cl->key));
-      cl->key->key = NULL;
+      if(!(to = lookup_id(to_id)))
+        {
+          syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"), cl->id, cl->hostname, to_id);
+          free(from_id); free(to_id);
+          return -1;
+        }
+      send_req_key(from, to);
     }
 
-  if(cl->key->key)
-    free(cl->key->key);
+  free(from_id); free(to_id);
+cp
+  return 0;
+}
 
-  cl->key->length = strlen(ek);
-  cl->key->expiry = expiry;
-  cl->key->key = xmalloc(cl->key->length + 1);
-  strcpy(cl->key->key, ek);
+int send_ans_key(conn_list_t *from, conn_list_t *to, char *datakey)
+{
 cp
+  return send_request(to->nexthop, "%d %s %s %s", ANS_KEY, from->id, to->id, datakey);
 }
 
 int ans_key_h(conn_list_t *cl)
 {
-  ip_t to;
-  ip_t from;
-  int expiry;
-  char *key;
-  conn_list_t *fw, *gk;
+  char *from_id, *to_id, *datakey;
+  int keylength;
+  conn_list_t *from, *to;
 cp
-  if(!cl->status.active)
+  if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &datakey) != 3)
     {
-      syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-
-  if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
-    {
-       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
+       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), cl->id, cl->hostname);
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
-            IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
+  if(!(from = lookup_id(from_id)))
+    {
+      syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"), cl->id, cl->hostname, from_id);
+      free(from_id); free(to_id); free(datakey);
+      return -1;
+    }
 
-  if(to == myself->vpn_ip)
-    {  /* hey! that key's for ME! :) */
-      gk = lookup_conn(from);
+  /* Check if this key request is for us */
 
-      if(!gk)
+  if(!strcmp(id, myself->strcmp))
+    {
+      /* It is for us, convert it to binary and set the key with it. */
+      
+      keylength = strlen(datakey);
+      
+      if((keylength%2) || (keylength <= 0))
         {
-          syslog(LOG_ERR, _("Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"),
-	         IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
+          syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key"), cl->id, cl->hostname, from->id);
+          free(from_id); free(to_id); free(datakey);
           return -1;
         }
-
-      set_keys(gk, expiry, key);
-      gk->status.validkey = 1;
-      gk->status.waitingforkey = 0;
-      flush_queues(gk);
-      return 0;
+      keylength /= 2;
+      hex2bin(datakey, datakey, keylength);
+      BF_set_key(cl->datakey, keylength, datakey);
     }
-
-  fw = lookup_conn(to);
-  
-  if(!fw)
+  else
     {
-      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),
-	     IP_ADDR_V(to));
-      return -1;
+      if(!(to = lookup_id(to_id)))
+        {
+          syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"), cl->id, cl->hostname, to_id);
+          free(from_id); free(to_id); free(datakey);
+          return -1;
+        }
+      send_ans_key(from, to, datakey);
     }
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
-	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
-  cl->buffer[cl->reqlen-1] = '\n';
-
-  if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0)
-    {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
-      return -1;
-    }
+  free(from_id); free(to_id); free(datakey);
 cp
   return 0;
 }
 
-int key_changed_h(conn_list_t *cl)
-{
-  ip_t from;
-  conn_list_t *ik;
-cp
-  if(!cl->status.active)
-    {
-      syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-
-  if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
-    {
-       syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-       return -1;
-    }  
-
-  ik = lookup_conn(from);
+/* Old routines */
 
-  if(!ik)
-    {
-      syslog(LOG_ERR, _("Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"),
-	     IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
+/*
+  Notify all my direct connections of a new host
+  that was added to the vpn, with the exception
+  of the source of the announcement.
+*/
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
-            ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
+int notify_others(conn_list_t *new, conn_list_t *source,
+		  int (*function)(conn_list_t*, conn_list_t*))
+{
+  conn_list_t *p;
+cp
+  for(p = conn_list; p != NULL; p = p->next)
+    if(p != new && p != source && p->status.meta && p->status.active)
+      function(p, new);
+cp
+  return 0;
+}
 
-  ik->status.validkey = 0;
-  ik->status.waitingforkey = 0;
+/*
+  Notify one connection of everything
+  I have connected
+*/
 
-  notify_others(ik, cl, send_key_changed);
+int notify_one(conn_list_t *new)
+{
+  conn_list_t *p;
+cp
+  for(p = conn_list; p != NULL; p = p->next)
+    if(p != new && p->status.active)
+      send_add_host(new, p);
 cp
   return 0;
 }
 
-int (*request_handlers[256])(conn_list_t*) = {
-  0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  termreq_h, timeout_h, del_host_h, 0, 0, 0, 0, 0, 0, 0,
-  ping_h, pong_h, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  add_host_h, basic_info_h, passphrase_h, public_key_h, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  tcppacket_h, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  req_key_h, ans_key_h, key_changed_h, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0
+/* "Complete overhaul". */
+
+int (*request_handlers[])(conn_list_t*) = {
+  id_h, challenge_h, chal_reply_h, ack_h,
+  status_h, error_h, termreq_h,
+  ping_h, pong_h,
+  add_host_h, del_host_h,
+  add_subnet_h, del_subnet_h,
+  key_changed_h, req_key_h, ans_key_h,
+};
+
+char (*request_name[]) = {
+  "ID", "CHALLENGE", "CHAL_REPLY", "ACK",
+  "STATUS", "ERROR", "TERMREQ",
+  "PING", "PONG",
+  "ADD_HOST", "DEL_HOST",
+  "ADD_SUBNET", "DEL_SUBNET",
+  "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
 };