X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=f1a9e49bfdcea01e4293ab351d53d9b74364ee99;hp=d6195377c9c0c2e34a46f53c333a6922d5da8520;hb=28cc30159565a7eda4f66215a5994d84b46b47ad;hpb=f6802d349d946090bf9d1b6c761077c80065afa5

diff --git a/src/protocol.c b/src/protocol.c
index d6195377..f1a9e49b 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,6 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol
-    Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
+                       2000 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
@@ -15,331 +16,624 @@
     You should have received a copy of the GNU General Public License
     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.25 2000/09/10 15:18:03 guus Exp $
 */
 
 #include "config.h"
 
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <sys/socket.h>
+#include <unistd.h>
+#include <stdio.h>
 
 #include <utils.h>
 #include <xalloc.h>
 
+#include <netinet/in.h>
+
 #include "conf.h"
 #include "encr.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
 
-int send_ack(conn_list_t *cl)
+#include "system.h"
+
+/* Generic outgoing request routine - takes care of logging and error detection as well */
+
+int send_request(conn_list_t *cl, const char *format, int request, /*args*/ ...)
 {
-  unsigned char tmp = ACK;
+  va_list args;
+  char *buffer = NULL;
+cp
+  if(debug_lvl >= DEBUG_PROTOCOL)
+    syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), requestname[request], cl->id, cl->hostname);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Send ACK to %s", cl->hostname);
+  va_start(args, format);
+  len = vasprintf(&buffer, format, args);
+  va_end(args);
 
-  syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if(len < 0 || !buffer)
     {
-      syslog(LOG_ERR, "send failed: %d:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Error during vasprintf(): %m"));
       return -1;
     }
 
-  return 0;
+  if(debug_lvl >= DEBUG_META)
+    syslog(LOG_DEBUG, _("Sending meta data to %s (%s): %s"), cl->id, cl->hostname, buffer);
+
+  if(cl->status.encryptout)
+    {
+      /* FIXME: Do encryption */
+    }
+
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
+    {
+      syslog(LOG_ERR, _("Sending meta data failed:  %m"));
+      return -1;
+    }
+cp  
 }
 
-int send_termreq(conn_list_t *cl)
-{
-  termreq_t tmp;
+/* Connection protocol:
+
+   Client               Server
+   send_id(*)
+                        send_challenge
+   send_chal_reply(*)                   
+                        send_id
+   send_challenge
+                        send_chal_reply
+   send_ack
+			send_ack
 
-  tmp.type = TERMREQ;
-  tmp.vpn_ip = myself->vpn_ip;
+   (*) Unencrypted.
+*/      
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Send TERMREQ(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
-	   IP_ADDR_V(cl->vpn_ip));
+int send_id(conn_list_t *cl)
+{
+cp
+  return send_request(cl, "%d %s %d-%d %s", ID, myself->id, myself->min_version, myself->max_version, opt2str(myself->options));
+}
+
+int id_h(conn_list_t *cl)
+{
+  conn_list_t *old;
+  char *options;
+cp
+  if(sscanf(cl->buffer, "%*d %as %d-%d %as", &cl->id, &cl->min_version, &cl->max_version, &options) != 4)
+    {
+       syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
+       return -1;
+    }
+    
+  /* Check if version ranges overlap */
+  
+  if((cl->min_version > myself->max_version) || (cl->max_version < myself_min_version) || (cl->min_version > cl->max_version))
+    {
+      syslog(LOG_ERR, _("Peer %s uses incompatible version (%d-%d)"), cl->hostname, cl->min_version, cl->max_version);
+      return -1;
+    }
 
-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  /* Check if option string is valid */
+  
+  if(str2opt(options) == -1)
+    {
+      syslog(LOG_ERR, _("Peer %s uses invalid option string"), cl->hostname);
+      return -1;
+    }
+    
+  /* Check if identity is a valid name */
+  
+  if(!check_id(cl->id))
+    {
+      syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
+      return -1;
+    }
+    
+  /* 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;
     }
 
-  return 0;
+
+  /* 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(cl->status.outgoing)
+    {
+      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;
+        }
+    }
+
+  /* Since we know the identity now, we can encrypt the meta channel */
+  
+  cl->status.encryptout = 1;
+
+  /* Send a challenge to verify the identity */
+
+  cl->allow_request = CHAL_REPLY;
+cp
+  return send_challenge(cl);
 }
 
-int send_timeout(conn_list_t *cl)
+int send_challenge(conn_list_t *cl)
 {
-  termreq_t tmp;
+  char *buffer;
+  int keylength;
+  int x;
+cp
+  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);
+
+  /* Copy random data and the public key to the buffer */
+  
+  RAND_bytes(buffer, keylength);
+  BN_bn2bin(cl->metakey.n, buffer+keylength);
+
+  /* Calculate the hash from that */
+
+  SHA1(buffer, keylength*2, cl->chal_hash);
 
-  tmp.type = PINGTIMEOUT;
-  tmp.vpn_ip = myself->vpn_ip;
+  /* Convert the random data to a hexadecimal formatted string */
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Send TIMEOUT(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
-	   IP_ADDR_V(cl->vpn_ip));
+  bin2hex(buffer,buffer,keylength);
+  buffer[keylength*2] = '\0';
 
-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  /* Send the challenge */
+  
+  cl->allow_request = CHAL_REPLY;
+  x = send_request(cl, "%d %s", CHALLENGE, buffer);
+  free(buffer);
+cp
+  return x;
+}
+
+int challenge_h(conn_list_t *cl)
+{
+  char *challenge;
+cp
+  if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
-      return -1;
+       syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->id, cl->hostname);
+       return -1;
     }
 
-  return 0;
+  /* Rest is done by send_chal_reply() */
+  
+  x = send_chal_reply(cl, challenge);
+  free(challenge);
+cp
+  return x;
 }
 
-int send_del_host(conn_list_t *cl, conn_list_t *new_host)
+int send_chal_reply(conn_list_t *cl, char *challenge)
 {
-  del_host_t tmp;
-
-  tmp.type = DEL_HOST;
-  tmp.vpn_ip = new_host->vpn_ip;
+  char *buffer;
+  int keylength;
+  char *hash;
+  int x;
+cp
+  keylength = BN_num_bytes(myself->meyakey.n);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Sending delete host %lx to " IP_ADDR_S,
-	   tmp.vpn_ip, IP_ADDR_V(cl->vpn_ip));
+  /* Check if the length of the challenge is all right */
 
-  if((send(cl->meta_socket, (unsigned char*)&tmp, sizeof(del_host_t), 0)) < 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;
     }
 
-  return 0;
-}
+  /* Allocate buffers for the challenge and the hash */
+  
+  buffer = xmalloc(keylength*2);
+  hash = xmalloc(SHA_DIGEST_LEN*2+1);
 
-int send_ping(conn_list_t *cl)
-{
-  unsigned char tmp = PING;
+  /* Copy the incoming random data and our public key to the buffer */
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "pinging " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+  hex2bin(challenge, buffer, keylength); 
+  BN_bn2bin(myself->metakey.n, buffer+keylength);
+
+  /* Calculate the hash from that */
+  
+  SHA1(buffer, keylength*2, hash);
+  free(buffer);
 
-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  /* Convert the hash to a hexadecimal formatted string */
+
+  bin2hex(hash,hash,SHA_DIGEST_LEN);
+  hash[SHA_DIGEST_LEN*2] = '\0';
+
+  /* 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 x;
+} 
+
+int chal_reply_h(conn_list_t *cl)
+{
+  char *hash;
+cp
+  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;
+    }
+
+  /* Check if the length of the hash is all right */
+  
+  if(strlen(hash) != SHA_DIGEST_LEN*2)
+    {
+      syslog(LOG_ERROR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->id, cl->hostname);
+      return -1;
+    }
+    
+  /* 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, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERROR, _("Intruder: wrong challenge reply from %s (%s)"), cl->id, cl->hostname);
       return -1;
     }
 
-  return 0;
+  /* 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);
+
+cp
+  if(cl->status.outgoing)
+    {
+      cl->allow_request = ACK;
+      return send_ack(cl);
+    }
+  else
+    {
+      cl->allow_request = CHALLENGE;
+      return send_id(cl);
+    }
 }
 
-int send_pong(conn_list_t *cl)
+int send_ack(conn_list_t *cl)
+{
+cp
+  return send_request(cl, "%d", ACK);
+}
+
+int ack_h(conn_list_t *cl)
 {
-  unsigned char tmp = PONG;
+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.
+   */
 
-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  while((old = lookup_conn(cl->vpn_ip))) 
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
-      return -1;
+      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);
     }
 
-  return 0;
+  /* Activate this connection */
+
+  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;
+
+cp
+  if(cl->status.outgoing)
+    return 0;
+  else
+    return send_ack(cl);
 }
 
-int send_add_host(conn_list_t *cl, conn_list_t *new_host)
+/* Address and subnet information exchange */
+
+/* New and closed connections notification */
+
+/* Status and error notification routines */
+
+int send_status(conn_list_t *cl, int statusno, char *statusstring)
 {
-  add_host_t tmp;
+cp
+  return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
+}
+
+int send_error(conn_list_t *cl, int errno, char *errstring)
+{
+cp
+  return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+}
 
-  tmp.type = ADD_HOST;
-  tmp.real_ip = new_host->real_ip;
-  tmp.vpn_ip = new_host->vpn_ip;
-  tmp.vpn_mask = new_host->vpn_mask;
-  tmp.portnr = new_host->port;
+/* Old routines */
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Sending add host (%lx/%lx %lx:%hd) to " IP_ADDR_S,
-	   tmp.vpn_ip, tmp.vpn_mask, tmp.real_ip, tmp.portnr,
-	   IP_ADDR_V(cl->vpn_ip));
 
-  if((send(cl->meta_socket, (unsigned char*)&tmp, sizeof(add_host_t), 0)) < 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(write(cl->meta_socket, buffer, buflen) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      if(debug_lvl > 1)
+	syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+cp
   return 0;
 }
 
-int send_key_changed(conn_list_t *cl, conn_list_t *src)
+int send_timeout(conn_list_t *cl)
 {
-  key_changed_t tmp;
-
-  tmp.type = KEY_CHANGED;
-  tmp.from = src->vpn_ip;
+cp
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Sending KEY_CHANGED (%lx) to " IP_ADDR_S,
-	   tmp.from, IP_ADDR_V(cl->vpn_ip));
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
 
-  if((send(cl->meta_socket, (unsigned char*)&tmp, sizeof(key_changed_t), 0)) < 0)
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+cp
   return 0;
 }
 
-void send_key_changed2(void)
+int send_del_host(conn_list_t *cl, conn_list_t *new_host)
 {
-  conn_list_t *p;
+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);
 
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p->status.meta && p->protocol_version > PROT_3)
-      send_key_changed(p, myself);
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
+
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
+    {
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      return -1;
+    }
+cp
+  return 0;
 }
 
-int send_basic_info(conn_list_t *cl)
+int send_tcppacket(conn_list_t *cl, void *data, int len)
 {
-  basic_info_t tmp;
+cp
+  if(debug_lvl > 3)
+    syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
-  tmp.type = BASIC_INFO;
-  tmp.protocol = PROT_CURRENT;
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len);
 
-  tmp.portnr = myself->port;
-  tmp.vpn_ip = myself->vpn_ip;
-  tmp.vpn_mask = myself->vpn_mask;
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
+    {
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      return -1;
+    }
+    
+  if((write(cl->meta_socket, data, len)) < 0)
+    {
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      return -1;
+    }
+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);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Send BASIC_INFO(%d,%hd," IP_ADDR_S "," IP_ADDR_S ") to " IP_ADDR_S,
-	   tmp.protocol, tmp.portnr, IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask),
-	   IP_ADDR_V(cl->real_ip));
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
 
-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+cp
   return 0;
 }
 
-int send_passphrase(conn_list_t *cl)
+int send_pong(conn_list_t *cl)
 {
-  passphrase_t tmp;
-
-  tmp.type = PASSPHRASE;
-  encrypt_passphrase(&tmp);
+cp
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Send PASSPHRASE(%hd,...) to " IP_ADDR_S, tmp.len,
-	   IP_ADDR_V(cl->vpn_ip));
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
 
-  if((send(cl->meta_socket, &tmp, tmp.len+3, 0)) < 0)
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+cp
   return 0;
 }
 
-int send_public_key(conn_list_t *cl)
+int send_add_host(conn_list_t *cl, conn_list_t *new_host)
 {
-  public_key_t *tmp;
+  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.
+   */
+     
+  if(flags & EXPORTINDIRECTDATA)
+    {
+      flags &= ~EXPORTINDIRECTDATA;
+      flags |= INDIRECTDATA;
+      real_ip = myself->vpn_ip;
+      hostname = myself->real_hostname;
+    }
 
-  tmp = (public_key_t*)xmalloc(strlen(my_public_key_base36)+sizeof(public_key_t));
-  tmp->type = PUBLIC_KEY;
-  tmp->len = strlen(my_public_key_base36);
-  strcpy(&tmp->key, my_public_key_base36);
+  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);
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Send PUBLIC_KEY(%hd,%s) to " IP_ADDR_S, tmp->len, &tmp->key,
-	   IP_ADDR_V(cl->vpn_ip));
+  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);
 
-  if((send(cl->meta_socket, tmp, tmp->len+sizeof(public_key_t), 0)) < 0)
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+cp
   return 0;
 }
 
-int send_calculate(conn_list_t *cl, char *k)
+int send_key_changed(conn_list_t *cl, conn_list_t *src)
 {
-  calculate_t *tmp;
+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);
 
-  tmp = xmalloc(strlen(k)+sizeof(calculate_t));
-  tmp->type = CALCULATE;
-  tmp->len = strlen(k);
-  strcpy(&tmp->key, k);
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
 
-  if(send(cl->meta_socket, tmp, tmp->len+4, 0) < 0)
+  if((write(cl->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+cp
   return 0;
 }
 
-int send_key_request(ip_t to)
+void send_key_changed_all(void)
 {
-  key_req_t *tmp;
-  conn_list_t *fw;
+  conn_list_t *p;
+cp
+  for(p = conn_list; p != NULL; p = p->next)
+    if(p->status.meta && p->status.active)
+      send_key_changed(p, myself);
+cp
+}
 
-  tmp = xmalloc(sizeof(key_req_t));
-  tmp->type = REQ_KEY;
-  tmp->to = to;
-  tmp->from = myself->vpn_ip;
-  tmp->len = 0;
 
+int send_key_request(ip_t to)
+{
+  conn_list_t *fw;
+cp
   fw = lookup_conn(to);
   if(!fw)
     {
-      syslog(LOG_ERR, "Attempting to send key request to " IP_ADDR_S ", which does not exist?",
+      syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),
 	     IP_ADDR_V(to));
       return -1;
     }
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Sending out request for public key to " IP_ADDR_S,
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t), 0) < 0)
+  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);
+
+  if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
   fw->status.waitingforkey = 1;
-
+cp
   return 0;
 }
 
 int send_key_answer(conn_list_t *cl, ip_t to)
 {
-  key_req_t *tmp;
   conn_list_t *fw;
-
-  tmp = xmalloc(sizeof(key_req_t)+strlen(my_public_key_base36));
-  tmp->type = ANS_KEY;
-  tmp->to = to;
-  tmp->from = myself->vpn_ip;
-  tmp->expiry = my_key_expiry;
-  tmp->len = strlen(my_public_key_base36);
-  strcpy(&tmp->key, my_public_key_base36);
+cp
 
   fw = lookup_conn(to);
   
   if(!fw)
-  {
-    syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
-	   IP_ADDR_V(to));
-    return -1;
-  }
-  
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t)+tmp->len, 0) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      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 > 1)
+    syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
+	   fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
+
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
+
+  if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+    {
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      return -1;
+    }
+cp
   return 0;
 }
 
@@ -352,11 +646,11 @@ 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->protocol_version > PROT_3)
+    if(p != new && p != source && p->status.meta && p->status.active)
       function(p, new);
-
+cp
   return 0;
 }
 
@@ -367,11 +661,11 @@ int notify_others(conn_list_t *new, conn_list_t *source,
 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->protocol_version > PROT_3)
+    if(p != new && p->status.active)
       send_add_host(new, p);
-
+cp
   return 0;
 }
 
@@ -379,401 +673,453 @@ int notify_one(conn_list_t *new)
   The incoming request handlers
 */
 
-int basic_info_h(conn_list_t *cl, unsigned char *d, int len)
-{
-  basic_info_t *tmp = (basic_info_t*)d;
-
-  cl->protocol_version = tmp->protocol;
-  cl->port = tmp->portnr;
-  cl->vpn_ip = tmp->vpn_ip;
-  cl->vpn_mask = tmp->vpn_mask;
 
-  if(cl->protocol_version < PROT_CURRENT)
+int termreq_h(conn_list_t *cl)
+{
+cp
+  if(!cl->status.active)
     {
-      syslog(LOG_ERR, "Peer uses protocol version %d which is too old.",
-	     cl->protocol_version);
+      syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
-
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got BASIC_INFO(%hd," IP_ADDR_S "," IP_ADDR_S ")", cl->port,
-	   IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->vpn_mask));
+    
   if(debug_lvl > 1)
-    syslog(LOG_DEBUG, "Peer uses protocol version %d",
-	   cl->protocol_version);
-
-  if(cl->status.outgoing)
-    {
-      if(setup_vpn_connection(cl) < 0)
-	return -1;
-      send_basic_info(cl);
-    }
-  else
-    {
-      if(setup_vpn_connection(cl) < 0)
-	return -1;
-      send_passphrase(cl);
-    }
-
-  cl->status.active = 0;
+   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 passphrase_h(conn_list_t *cl, unsigned char *d, int len)
+int timeout_h(conn_list_t *cl)
 {
-  passphrase_t *tmp = (passphrase_t*)d;
-
-  cl->pp = xmalloc(tmp->len+3);
-  memcpy(cl->pp, tmp, tmp->len+3);
-
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", cl->pp->len);
+cp
+  if(!cl->status.active)
+    {
+      syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
+    }
 
-  if(cl->status.outgoing)
-    send_passphrase(cl);
-  else
-    send_public_key(cl);
+  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
   return 0;
 }
 
-int public_key_h(conn_list_t *cl, unsigned char *d, int len)
+int del_host_h(conn_list_t *cl)
 {
-  char *g_n;
-  public_key_t *tmp = (public_key_t*)d;
+  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(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", tmp->len, &tmp->key);
+  if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
+    {
+       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+       return -1;
+    }  
 
-  g_n = xmalloc(tmp->len+1);
-  strcpy(g_n, &tmp->key);
+  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;
+    }
 
-  if(verify_passphrase(cl, g_n))
+  /* Connections lists are really messed up if this happens */
+  if(vpn_ip == myself->vpn_ip)
     {
-      /* intruder! */
-      syslog(LOG_ERR, "Intruder: passphrase does not match.");
-      return -1;
+      syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
+               cl->vpn_hostname, cl->real_hostname);
+      sighup = 1;
+      return 0;
     }
 
-  if(debug_lvl > 2)
-    syslog(LOG_INFO, "Passphrase OK");
+  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);
 
-  if(cl->status.outgoing)
-    send_public_key(cl);
-  else
-    send_ack(cl);
+  notify_others(fw, cl, send_del_host);
 
-  cl->status.active = 1;
-  notify_others(cl, NULL, send_add_host);
-  notify_one(cl);
+  fw->status.termreq = 1;
+  fw->status.active = 0;
 
+  terminate_connection(fw);
+cp
   return 0;
 }
 
-int ack_h(conn_list_t *cl, unsigned char *d, int len)
+int tcppacket_h(conn_list_t *cl)
 {
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got ACK");
-  
-  cl->status.active = 1;
-  syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
-
-  /*
-    Now I'm going to cheat. The meta protocol is actually
-    a stream of requests, that may come in in the same TCP
-    packet. This is the only place that it will happen,
-    though.
-    I may change it in the future, if it appears that this
-    is not retainable.
-  */
-  if(len > 1) /* An ADD_HOST follows */
+  int len;
+cp
+  if(!cl->status.active)
     {
-      if(request_handlers[d[1]] == NULL)
-	syslog(LOG_ERR, "Unknown request %d.", d[1]);
-      if(request_handlers[d[1]](cl, d, len - 1) < 0)
-	return -1;
+      syslog(LOG_ERR, _("Got unauthorized PACKET from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
     }
 
-  return 0;
-}
+  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;
+    }  
 
-int termreq_h(conn_list_t *cl, unsigned char *d, int len)
-{
-  syslog(LOG_NOTICE, IP_ADDR_S " wants to quit", IP_ADDR_V(cl->vpn_ip));
-  cl->status.termreq = 1;
-  terminate_connection(cl);
+  if(len > MTU)
+    {
+       syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+       return -1;
+    }  
 
-  notify_others(cl, NULL, send_del_host);
+  if(debug_lvl > 3)
+    syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
+              cl->vpn_hostname, cl->real_hostname);
 
+  cl->tcppacket=len;
+cp
   return 0;
 }
 
-int timeout_h(conn_list_t *cl, unsigned char *d, int len)
-{
-  syslog(LOG_NOTICE, IP_ADDR_S " says it's gotten a timeout from us", IP_ADDR_V(cl->vpn_ip));
-  cl->status.termreq = 1;
-  terminate_connection(cl);
-
-  return 0;
-}
 
-int del_host_h(conn_list_t *cl, unsigned char *d, int len)
+int ping_h(conn_list_t *cl)
 {
-  del_host_t *tmp = (del_host_t*)d;
-  conn_list_t *fw;
-
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got DEL_HOST for " IP_ADDR_S,
-	   IP_ADDR_V(tmp->vpn_ip));
-
-  if(!(fw = lookup_conn(tmp->vpn_ip)))
+cp
+  if(!cl->status.active)
     {
-      syslog(LOG_ERR, "Somebody wanted to delete " IP_ADDR_S " which does not exist?",
-	     IP_ADDR_V(tmp->vpn_ip));
-      return 0;
+      syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
     }
 
-  notify_others(cl, fw, send_del_host);
-
-  fw->status.termreq = 1;
-  terminate_connection(fw);
-
-  return 0;
-}
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
 
-int ping_h(conn_list_t *cl, unsigned char *d, int len)
-{
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "responding to ping from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
   cl->status.pinged = 0;
   cl->status.got_pong = 1;
 
   send_pong(cl);
-  
+cp
   return 0;
 }
 
-int pong_h(conn_list_t *cl, unsigned char *d, int len)
+int pong_h(conn_list_t *cl)
 {
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "ok, got pong from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
-  cl->status.got_pong = 1;
+cp
+  if(!cl->status.active)
+    {
+      syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
+    }
 
+  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, unsigned char *d, int len)
+int add_host_h(conn_list_t *cl)
 {
-  add_host_t *tmp = (add_host_t*)d;
-  conn_list_t *ncn, *fw;
-
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Add host request from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)",
-	   IP_ADDR_V(tmp->vpn_ip), IP_ADDR_V(tmp->vpn_mask), tmp->portnr);
+  ip_t real_ip;
+  ip_t vpn_ip;
+  ip_t vpn_mask;
+  unsigned short port;
+  int flags;
+  conn_list_t *ncn, *old;
+cp
+  if(!cl->status.active)
+    {
+      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);
+       return -1;
+    }  
 
-  /*
-    Suggestion of Hans Bayle
-  */
-  if((fw = lookup_conn(tmp->vpn_ip)))
+  if((old = lookup_conn(vpn_ip)))
+    {
+      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)
     {
-      notify_others(fw, cl, send_add_host);
+      syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"),
+               cl->vpn_hostname, cl->real_hostname);
+      sighup = 1;
       return 0;
     }
-
+    
   ncn = new_conn_list();
-  ncn->real_ip = tmp->real_ip;
-  ncn->vpn_ip = tmp->vpn_ip;
-  ncn->vpn_mask = tmp->vpn_mask;
-  ncn->port = tmp->portnr;
-  ncn->hostname = hostlookup(tmp->real_ip);
+  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;
-  notify_others(ncn, cl, send_add_host);
 
-  /*
-    again, i'm cheating here. see the comment in ack_h.
-  */
-  if(len > sizeof(add_host_t)) /* Another ADD_HOST follows */
-    {
-      if(request_handlers[d[sizeof(add_host_t)]] == NULL)
-	syslog(LOG_ERR, "Unknown request %d.", d[sizeof(add_host_t)]);
-      if(request_handlers[d[sizeof(add_host_t)]](cl, d, len - sizeof(add_host_t)) < 0)
-	return -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:
+cp
   return 0;
 }
 
-int req_key_h(conn_list_t *cl, unsigned char *d, int len)
+int req_key_h(conn_list_t *cl)
 {
-  key_req_t *tmp = (key_req_t*)d;
+  ip_t to;
+  ip_t from;
   conn_list_t *fw;
+cp
+  if(!cl->status.active)
+    {
+      syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
+    }
 
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S,
-	   IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+  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);
+       return -1;
+    }  
 
-  if((tmp->to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
+  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, tmp->from);
+      send_key_answer(cl, from);
       return 0;
     }
 
-  fw = lookup_conn(tmp->to);
+  fw = lookup_conn(to);
   
   if(!fw)
-  {
-    syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
-	   IP_ADDR_V(tmp->to));
-    return -1;
-  }
-
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t), 0) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),
+	     IP_ADDR_V(to));
       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;
 }
 
-void set_keys(conn_list_t *cl, key_req_t *k)
+void set_keys(conn_list_t *cl, int expiry, char *key)
 {
   char *ek;
-
+cp
   if(!cl->public_key)
     {
-      cl->public_key = xmalloc(sizeof(enc_key_t));
+      cl->public_key = xmalloc(sizeof(*cl->key));
       cl->public_key->key = NULL;
     }
+    
   if(cl->public_key->key)
     free(cl->public_key->key);
-  cl->public_key->length = k->len;
-  cl->public_key->expiry = k->expiry;
-  cl->public_key->key = xmalloc(k->len + 1);
-  strcpy(cl->public_key->key, &(k->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(&(k->key));
+  ek = make_shared_key(key);
+  
   if(!cl->key)
     {
-      cl->key = xmalloc(sizeof(enc_key_t));
+      cl->key = xmalloc(sizeof(*cl->key));
       cl->key->key = NULL;
     }
+
   if(cl->key->key)
     free(cl->key->key);
+
   cl->key->length = strlen(ek);
-  cl->key->expiry = k->expiry;
-  cl->key->key = xmalloc(strlen(ek) + 1);
+  cl->key->expiry = expiry;
+  cl->key->key = xmalloc(cl->key->length + 1);
   strcpy(cl->key->key, ek);
+cp
 }
 
-int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
+int ans_key_h(conn_list_t *cl)
 {
-  key_req_t *tmp = (key_req_t*)d;
+  ip_t to;
+  ip_t from;
+  int expiry;
+  char *key;
   conn_list_t *fw, *gk;
+cp
+  if(!cl->status.active)
+    {
+      syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
+    }
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,
-	   IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+  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);
+       return -1;
+    }  
 
-  if(tmp->to == myself->vpn_ip)
+  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(to == myself->vpn_ip)
     {  /* hey! that key's for ME! :) */
-      if(debug_lvl > 2)
-	syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");
-      gk = lookup_conn(tmp->from);
+      gk = lookup_conn(from);
 
       if(!gk)
         {
-          syslog(LOG_ERR, "Receiving key from " IP_ADDR_S ", which does not exist?",
-	         IP_ADDR_V(tmp->from));
+          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);
           return -1;
         }
 
-      set_keys(gk, tmp);
+      set_keys(gk, expiry, key);
       gk->status.validkey = 1;
       gk->status.waitingforkey = 0;
       flush_queues(gk);
       return 0;
     }
 
-  fw = lookup_conn(tmp->to);
+  fw = lookup_conn(to);
   
   if(!fw)
-  {
-    syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
-	   IP_ADDR_V(tmp->to));
-    return -1;
-  }
-
-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
-	   IP_ADDR_V(fw->nexthop->vpn_ip));
-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t)+tmp->len, 0) < 0)
     {
-      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),
+	     IP_ADDR_V(to));
       return -1;
     }
 
+  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;
+    }
+cp
   return 0;
 }
 
-int key_changed_h(conn_list_t *cl, unsigned char *d, int len)
+int key_changed_h(conn_list_t *cl)
 {
-  key_changed_t *tmp = (key_changed_t*)d;
+  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(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got KEY_CHANGED from " IP_ADDR_S,
-	   IP_ADDR_V(tmp->from));
+  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(tmp->from);
+  ik = lookup_conn(from);
 
   if(!ik)
     {
-      syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?",
-	     IP_ADDR_V(tmp->from));
+      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;
     }
 
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
+            ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
+
   ik->status.validkey = 0;
   ik->status.waitingforkey = 0;
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "Forwarding key invalidation request");
-
-  notify_others(cl, ik, send_key_changed);
-
+  notify_others(ik, cl, send_key_changed);
+cp
   return 0;
 }
 
-int (*request_handlers[256])(conn_list_t*, unsigned char*, int) = {
-  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,
-  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,
-  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[6])(conn_list_t*) = {
+  id_h, challenge_h, chal_reply_h, ack_h,
+  status_h, error_h,
 };
 
+char (*request_name[6]) = {
+  "ID", "CHALLENGE", "CHAL_REPLY", "ACK",
+  "STATUS", "ERROR",
+};