X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=85a4047c2c9360886a96233504588b30209987ae;hp=fbb0abf31f435cb60cfb12141345f6882e1fd536;hb=e924096f62655d711cd2d114a8d1ef0fecbb593b;hpb=bb2495e569fb161b42efd633eb1c471b8222b1fb

diff --git a/src/protocol.c b/src/protocol.c
index fbb0abf3..85a4047c 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.60 2000/11/15 01:06:11 zarq Exp $
+    $Id: protocol.c,v 1.28.4.71 2001/01/05 23:53:51 guus Exp $
 */
 
 #include "config.h"
@@ -30,9 +30,11 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 #include <utils.h>
 #include <xalloc.h>
+#include <avl_tree.h>
 
 #include <netinet/in.h>
 
@@ -60,7 +62,7 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "meta.h"
-#include "connlist.h"
+#include "connection.h"
 
 #include "system.h"
 
@@ -71,21 +73,23 @@ int check_id(char *id)
   for (i = 0; i < strlen(id); i++)
     if(!isalnum(id[i]) && id[i] != '_')
       return -1;
-          
+  
   return 0;
 }
 
-/* Generic request routines - takes care of logging and error detection as well */
+/* Generic request routines - takes care of logging and error
+   detection as well */
 
-int send_request(conn_list_t *cl, const char *format, ...)
+int send_request(connection_t *cl, const char *format, ...)
 {
   va_list args;
   char buffer[MAXBUFSIZE];
   int len, request;
 
 cp
-  /* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic,
-     and there is a limit on the input buffer anyway */
+  /* Use vsnprintf instead of vasprintf: faster, no memory
+     fragmentation, cleanup is automatic, and there is a limit on the
+     input buffer anyway */
 
   va_start(args, format);
   len = vsnprintf(buffer, MAXBUFSIZE, format, args);
@@ -107,7 +111,7 @@ cp
   return send_meta(cl, buffer, len);
 }
 
-int receive_request(conn_list_t *cl)
+int receive_request(connection_t *cl)
 {
   int request;
 cp  
@@ -173,12 +177,13 @@ cp
    (H) SHA1,
    (E) Encrypted with symmetric cipher.
 
-   Part of the challenge is directly used to set the symmetric cipher key and the initial vector.
-   Since a man-in-the-middle cannot decrypt the RSA challenges, this means that he cannot get or
-   forge the key for the symmetric cipher.
+   Part of the challenge is directly used to set the symmetric cipher
+   key and the initial vector.  Since a man-in-the-middle cannot
+   decrypt the RSA challenges, this means that he cannot get or forge
+   the key for the symmetric cipher.
 */
 
-int send_id(conn_list_t *cl)
+int send_id(connection_t *cl)
 {
 cp
   cl->allow_request = CHALLENGE;
@@ -186,12 +191,13 @@ cp
   return send_request(cl, "%d %s %d %lx %hd", ID, myself->name, myself->protocol_version, myself->options, myself->port);
 }
 
-int id_h(conn_list_t *cl)
+int id_h(connection_t *cl)
 {
-  conn_list_t *old;
-  config_t const *cfg;
+  connection_t *old;
+  unsigned short int port;
+  char name[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %as %d %lx %hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &port) != 4)
     {
        syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
        return -1;
@@ -208,14 +214,18 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(check_id(cl->name))
+  if(check_id(name))
     {
       syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
       return -1;
     }
+  
+  /* Copy string to cl */
+  
+  cl->name = xstrdup(name);
 
   /* Load information about peer */
-cp
+
   if(read_host_config(cl))
     {
       syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
@@ -226,7 +236,7 @@ cp
      connection list. If so, we are probably making a loop, which
      is not desirable.
    */
-cp
+
   if(cl->status.outgoing)
     {
       if((old = lookup_id(cl->name)))
@@ -239,23 +249,27 @@ cp
           return 0;
         }
     }
-cp    
-  if((cfg = get_config_val(cl->config, config_publickey)))
-    {
-      cl->rsa_key = RSA_new();
-      BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
-      BN_hex2bn(&cl->rsa_key->e, "FFFF");
-    }
-  else
-    {
-      syslog(LOG_ERR, _("No public key known for %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
+    
+  /* Now we can add the name to the id tree */
+  
+  id_add(cl);
+
+  /* And uhr... cl->port just changed so we have to unlink it from the connection tree and re-insert... */
+  
+  avl_unlink(connection_tree, cl);
+  cl->port = port;
+  avl_insert(connection_tree, cl);
+
+  /* Read in the public key, so that we can send a challenge */
+
+  if(read_rsa_public_key(cl))
+    return -1;
+
 cp
   return send_challenge(cl);
 }
 
-int send_challenge(conn_list_t *cl)
+int send_challenge(connection_t *cl)
 {
   char *buffer;
   int len, x;
@@ -276,7 +290,7 @@ cp
   RAND_bytes(cl->hischallenge, len);
 
   cl->hischallenge[0] &= 0x7F;	/* Somehow if the first byte is more than 0xD0 or something like that, decryption fails... */
-
+cp
   if(debug_lvl >= DEBUG_SCARY_THINGS)
     {
       bin2hex(cl->hischallenge, buffer, len);
@@ -285,7 +299,7 @@ cp
     }
 
   /* Encrypt the random data */
-  
+
   if(RSA_public_encrypt(len, cl->hischallenge, buffer, cl->rsa_key, RSA_NO_PADDING) != len)	/* NO_PADDING because the message size equals the RSA key size and it is totally random */
     {
       syslog(LOG_ERR, _("Error during encryption of challenge for %s (%s)"), cl->name, cl->hostname);
@@ -297,7 +311,7 @@ cp
 
   bin2hex(buffer, buffer, len);
   buffer[len*2] = '\0';
-
+cp
   /* Send the challenge */
 
   cl->allow_request = CHAL_REPLY;
@@ -307,12 +321,12 @@ cp
   return x;
 }
 
-int challenge_h(conn_list_t *cl)
+int challenge_h(connection_t *cl)
 {
-  char *buffer;
+  char buffer[MAX_STRING_SIZE];
   int len;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &buffer) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
        syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -325,7 +339,6 @@ cp
   if(strlen(buffer) != len*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -343,7 +356,6 @@ cp
   if(RSA_private_decrypt(len, buffer, cl->mychallenge, myself->rsa_key, RSA_NO_PADDING) != len)	/* See challenge() */
     {
       syslog(LOG_ERR, _("Error during encryption of challenge for %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -354,14 +366,12 @@ cp
       syslog(LOG_DEBUG, _("Received random challenge (unencrypted): %s"), buffer);
     }
 
-  free(buffer);
-    
   /* Rest is done by send_chal_reply() */
 cp
   return send_chal_reply(cl);
 }
 
-int send_chal_reply(conn_list_t *cl)
+int send_chal_reply(connection_t *cl)
 {
   char hash[SHA_DIGEST_LENGTH*2+1];
 cp
@@ -391,15 +401,14 @@ cp
   return send_request(cl, "%d %s", CHAL_REPLY, hash);
 }
 
-int chal_reply_h(conn_list_t *cl)
+int chal_reply_h(connection_t *cl)
 {
-  char *hishash;
+  char hishash[MAX_STRING_SIZE];
   char myhash[SHA_DIGEST_LENGTH];
 cp
-  if(sscanf(cl->buffer, "%*d %as", &hishash) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, hishash) != 1)
     {
        syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
-       free(hishash);
        return -1;
     }
 
@@ -408,7 +417,6 @@ cp
   if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname);
-      free(hishash);
       return -1;
     }
 
@@ -431,13 +439,10 @@ cp
           hishash[SHA_DIGEST_LENGTH*2] = '\0';
           syslog(LOG_DEBUG, _("Expected challenge reply: %s"), hishash);
         }
-      free(hishash);
       return -1;
     }
 
 
-  free(hishash);
-
   /* Identity has now been positively verified.
      If we are accepting this new connection, then send our identity,
      if we are making this connecting, acknowledge.
@@ -449,7 +454,7 @@ cp
       return send_id(cl);
 }
 
-int send_metakey(conn_list_t *cl)
+int send_metakey(connection_t *cl)
 {
   char *buffer;
   int len, x;
@@ -508,12 +513,12 @@ cp
   return x;
 }
 
-int metakey_h(conn_list_t *cl)
+int metakey_h(connection_t *cl)
 {
-  char *buffer;
+  char buffer[MAX_STRING_SIZE];
   int len;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &buffer) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
        syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -526,7 +531,6 @@ cp
   if(strlen(buffer) != len*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -547,7 +551,6 @@ cp
   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);
-      free(buffer);
       return -1;
     }
 
@@ -558,8 +561,6 @@ cp
       syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
     }
 
-  free(buffer);
-
   EVP_DecryptInit(cl->cipher_inctx, EVP_bf_cfb(), cl->cipher_inkey, cl->cipher_inkey + EVP_bf_cfb()->key_len);
   
 cp
@@ -569,25 +570,24 @@ cp
     return send_metakey(cl);
 }
 
-int send_ack(conn_list_t *cl)
+int send_ack(connection_t *cl)
 {
   int x;
 cp
   if(cl->status.outgoing)
     cl->allow_request = ACK;
 
-  setup_vpn_connection(cl);
-
   x = send_request(cl, "%d", ACK);
   cl->status.encryptout = 1;
 cp
   return x;
 }
 
-int ack_h(conn_list_t *cl)
+int ack_h(connection_t *cl)
 {
-  conn_list_t *old, *p;
-  subnet_t *s;
+  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
@@ -621,33 +621,42 @@ cp
 
   /* Send him our subnets */
   
-  for(s = myself->subnets; s; s = s->next)
-    send_add_subnet(cl, s);
-
+  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(p = conn_list; p; p = p->next)
-    if(p != cl && p->status.active)
-      {
-        /* Notify others of this connection */
-  
-        if(p->status.meta)
-          send_add_host(p, cl);
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      p = (connection_t *)node->data;
+      
+      if(p != cl && p->status.active)
+        {
+          /* Notify others of this connection */
 
-        /* Notify new connection of everything we know */
+          if(p->status.meta)
+            send_add_host(p, cl);
 
-        send_add_host(cl, p);
-        
-        for(s = p->subnets; s; s = s->next)
-          send_add_subnet(cl, s);
-      }
+          /* 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;
 }
 
 /* Address and subnet information exchange */
 
-int send_add_subnet(conn_list_t *cl, subnet_t *subnet)
+int send_add_subnet(connection_t *cl, subnet_t *subnet)
 {
   int x;
   char *netstr;
@@ -659,17 +668,17 @@ cp
   return x;
 }
 
-int add_subnet_h(conn_list_t *cl)
+int add_subnet_h(connection_t *cl)
 {
-  char *subnetstr;
-  char *name;
-  conn_list_t *owner, *p;
+  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 %as %as", &name, &subnetstr) != 2)
+  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);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -678,7 +687,6 @@ cp
   if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -687,19 +695,15 @@ cp
   if(!(subnet = str2net(subnetstr)))
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
-  free(subnetstr);
-  
   /* 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);
-      free(name);
       sighup = 1;
       return 0;
     }
@@ -710,7 +714,6 @@ cp
     {
       syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
              name, cl->name, cl->hostname);
-      free(name);
       return -1;
     }
 
@@ -720,14 +723,17 @@ cp
 
   /* Tell the rest */
   
-  for(p = conn_list; p; p = p->next)
-    if(p->status.meta && p->status.active && p!= cl)
-      send_add_subnet(p, subnet);
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      p = (connection_t *)node->data;
+      if(p->status.meta && p->status.active && p!= cl)
+        send_add_subnet(p, subnet);
+    }
 cp
   return 0;
 }
 
-int send_del_subnet(conn_list_t *cl, subnet_t *subnet)
+int send_del_subnet(connection_t *cl, subnet_t *subnet)
 {
   int x;
   char *netstr;
@@ -739,17 +745,17 @@ cp
   return x;
 }
 
-int del_subnet_h(conn_list_t *cl)
+int del_subnet_h(connection_t *cl)
 {
-  char *subnetstr;
-  char *name;
-  conn_list_t *owner, *p;
+  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 %as %as", &name, &subnetstr) != 3)
+  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);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -758,7 +764,6 @@ cp
   if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -767,7 +772,6 @@ cp
   if(!(subnet = str2net(subnetstr)))
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -779,7 +783,6 @@ cp
     {
       syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);
-      free(name);
       sighup = 1;
       return 0;
     }
@@ -790,7 +793,6 @@ cp
     {
       syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
              name, cl->name, cl->hostname);
-      free(name);
       return -1;
     }
 
@@ -800,31 +802,34 @@ cp
 
   /* Tell the rest */
   
-  for(p = conn_list; p; p = p->next)
-    if(p->status.meta && p->status.active && p!= cl)
-      send_del_subnet(p, subnet);
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      p = (connection_t *)node->data;
+      if(p->status.meta && p->status.active && p!= cl)
+        send_del_subnet(p, subnet);
+    }
 cp
   return 0;
 }
 
 /* New and closed connections notification */
 
-int send_add_host(conn_list_t *cl, conn_list_t *other)
+int send_add_host(connection_t *cl, connection_t *other)
 {
 cp
   return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
                       other->name, other->address, other->port, other->options);
 }
 
-int add_host_h(conn_list_t *cl)
+int add_host_h(connection_t *cl)
 {
-  conn_list_t *old, *new;
-  conn_list_t *p;
-
+  connection_t *old, *new, *p;
+  char name[MAX_STRING_SIZE];
+  avl_node_t *node;
 cp
-  new = new_conn_list();
+  new = new_connection();
 
-  if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &new->name, &new->address, &new->port, &new->options) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%d %lx", name, &new->address, &new->port, &new->options) != 4)
     {
        syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -832,37 +837,37 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(check_id(new->name))
+  if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free_conn_list(new);
+      free_connection(new);
       return -1;
     }
 
   /* Check if somebody tries to add ourself */
 
-  if(!strcmp(new->name, myself->name))
+  if(!strcmp(name, myself->name))
     {
       syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
       sighup = 1;
-      free_conn_list(new);
+      free_connection(new);
       return 0;
     }
     
-  /* Fill in more of the new conn_list structure */
+  /* Fill in more of the new connection structure */
 
   new->hostname = hostlookup(htonl(new->address));
 
   /* Check if the new host already exists in the connnection list */
 
-  if((old = lookup_id(new->name)))
+  if((old = lookup_id(name)))
     {
       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->name, old->hostname, new->name, new->hostname);
-          free_conn_list(new);
+                   old->name, old->hostname, name, new->hostname);
+          free_connection(new);
           return 0;
         }
       else
@@ -875,48 +880,48 @@ cp
         }
     }
 
-  /* Hook it up into the conn_list */
+  /* Hook it up into the connection */
 
-  conn_list_add(new);
+  new->name = xstrdup(name);
+  connection_add(new);
+  id_add(new);
 
   /* Tell the rest about the new host */
 
-  for(p = conn_list; p; p = p->next)
-    if(p->status.meta && p->status.active && p!=cl)
-      send_add_host(p, new);
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      p = (connection_t *)node->data;
+      if(p->status.meta && p->status.active && p!=cl)
+        send_add_host(p, new);
+    }
 
-  /* Fill in rest of conn_list structure */
+  /* Fill in rest of connection structure */
 
   new->nexthop = cl;
   new->status.active = 1;
   new->cipher_pkttype = EVP_bf_cfb();
   new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
-
-  /* Okay this is a bit ugly... it would be better to setup UDP sockets dynamically, or
-   * perhaps just one UDP socket... but then again, this has benefits too...
-   */
-   
-  setup_vpn_connection(new);
 cp
   return 0;
 }
 
-int send_del_host(conn_list_t *cl, conn_list_t *other)
+int send_del_host(connection_t *cl, connection_t *other)
 {
 cp
   return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
                       other->name, other->address, other->port, other->options);
 }
 
-int del_host_h(conn_list_t *cl)
+int del_host_h(connection_t *cl)
 {
-  char *name;
+  char name[MAX_STRING_SIZE];
   ip_t address;
   port_t port;
   long int options;
-  conn_list_t *old, *p;
+  connection_t *old, *p;
+  avl_node_t *node;
 cp
-  if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &name, &address, &port, &options) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%d %lx", name, &address, &port, &options) != 4)
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
              cl->name, cl->hostname);
@@ -928,7 +933,6 @@ cp
   if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free(name);
       return -1;
     }
 
@@ -938,7 +942,6 @@ cp
     {
       syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);
-      free(name);
       sighup = 1;
       return 0;
     }
@@ -949,7 +952,6 @@ cp
     {
       syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"),
              name, cl->name, cl->hostname);
-      free(name);
       return -1;
     }
   
@@ -968,16 +970,19 @@ cp
 
   /* Tell the rest about the new host */
 
-  for(p = conn_list; p; p = p->next)
-    if(p->status.meta && p->status.active && p!=cl)
-      send_del_host(p, old);
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      p = (connection_t *)node->data;
+      if(p->status.meta && p->status.active && p!=cl)
+        send_del_host(p, old);
+    }
 cp
   return 0;
 }
 
 /* Status and error notification routines */
 
-int send_status(conn_list_t *cl, int statusno, char *statusstring)
+int send_status(connection_t *cl, int statusno, char *statusstring)
 {
 cp
   if(!statusstring)
@@ -986,12 +991,12 @@ cp
   return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
 }
 
-int status_h(conn_list_t *cl)
+int status_h(connection_t *cl)
 {
   int statusno;
-  char *statusstring;
+  char statusstring[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2)
+  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
               cl->name, cl->hostname);
@@ -1005,11 +1010,10 @@ cp
     }
 
 cp
-  free(statusstring);
   return 0;
 }
 
-int send_error(conn_list_t *cl, int errno, char *errstring)
+int send_error(connection_t *cl, int errno, char *errstring)
 {
 cp
   if(!errstring)
@@ -1017,12 +1021,12 @@ cp
   return send_request(cl, "%d %d %s", ERROR, errno, errstring);
 }
 
-int error_h(conn_list_t *cl)
+int error_h(connection_t *cl)
 {
   int errno;
-  char *errorstring;
+  char errorstring[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
+  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &errno, errorstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
               cl->name, cl->hostname);
@@ -1035,19 +1039,18 @@ cp
              cl->name, cl->hostname, strerror(errno), errorstring);
     }
 
-  free(errorstring);
   terminate_connection(cl);
 cp
   return 0;
 }
 
-int send_termreq(conn_list_t *cl)
+int send_termreq(connection_t *cl)
 {
 cp
   return send_request(cl, "%d", TERMREQ);
 }
 
-int termreq_h(conn_list_t *cl)
+int termreq_h(connection_t *cl)
 {
 cp
   terminate_connection(cl);
@@ -1057,7 +1060,7 @@ cp
 
 /* Keepalive routines - FIXME: needs a closer look */
 
-int send_ping(conn_list_t *cl)
+int send_ping(connection_t *cl)
 {
 cp
   cl->status.pinged = 1;
@@ -1066,19 +1069,19 @@ cp
   return send_request(cl, "%d", PING);
 }
 
-int ping_h(conn_list_t *cl)
+int ping_h(connection_t *cl)
 {
 cp
   return send_pong(cl);
 }
 
-int send_pong(conn_list_t *cl)
+int send_pong(connection_t *cl)
 {
 cp
   return send_request(cl, "%d", PONG);
 }
 
-int pong_h(conn_list_t *cl)
+int pong_h(connection_t *cl)
 {
 cp
   cl->status.pinged = 0;
@@ -1088,26 +1091,27 @@ cp
 
 /* Key exchange */
 
-int send_key_changed(conn_list_t *from, conn_list_t *cl)
+int send_key_changed(connection_t *from, connection_t *cl)
 {
-  conn_list_t *p;
+  connection_t *p;
+  avl_node_t *node;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
+  for(node = connection_tree->head; node; node = node->next)
     {
-      if(p!=cl && p->status.meta && p->status.active)
-        send_request(p, "%d %s", KEY_CHANGED,
-                     from->name);
+      p = (connection_t *)node->data;
+      if(p != cl && p->status.meta && p->status.active)
+        send_request(p, "%d %s", KEY_CHANGED, from->name);
     }
 cp
   return 0;
 }
 
-int key_changed_h(conn_list_t *cl)
+int key_changed_h(connection_t *cl)
 {
-  char *from_id;
-  conn_list_t *from;
+  char from_id[MAX_STRING_SIZE];
+  connection_t *from;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &from_id) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, from_id) != 1)
     {
       syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
              cl->name, cl->hostname);
@@ -1118,12 +1122,9 @@ cp
     {
       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);
-      free(from_id);
       return -1;
     }
 
-  free(from_id);
-
   from->status.validkey = 0;
   from->status.waitingforkey = 0;
 
@@ -1132,20 +1133,21 @@ cp
   return 0;
 }
 
-int send_req_key(conn_list_t *from, conn_list_t *to)
+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(conn_list_t *cl)
+int req_key_h(connection_t *cl)
 {
-  char *from_id, *to_id;
-  conn_list_t *from, *to;
+  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 %as %as", &from_id, &to_id) != 2)
+  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);
@@ -1156,7 +1158,6 @@ cp
     {
       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);
-      free(from_id); free(to_id);
       return -1;
     }
 
@@ -1174,7 +1175,6 @@ cp
         {
           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);
-          free(from_id); free(to_id);
           return -1;
         }
         
@@ -1188,25 +1188,26 @@ cp
         send_req_key(from, to);
     }
 
-  free(from_id); free(to_id);
 cp
   return 0;
 }
 
-int send_ans_key(conn_list_t *from, conn_list_t *to, char *pktkey)
+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(conn_list_t *cl)
+int ans_key_h(connection_t *cl)
 {
-  char *from_id, *to_id, *pktkey;
+  char from_id[MAX_STRING_SIZE];
+  char to_id[MAX_STRING_SIZE];
+  char pktkey[MAX_STRING_SIZE];
   int keylength;
-  conn_list_t *from, *to;
+  connection_t *from, *to;
 cp
-  if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &pktkey) != 3)
+  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);
@@ -1217,7 +1218,6 @@ cp
     {
       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);
-      free(from_id); free(to_id); free(pktkey);
       return -1;
     }
 
@@ -1229,7 +1229,6 @@ cp
     {
       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
              cl->name, cl->hostname, from->name);
-      free(from_id); free(to_id); free(pktkey);
       return -1;
     }
 
@@ -1241,7 +1240,6 @@ cp
         {
           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);
-          free(from_id); free(to_id);
           return -1;
         }
       send_ans_key(from, to, pktkey);
@@ -1252,22 +1250,20 @@ cp
   if(from->cipher_pktkey)
     free(from->cipher_pktkey);
 
+  from->cipher_pktkey = xstrdup(pktkey);
   keylength /= 2;
-  hex2bin(pktkey, pktkey, keylength);
-  pktkey[keylength] = '\0';
-  from->cipher_pktkey = pktkey;
+  hex2bin(from->cipher_pktkey, from->cipher_pktkey, keylength);
+  from->cipher_pktkey[keylength] = '\0';
 
   from->status.validkey = 1;
   from->status.waitingforkey = 0;
-    
-  free(from_id); free(to_id);
 cp
   return 0;
 }
 
 /* Jumptable for the request handlers */
 
-int (*request_handlers[])(conn_list_t*) = {
+int (*request_handlers[])(connection_t*) = {
   id_h, challenge_h, chal_reply_h, metakey_h, ack_h,
   status_h, error_h, termreq_h,
   ping_h, pong_h,