X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=f0c5070947542015db459226fe3ff98f466b16bf;hp=492f2893878f11910cdc6084981c9649c1523125;hb=6aee1ad021092d37538e15da22367789a4d4a763;hpb=fcc3ded75fe9f831aeb8678ee5e3926bf4168906

diff --git a/src/protocol.c b/src/protocol.c
index 492f2893..f0c50709 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,5 +1,5 @@
 /*
-    protocol.c -- handle the meta-protocol
+    protocol.c -- handle the meta-protocol, basic functions
     Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
                   2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
@@ -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.108 2001/10/08 15:37:14 guus Exp $
+    $Id: protocol.c,v 1.28.4.127 2002/03/23 20:12:29 guus Exp $
 */
 
 #include "config.h"
@@ -27,37 +27,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <sys/socket.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
 
 #include <utils.h>
 #include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
-
-#include <netinet/in.h>
-
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
 
 #include "conf.h"
-#include "net.h"
-#include "netutl.h"
 #include "protocol.h"
 #include "meta.h"
 #include "connection.h"
 
 #include "system.h"
 
-int mykeyused = 0;
+avl_tree_t *past_request_tree;
 
 int check_id(char *id)
 {
@@ -73,7 +57,7 @@ int check_id(char *id)
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-int send_request(connection_t *cl, const char *format, ...)
+int send_request(connection_t *c, const char *format, ...)
 {
   va_list args;
   char buffer[MAXBUFSIZE];
@@ -86,42 +70,42 @@ cp
 
   va_start(args, format);
   len = vsnprintf(buffer, MAXBUFSIZE, format, args);
-  request = va_arg(args, int);
   va_end(args);
 
   if(len < 0 || len > MAXBUFSIZE-1)
     {
-      syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+      syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), c->name, c->hostname);
       return -1;
     }
 
   if(debug_lvl >= DEBUG_PROTOCOL)
     {
+      sscanf(buffer, "%d", &request);
       if(debug_lvl >= DEBUG_META)
-        syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], cl->name, cl->hostname, buffer);
+        syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], c->name, c->hostname, buffer);
       else
-        syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+        syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], c->name, c->hostname);
     }
 
   buffer[len++] = '\n';
 cp
-  return send_meta(cl, buffer, len);
+  return send_meta(c, buffer, len);
 }
 
-int receive_request(connection_t *cl)
+int receive_request(connection_t *c)
 {
   int request;
 cp
-  if(sscanf(cl->buffer, "%d", &request) == 1)
+  if(sscanf(c->buffer, "%d", &request) == 1)
     {
       if((request < 0) || (request >= LAST) || (request_handlers[request] == NULL))
         {
           if(debug_lvl >= DEBUG_META)
             syslog(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
-	           cl->name, cl->hostname, cl->buffer);
+	           c->name, c->hostname, c->buffer);
           else
             syslog(LOG_ERR, _("Unknown request from %s (%s)"),
-                   cl->name, cl->hostname);
+                   c->name, c->hostname);
                    
           return -1;
         }
@@ -131,1202 +115,132 @@ cp
             {
               if(debug_lvl >= DEBUG_META)
                 syslog(LOG_DEBUG, _("Got %s from %s (%s): %s"),
-	               request_name[request], cl->name, cl->hostname, cl->buffer);
+	               request_name[request], c->name, c->hostname, c->buffer);
               else
                 syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
-		       request_name[request], cl->name, cl->hostname);
+		       request_name[request], c->name, c->hostname);
             }
 	}
 
-      if((cl->allow_request != ALL) && (cl->allow_request != request))
+      if((c->allow_request != ALL) && (c->allow_request != request))
         {
-          syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), cl->name, cl->hostname);
+          syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name, c->hostname);
           return -1;
         }
 
-      if(request_handlers[request](cl))
+      if(request_handlers[request](c))
 	/* Something went wrong. Probably scriptkiddies. Terminate. */
         {
           syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
-		 request_name[request], cl->name, cl->hostname);
+		 request_name[request], c->name, c->hostname);
           return -1;
         }
     }
   else
     {
       syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
-	     cl->name, cl->hostname);
+	     c->name, c->hostname);
       return -1;
     }
 cp
   return 0;
 }
 
-/* The authentication protocol is described in detail in doc/SECURITY2,
-   the rest will be described in doc/PROTOCOL. */
-
-int send_id(connection_t *cl)
-{
-cp
-  return send_request(cl, "%d %s %d %lx %hd", ID, myself->name, myself->protocol_version, myself->options, myself->port);
-}
-
-int id_h(connection_t *cl)
-{
-  char name[MAX_STRING_SIZE];
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &cl->port) != 4)
-    {
-       syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
-       return -1;
-    }
-
-  /* Check if version matches */
-
-  if(cl->protocol_version != myself->protocol_version)
-    {
-      syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"),
-             cl->name, cl->hostname, cl->protocol_version);
-      return -1;
-    }
-
-  /* Check if identity is a valid name */
-
-  if(check_id(name))
-    {
-      syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
-      return -1;
-    }
-  
-  /* Copy string to cl */
-  
-  if(cl->name)
-    free(cl->name);
-    
-  cl->name = xstrdup(name);
-
-  /* Load information about peer */
-
-  if(read_host_config(cl))
-    {
-      syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
-      return -1;
-    }
-
-  /* Read in the public key, so that we can send a metakey */
-
-  if(read_rsa_public_key(cl))
-    return -1;
-
-  cl->allow_request = METAKEY;
-cp
-  return send_metakey(cl);
-}
-
-int ack_h(connection_t *cl)
+int past_request_compare(past_request_t *a, past_request_t *b)
 {
-  config_t const *cfg;
-  connection_t *old, *p;
-  subnet_t *subnet;
-  avl_node_t *node, *node2;
-cp
-  /* Okay, before we active the connection, we check if there is another entry
-     in the connection list with the same name. If so, it presumably is an
-     old connection that has timed out but we don't know it yet.
-   */
-
-  if((old = lookup_id(cl->name)))
-    {
-      if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_NOTICE, _("Removing old connection for %s at %s in favour of new connection at %s"),
-               old->name, old->hostname, cl->hostname);
-      if(old->status.outgoing)
-        {
-          cl->status.outgoing = 1;
-          old->status.outgoing = 0;
-        }
-
-      terminate_connection(old, 0);
-    }
-    
-  /* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
-  
-  old = avl_search(active_tree, cl);
-  if(old)
-  {
-    syslog(LOG_ERR, _("%s is listening on %s:%hd, which is already in use by %s!"),
-           cl->name, cl->hostname, cl->port, old->name);
-    return -1;
-  }
-    
-  /* Activate this connection */
-
-  cl->allow_request = ALL;
-  cl->nexthop = cl;
-  cl->prevhop = myself;
-  cl->cipher_pkttype = EVP_bf_cbc();
-  cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
-
-  active_add(cl);
-
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
-
-  if(cl->status.outgoing)
-    seconds_till_retry = 5;	/* Reset retry timeout */
-cp
-  /* Check some options */
-  
-  if((cfg = get_config_val(cl->config, config_indirectdata)))
-    {
-      if(cfg->data.val == stupid_true)
-        cl->options |= OPTION_INDIRECT;
-    }
-
-  if((cfg = get_config_val(cl->config, config_tcponly)))
-    {
-      if(cfg->data.val == stupid_true)
-        cl->options |= OPTION_TCPONLY;
-    }
-
-  if((myself->options | cl->options) & OPTION_INDIRECT)
-    cl->via = myself;
-  else
-    cl->via = cl;
-
-  /* Send him our subnets */
-  
-  for(node = myself->subnet_tree->head; node; node = node->next)
-    {
-      subnet = (subnet_t *)node->data;
-      send_add_subnet(cl, subnet);
-    }
-
-  /* And send him all the hosts and their subnets we know... */
-  
-  for(node = active_tree->head; node; node = node->next)
-    {
-      p = (connection_t *)node->data;
-      
-      if(p != cl)
-        {
-          /* Notify others of this connection */
-
-          if(p->status.meta)
-            send_add_host(p, cl);
-
-          /* Notify new connection of everything we know */
-
-          send_add_host(cl, p);
-
-          for(node2 = p->subnet_tree->head; node2; node2 = node2->next)
-            {
-              subnet = (subnet_t *)node2->data;
-              send_add_subnet(cl, subnet);
-            }
-        }
-    }
 cp
-  return 0;
+  return strcmp(a->request, b->request);
 }
 
-int send_challenge(connection_t *cl)
+void free_past_request(past_request_t *r)
 {
-  char *buffer;
-  int len, x;
-cp
-  /* CHECKME: what is most reasonable value for len? */
-
-  len = RSA_size(cl->rsa_key);
-
-  /* Allocate buffers for the challenge */
-
-  buffer = xmalloc(len*2+1);
-
-  if(cl->hischallenge)
-    free(cl->hischallenge);
-    
-  cl->hischallenge = xmalloc(len);
-cp
-  /* Copy random data to the buffer */
-
-  RAND_bytes(cl->hischallenge, len);
-
-cp
-  /* Convert to hex */
-
-  bin2hex(cl->hischallenge, buffer, len);
-  buffer[len*2] = '\0';
-
 cp
-  /* Send the challenge */
-
-  x = send_request(cl, "%d %s", CHALLENGE, buffer);
-  free(buffer);
+  if(r->request)
+    free(r->request);
+  free(r);
 cp
-  return x;
 }
 
-int challenge_h(connection_t *cl)
+void init_requests(void)
 {
-  char buffer[MAX_STRING_SIZE];
-  int len;
 cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
-    {
-       syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->name, cl->hostname);
-       return -1;
-    }
-
-  len = RSA_size(myself->rsa_key);
-
-  /* Check if the length of the challenge is all right */
-
-  if(strlen(buffer) != len*2)
-    {
-      syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Allocate buffers for the challenge */
-
-  if(!cl->mychallenge)
-    cl->mychallenge = xmalloc(len);
-
-  /* Convert the challenge from hexadecimal back to binary */
-
-  hex2bin(buffer,cl->mychallenge,len);
-
-  cl->allow_request = CHAL_REPLY;
-
-  /* Rest is done by send_chal_reply() */
+  past_request_tree = avl_alloc_tree((avl_compare_t)past_request_compare, (avl_action_t)free_past_request);
 cp
-  return send_chal_reply(cl);
 }
 
-int send_chal_reply(connection_t *cl)
+void exit_requests(void)
 {
-  char hash[SHA_DIGEST_LENGTH*2+1];
 cp
-  if(!cl->mychallenge)
-    {
-      syslog(LOG_ERR, _("Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"), cl->name, cl->hostname);
-      return -1;
-    }
-     
-  /* Calculate the hash from the challenge we received */
-
-  SHA1(cl->mychallenge, RSA_size(myself->rsa_key), hash);
-
-  /* Convert the hash to a hexadecimal formatted string */
-
-  bin2hex(hash,hash,SHA_DIGEST_LENGTH);
-  hash[SHA_DIGEST_LENGTH*2] = '\0';
-
-  /* Send the reply */
-
+  avl_delete_tree(past_request_tree);
 cp
-  return send_request(cl, "%d %s", CHAL_REPLY, hash);
 }
 
-int chal_reply_h(connection_t *cl)
+int seen_request(char *request)
 {
-  char hishash[MAX_STRING_SIZE];
-  char myhash[SHA_DIGEST_LENGTH];
+  past_request_t p, *new;
 cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING, hishash) != 1)
-    {
-       syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
-       return -1;
-    }
-
-  /* Check if the length of the hash is all right */
-
-  if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
-    {
-      syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Convert the hash to binary format */
-
-  hex2bin(hishash, hishash, SHA_DIGEST_LENGTH);
+  p.request = request;
 
-  /* Calculate the hash from the challenge we sent */
-
-  SHA1(cl->hischallenge, RSA_size(cl->rsa_key), myhash);
-
-  /* Verify the incoming hash with the calculated hash */
-
-  if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
+  if(avl_search(past_request_tree, &p))
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
       if(debug_lvl >= DEBUG_SCARY_THINGS)
-        {
-          bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
-          hishash[SHA_DIGEST_LENGTH*2] = '\0';
-          syslog(LOG_DEBUG, _("Expected challenge reply: %s"), hishash);
-        }
-      return -1;
-    }
-
-  /* Identity has now been positively verified.
-     ack_h() handles the rest from now on.
-   */
-cp
-  return ack_h(cl);
-}
-
-int send_metakey(connection_t *cl)
-{
-  char *buffer;
-  int len, x;
-cp
-  len = RSA_size(cl->rsa_key);
-
-  /* Allocate buffers for the meta key */
-
-  buffer = xmalloc(len*2+1);
-
-  if(!cl->cipher_outkey)
-    cl->cipher_outkey = xmalloc(len);
-    
-  if(!cl->cipher_outctx)
-    cl->cipher_outctx = xmalloc(sizeof(*cl->cipher_outctx));
-cp
-  /* Copy random data to the buffer */
-
-  RAND_bytes(cl->cipher_outkey, len);
-
-  /* The message we send must be smaller than the modulus of the RSA key.
-     By definition, for a key of k bits, the following formula holds:
-     
-       2^(k-1) <= modulus < 2^(k)
-     
-     Where ^ means "to the power of", not "xor".
-     This means that to be sure, we must choose our message < 2^(k-1).
-     This can be done by setting the most significant bit to zero.
-  */
-  
-  cl->cipher_outkey[0] &= 0x7F;
-  
-  if(debug_lvl >= DEBUG_SCARY_THINGS)
-    {
-      bin2hex(cl->cipher_outkey, buffer, len);
-      buffer[len*2] = '\0';
-      syslog(LOG_DEBUG, _("Generated random meta key (unencrypted): %s"), buffer);
-    }
-
-  /* Encrypt the random data
-  
-     We do not use one of the PKCS padding schemes here.
-     This is allowed, because we encrypt a totally random string
-     with a length equal to that of the modulus of the RSA key.
-  */
-  
-  if(RSA_public_encrypt(len, cl->cipher_outkey, buffer, cl->rsa_key, RSA_NO_PADDING) != len)
-    {
-      syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
-      return -1;
-    }
-cp
-  /* Convert the encrypted random data to a hexadecimal formatted string */
-
-  bin2hex(buffer, buffer, len);
-  buffer[len*2] = '\0';
-
-  /* Send the meta key */
-
-  x = send_request(cl, "%d %s", METAKEY, buffer);
-  free(buffer);
-
-  /* Further outgoing requests are encrypted with the key we just generated */
-
-  EVP_EncryptInit(cl->cipher_outctx, EVP_bf_cfb(),
-                  cl->cipher_outkey + len - EVP_bf_cfb()->key_len,
-                  cl->cipher_outkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
-
-  cl->status.encryptout = 1;
-cp
-  return x;
-}
-
-int metakey_h(connection_t *cl)
-{
-  char buffer[MAX_STRING_SIZE];
-  int len;
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
-    {
-       syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), cl->name, cl->hostname);
-       return -1;
-    }
-
-  len = RSA_size(myself->rsa_key);
-
-  /* Check if the length of the meta key is all right */
-
-  if(strlen(buffer) != len*2)
-    {
-      syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Allocate buffers for the meta key */
-
-  if(!cl->cipher_inkey)
-    cl->cipher_inkey = xmalloc(len);
-
-  if(!cl->cipher_inctx)
-    cl->cipher_inctx = xmalloc(sizeof(*cl->cipher_inctx));
-
-  /* Convert the challenge from hexadecimal back to binary */
-
-  hex2bin(buffer,buffer,len);
-
-  /* Decrypt the meta key */
-  
-  if(RSA_private_decrypt(len, buffer, cl->cipher_inkey, myself->rsa_key, RSA_NO_PADDING) != len)	/* See challenge() */
-    {
-      syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
-      return -1;
+        syslog(LOG_DEBUG, _("Already seen request"));
+      return 1;
     }
-
-  if(debug_lvl >= DEBUG_SCARY_THINGS)
+  else
     {
-      bin2hex(cl->cipher_inkey, buffer, len);
-      buffer[len*2] = '\0';
-      syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
+      new = (past_request_t *)xmalloc(sizeof(*new));
+      new->request = xstrdup(request);
+      new->firstseen = now;
+      avl_insert(past_request_tree, new);
+      return 0;
     }
-
-  /* All incoming requests will now be encrypted. */
-
-  EVP_DecryptInit(cl->cipher_inctx, EVP_bf_cfb(),
-                  cl->cipher_inkey + len - EVP_bf_cfb()->key_len,
-                  cl->cipher_inkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
-  
-  cl->status.decryptin = 1;
-
-  cl->allow_request = CHALLENGE;
-cp
-  return send_challenge(cl);
-}
-
-/* Address and subnet information exchange */
-
-int send_add_subnet(connection_t *cl, subnet_t *subnet)
-{
-  int x;
-  char *netstr;
-  char *owner;
-cp
-  owner = subnet->owner->name;
-
-  x = send_request(cl, "%d %s %s", ADD_SUBNET,
-                      owner, netstr = net2str(subnet));
-  free(netstr);
-cp
-  return x;
+cp  
 }
 
-int add_subnet_h(connection_t *cl)
+void age_past_requests(void)
 {
-  char subnetstr[MAX_STRING_SIZE];
-  char name[MAX_STRING_SIZE];
-  connection_t *owner, *p;
-  subnet_t *subnet;
-  avl_node_t *node;
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
-    {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if owner name is a valid */
-
-  if(check_id(name))
-    {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if subnet string is valid */
-
-  if(!(subnet = str2net(subnetstr)))
-    {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if somebody tries to add a subnet of ourself */
-
-  if(!strcmp(name, myself->name))
-    {
-      syslog(LOG_ERR, _("Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"),
-             cl->name, cl->hostname);
-      sighup = 1;
-      return 0;
-    }
-
-  /* Check if the owner of the new subnet is in the connection list */
-
-  if(!(owner = lookup_id(name)))
-    {
-      syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
-             name, cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* If everything is correct, add the subnet to the list of the owner */
-
-  subnet_add(owner, subnet);
-
-  /* Tell the rest */
-  
-  for(node = connection_tree->head; node; node = node->next)
+  avl_node_t *node, *next;
+  past_request_t *p;
+  int left = 0, deleted = 0;
+cp 
+  for(node = past_request_tree->head; node; node = next)
     {
-      p = (connection_t *)node->data;
-      if(p->status.active && p!= cl)
-        send_add_subnet(p, subnet);
+      next = node->next;
+      p = (past_request_t *)node->data;
+      if(p->firstseen + pingtimeout < now)
+        avl_delete_node(past_request_tree, node), deleted++;
+      else
+        left++;
     }
-cp
-  return 0;
-}
-
-int send_del_subnet(connection_t *cl, subnet_t *subnet)
-{
-  int x;
-  char *netstr;
-  char *owner;
-cp
-  owner = subnet->owner->name;
 
-  x = send_request(cl, "%d %s %s", DEL_SUBNET, owner, netstr = net2str(subnet));
-  free(netstr);
+  if(debug_lvl >= DEBUG_SCARY_THINGS && left + deleted)
+    syslog(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"), deleted, left);
 cp
-  return x;
 }
 
-int del_subnet_h(connection_t *cl)
-{
-  char subnetstr[MAX_STRING_SIZE];
-  char name[MAX_STRING_SIZE];
-  connection_t *owner, *p;
-  subnet_t *subnet;
-  avl_node_t *node;
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
-    {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if owner name is a valid */
-
-  if(check_id(name))
-    {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if subnet string is valid */
-
-  if(!(subnet = str2net(subnetstr)))
-    {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  free(subnetstr);
-  
-  /* Check if somebody tries to add a subnet of ourself */
+/* Jumptable for the request handlers */
 
-  if(!strcmp(name, myself->name))
-    {
-      syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"),
-             cl->name, cl->hostname);
-      sighup = 1;
-      return 0;
-    }
+int (*request_handlers[])(connection_t*) = {
+  id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+  status_h, error_h, termreq_h,
+  ping_h, pong_h,
+//  add_node_h, del_node_h,
+  add_subnet_h, del_subnet_h,
+  add_edge_h, del_edge_h,
+  key_changed_h, req_key_h, ans_key_h,
+  tcppacket_h,
+};
 
-  /* Check if the owner of the new subnet is in the connection list */
-
-  if(!(owner = lookup_id(name)))
-    {
-      syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
-             name, cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* If everything is correct, delete the subnet from the list of the owner */
-
-  subnet_del(subnet);
-
-  /* Tell the rest */
-  
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      p = (connection_t *)node->data;
-      if(p->status.active && p!= cl)
-        send_del_subnet(p, subnet);
-    }
-cp
-  return 0;
-}
-
-/* New and closed connections notification */
-
-int send_add_host(connection_t *cl, connection_t *other)
-{
-cp
-  return send_request(cl, "%d %s %lx:%d %lx %s", ADD_HOST,
-                      other->name, other->address, other->port, other->options, other->prevhop->name);
-}
-
-int add_host_h(connection_t *cl)
-{
-  connection_t *old, *new, *p;
-  char name[MAX_STRING_SIZE], prevhop[MAX_STRING_SIZE];
-  avl_node_t *node;
-cp
-  new = new_connection();
-
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &new->address, &new->port, &new->options, prevhop) != 5)
-    {
-       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
-       return -1;
-    }
-
-  /* Check if identity is a valid name */
-
-  if(check_id(name))
-    {
-      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free_connection(new);
-      return -1;
-    }
-
-  if(check_id(prevhop))
-    {
-      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid prevhop name"), cl->name, cl->hostname);
-      free_connection(new);
-      return -1;
-    }
-
-  /* Check if somebody tries to add ourself */
-
-  if(!strcmp(name, myself->name))
-    {
-      syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) for ourself!"), cl->name, cl->hostname);
-      free_connection(new);
-      return -1;
-    }
-    
-  /* Fill in more of the new connection structure */
-
-  new->hostname = hostlookup(htonl(new->address));
-
-  new->prevhop = lookup_id(prevhop);
-  
-  if(!new->prevhop)
-    {
-      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): unknown prevhop"), cl->name, cl->hostname);
-      free_connection(new);
-      return -1;
-    }
-
-  /* Check if the new host already exists in the connnection list */
-
-  if((old = lookup_id(name)))
-    {
-      if((new->address == old->address) && (new->port == old->port) && (cl->nexthop == old->nexthop))
-        {
-          if(debug_lvl >= DEBUG_CONNECTIONS)
-            syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
-                   old->name, old->hostname, cl->name, cl->hostname);
-          free_connection(new);
-          return 0;
-        }
-      else
-        {
-          if(debug_lvl >= DEBUG_CONNECTIONS)
-            syslog(LOG_NOTICE, _("Removing old entry for %s (%s) from %s in favour of new connection from %s"),
-                   old->name, old->hostname, old->nexthop->name, cl->nexthop->name);
-
-          terminate_connection(old, 0);
-        }
-    }
-
-  /* Hook it up into the active tree */
-
-  new->name = xstrdup(name);
-  active_add(new);
-
-  /* Tell the rest about the new host */
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      p = (connection_t *)node->data;
-      if(p->status.active && p!=cl)
-        send_add_host(p, new);
-    }
-
-  /* Fill in rest of connection structure */
-
-  new->nexthop = cl;
-  new->cipher_pkttype = EVP_bf_cbc();
-  new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
-
-  if(new->options & OPTION_INDIRECT || new->prevhop->via != new->prevhop)
-    new->via = new->prevhop->via;
-  else
-    new->via = new;
-cp
-  return 0;
-}
-
-int send_del_host(connection_t *cl, connection_t *other)
-{
-cp
-  return send_request(cl, "%d %s %lx:%d %lx %s", DEL_HOST,
-                      other->name, other->address, other->port, other->options, other->prevhop->name);
-}
-
-int del_host_h(connection_t *cl)
-{
-  char name[MAX_STRING_SIZE], prevhop[MAX_STRING_SIZE];
-  ipv4_t address;
-  port_t port;
-  long int options;
-  connection_t *old, *p;
-  avl_node_t *node;
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &address, &port, &options, prevhop) != 5)
-    {
-      syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
-             cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if identity is a valid name */
-
-  if(check_id(name))
-    {
-      syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  if(check_id(prevhop))
-    {
-      syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid prevhop name"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if somebody tries to delete ourself */
-
-  if(!strcmp(name, myself->name))
-    {
-      syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for ourself!"),
-             cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Check if the deleted host already exists in the connnection list */
-
-  if(!(old = lookup_id(name)))
-    {
-      syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"),
-             cl->name, cl->hostname, name);
-      return -1;
-    }
-  
-  /* Check if the rest matches */
-  
-  if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop || strcmp(prevhop, old->prevhop->name))
-    {
-      syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
-      return 0;
-    }
-
-  /* Ok, since EVERYTHING seems to check out all right, delete it */
-
-  terminate_connection(old, 0);
-
-  /* Tell the rest about the deleted host */
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      p = (connection_t *)node->data;
-      if(p->status.active && p!=cl)
-        send_del_host(p, old);
-    }
-cp
-  return 0;
-}
-
-/* Status and error notification routines */
-
-int send_status(connection_t *cl, int statusno, char *statusstring)
-{
-cp
-  if(!statusstring)
-    statusstring = status_text[statusno];
-cp
-  return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
-}
-
-int status_h(connection_t *cl)
-{
-  int statusno;
-  char statusstring[MAX_STRING_SIZE];
-cp
-  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
-    {
-       syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
-              cl->name, cl->hostname);
-       return -1;
-    }
-
-  if(debug_lvl >= DEBUG_STATUS)
-    {
-      syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
-             cl->name, cl->hostname, status_text[statusno], statusstring);
-    }
-
-cp
-  return 0;
-}
-
-int send_error(connection_t *cl, int err, char *errstring)
-{
-cp
-  if(!errstring)
-    errstring = strerror(err);
-  return send_request(cl, "%d %d %s", ERROR, err, errstring);
-}
-
-int error_h(connection_t *cl)
-{
-  int err;
-  char errorstring[MAX_STRING_SIZE];
-cp
-  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
-    {
-       syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
-              cl->name, cl->hostname);
-       return -1;
-    }
-
-  if(debug_lvl >= DEBUG_ERROR)
-    {
-      syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
-             cl->name, cl->hostname, strerror(err), errorstring);
-    }
-
-  terminate_connection(cl, cl->status.meta);
-cp
-  return 0;
-}
-
-int send_termreq(connection_t *cl)
-{
-cp
-  return send_request(cl, "%d", TERMREQ);
-}
-
-int termreq_h(connection_t *cl)
-{
-cp
-  terminate_connection(cl, cl->status.meta);
-cp
-  return 0;
-}
-
-int send_ping(connection_t *cl)
-{
-  char salt[SALTLEN*2+1];
-cp
-  cl->status.pinged = 1;
-  cl->last_ping_time = time(NULL);
-  RAND_pseudo_bytes(salt, SALTLEN);
-  bin2hex(salt, salt, SALTLEN);
-  salt[SALTLEN*2] = '\0';
-cp
-  return send_request(cl, "%d %s", PING, salt);
-}
-
-int ping_h(connection_t *cl)
-{
-cp
-  return send_pong(cl);
-}
-
-int send_pong(connection_t *cl)
-{
-  char salt[SALTLEN*2+1];
-cp
-  RAND_pseudo_bytes(salt, SALTLEN);
-  bin2hex(salt, salt, SALTLEN);
-  salt[SALTLEN*2] = '\0';
-cp
-  return send_request(cl, "%d %s", PONG, salt);
-}
-
-int pong_h(connection_t *cl)
-{
-cp
-  cl->status.pinged = 0;
-cp
-  return 0;
-}
-
-/* Key exchange */
-
-int send_key_changed(connection_t *from, connection_t *cl)
-{
-  connection_t *p;
-  avl_node_t *node;
-cp
-  /* Only send this message if some other daemon requested our key previously.
-     This reduces unnecessary key_changed broadcasts.
-  */
-
-  if(from==myself && !mykeyused)
-    return 0;
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      p = (connection_t *)node->data;
-      if(p != cl && p->status.active)
-        send_request(p, "%d %s", KEY_CHANGED, from->name);
-    }
-cp
-  return 0;
-}
-
-int key_changed_h(connection_t *cl)
-{
-  char from_id[MAX_STRING_SIZE];
-  connection_t *from;
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING, from_id) != 1)
-    {
-      syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
-             cl->name, cl->hostname);
-      return -1;
-    }
-
-  if(!(from = lookup_id(from_id)))
-    {
-      syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist in our connection list"),
-             cl->name, cl->hostname, from_id);
-      return -1;
-    }
-
-  from->status.validkey = 0;
-  from->status.waitingforkey = 0;
-
-  send_key_changed(from, cl);
-cp
-  return 0;
-}
-
-int send_req_key(connection_t *from, connection_t *to)
-{
-cp
-  return send_request(to->nexthop, "%d %s %s", REQ_KEY,
-                      from->name, to->name);
-}
-
-int req_key_h(connection_t *cl)
-{
-  char from_id[MAX_STRING_SIZE];
-  char to_id[MAX_STRING_SIZE];
-  connection_t *from, *to;
-  char pktkey[129];
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, from_id, to_id) != 2)
-    {
-       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
-              cl->name, cl->hostname);
-       return -1;
-    }
-
-  if(!(from = lookup_id(from_id)))
-    {
-      syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"),
-             cl->name, cl->hostname, from_id);
-      return -1;
-    }
-
-  /* Check if this key request is for us */
-
-  if(!strcmp(to_id, myself->name))	/* Yes, send our own key back */
-    {
-      bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength);
-      pktkey[myself->cipher_pktkeylength*2] = '\0';
-      send_ans_key(myself, from, pktkey);
-      mykeyused = 1;
-    }
-  else
-    {
-      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->name, cl->hostname, to_id);
-          return -1;
-        }
-        
-      if(to->status.validkey)	/* Proxy keys */
-        {
-          bin2hex(to->cipher_pktkey, pktkey, to->cipher_pktkeylength);
-          pktkey[to->cipher_pktkeylength*2] = '\0';
-          send_ans_key(to, from, pktkey);
-        }
-      else
-        send_req_key(from, to);
-    }
-
-cp
-  return 0;
-}
-
-int send_ans_key(connection_t *from, connection_t *to, char *pktkey)
-{
-cp
-  return send_request(to->nexthop, "%d %s %s %s", ANS_KEY,
-                      from->name, to->name, pktkey);
-}
-
-int ans_key_h(connection_t *cl)
-{
-  char from_id[MAX_STRING_SIZE];
-  char to_id[MAX_STRING_SIZE];
-  char pktkey[MAX_STRING_SIZE];
-  int keylength;
-  connection_t *from, *to;
-cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_id, to_id, pktkey) != 3)
-    {
-       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
-              cl->name, cl->hostname);
-       return -1;
-    }
-
-  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->name, cl->hostname, from_id);
-      return -1;
-    }
-
-  /* Check correctness of packet key */
-
-  keylength = strlen(pktkey);
-
-  if(keylength != from->cipher_pktkeylength*2)
-    {
-      syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
-             cl->name, cl->hostname, from->name);
-      return -1;
-    }
-
-  /* Forward it if necessary */
-
-  if(strcmp(to_id, myself->name))
-    {
-      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->name, cl->hostname, to_id);
-          return -1;
-        }
-      send_ans_key(from, to, pktkey);
-    }
-
-  /* Update our copy of the origin's packet key */
-
-  if(from->cipher_pktkey)
-    free(from->cipher_pktkey);
-
-  from->cipher_pktkey = xstrdup(pktkey);
-  keylength /= 2;
-  hex2bin(from->cipher_pktkey, from->cipher_pktkey, keylength);
-  from->cipher_pktkey[keylength] = '\0';
-
-  from->status.validkey = 1;
-  from->status.waitingforkey = 0;
-  
-  flush_queue(from);
-cp
-  return 0;
-}
-
-int send_tcppacket(connection_t *cl, vpn_packet_t *packet)
-{
-  int x;
-cp  
-  /* Evil hack. */
-
-  x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len);
-
-  if(x)
-    return x;
-cp
-  return send_meta(cl, packet->data, packet->len);
-}
-
-int tcppacket_h(connection_t *cl)
-{
-  short int len;
-cp  
-  if(sscanf(cl->buffer, "%*d %hd", &len) != 1)
-    {
-      syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-
-  /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
-
-  cl->tcplen = len;
-cp
-  return 0;
-}
-
-/* Jumptable for the request handlers */
-
-int (*request_handlers[])(connection_t*) = {
-  id_h, metakey_h, challenge_h, chal_reply_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,
-  tcppacket_h,
-};
-
-/* Request names */
+/* Request names */
 
 char (*request_name[]) = {
-  "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY",
+  "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
   "STATUS", "ERROR", "TERMREQ",
   "PING", "PONG",
-  "ADD_HOST", "DEL_HOST",
+//  "ADD_NODE", "DEL_NODE",
   "ADD_SUBNET", "DEL_SUBNET",
+  "ADD_EDGE", "DEL_EDGE",
   "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
   "PACKET",
 };
-
-/* Status strings */
-
-char (*status_text[]) = {
-  "Warning",
-};
-
-/* Error strings */
-
-char (*error_text[]) = {
-  "Error",
-};