X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=6cb8037940f7296a1be2c99a5dacda3929f19864;hp=f275f3e221ffaccbba3fdf31f926fbbd73c7c366;hb=54b756f7dfb71c5622b7738fd449e126da959864;hpb=82e383710980534d38bb9a8ef22f20677cd85861

diff --git a/src/protocol.c b/src/protocol.c
index f275f3e2..6cb80379 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.109 2001/10/27 12:13:17 guus Exp $
+    $Id: protocol.c,v 1.28.4.116 2001/10/31 20:02:06 guus Exp $
 */
 
 #include "config.h"
@@ -55,7 +55,8 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
-#include "vertex.h"
+#include "edge.h"
+#include "graph.h"
 
 #include "system.h"
 
@@ -176,10 +177,11 @@ cp
 int id_h(connection_t *c)
 {
   char name[MAX_STRING_SIZE];
+int bla;
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" %d", name, &c->protocol_version) != 2)
     {
-       syslog(LOG_ERR, _("Got bad %s from %s"), "ID", c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name, c->hostname);
        return -1;
     }
 
@@ -187,7 +189,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Peer %s uses invalid identity name"), c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ID", c->name, c->hostname, "invalid name");
       return -1;
     }
 
@@ -213,18 +215,28 @@ cp
       return -1;
     }
   
+  if(bypass_security)
+    {
+      if(!c->config_tree)
+        init_configuration(&c->config_tree);
+      c->allow_request = ACK;
+      return send_ack(c);
+    }
+
   if(!c->config_tree)
     {
-      if(read_connection_config(c))
+      init_configuration(&c->config_tree);
+
+      if((bla = read_connection_config(c)))
         {
           syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name);
           return -1;
         }
+    }
 
-      if(read_rsa_public_key(c))
-        {
-          return -1;
-        }
+  if(read_rsa_public_key(c))
+    {
+      return -1;
     }
 
   c->allow_request = METAKEY;
@@ -314,7 +326,7 @@ int metakey_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
-       syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
        return -1;
     }
 
@@ -324,7 +336,7 @@ cp
 
   if(strlen(buffer) != len*2)
     {
-      syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong keylength");
       return -1;
     }
 
@@ -412,7 +424,7 @@ int challenge_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
-       syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name, c->hostname);
        return -1;
     }
 
@@ -422,7 +434,7 @@ cp
 
   if(strlen(buffer) != len*2)
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong challenge length");
       return -1;
     }
 
@@ -446,12 +458,6 @@ int send_chal_reply(connection_t *c)
 {
   char hash[SHA_DIGEST_LENGTH*2+1];
 cp
-  if(!c->mychallenge)
-    {
-      syslog(LOG_ERR, _("Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"), c->name, c->hostname);
-      return -1;
-    }
-     
   /* Calculate the hash from the challenge we received */
 
   SHA1(c->mychallenge, RSA_size(myself->connection->rsa_key), hash);
@@ -474,7 +480,7 @@ int chal_reply_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, hishash) != 1)
     {
-       syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name, c->hostname);
        return -1;
     }
 
@@ -482,7 +488,7 @@ cp
 
   if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply length"));
       return -1;
     }
 
@@ -498,7 +504,7 @@ cp
 
   if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply"));
       if(debug_lvl >= DEBUG_SCARY_THINGS)
         {
           bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
@@ -520,21 +526,31 @@ cp
 int send_ack(connection_t *c)
 {
   /* ACK message contains rest of the information the other end needs
-     to create node_t and vertex_t structures. */
+     to create node_t and edge_t structures. */
+
+  struct timeval now;
+
+  /* Estimate weight */
+  
+  gettimeofday(&now, NULL);
+  c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
 cp
-  return send_request(c, "%d %d", ACK, myself->port);
+  return send_request(c, "%d %hd %d", ACK, myself->port, c->estimated_weight);
 }
 
 int ack_h(connection_t *c)
 {
   port_t port;
+  int weight;
   node_t *n;
   subnet_t *s;
+  edge_t *e;
+  connection_t *other;
   avl_node_t *node, *node2;
 cp
-  if(sscanf(c->buffer, "%*d %hd", &port) != 1)
+  if(sscanf(c->buffer, "%*d %hd %d", &port, &weight) != 2)
     {
-       syslog(LOG_ERR, _("Got bad %s from %s"), "ACK", c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
        return -1;
     }
 
@@ -546,6 +562,7 @@ cp
     {
       n = new_node();
       n->name = xstrdup(c->name);
+      n->address = c->address;
       n->hostname = xstrdup(c->hostname);
       n->port = port;
 
@@ -589,20 +606,23 @@ cp
 
   */
 
-  /* Create a vertex_t for this connection */
+  /* Create an edge_t for this connection */
 
-  c->vertex = new_vertex();
+  c->edge = new_edge();
   
-  c->vertex->from = myself;
-  c->vertex->to = n;
-  c->vertex->metric = 1;
-  c->vertex->connection = c;
+  c->edge->from = myself;
+  c->edge->to = n;
+  c->edge->weight = (weight + c->estimated_weight) / 2;
+  c->edge->connection = c;
 
-  vertex_add(c->vertex);
+  edge_add(c->edge);
 
   /* Activate this connection */
 
   c->allow_request = ALL;
+  c->status.active = 1;
+  c->node->cipher = EVP_bf_cbc();
+  c->node->keylength = c->node->cipher->key_len + c->node->cipher->iv_len;
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
@@ -621,25 +641,48 @@ cp
   for(node = node_tree->head; node; node = node->next)
     {
       n = (node_t *)node->data;
-      
-      if(n != c->node)
+
+      if(n == c->node || n == myself)
+        continue;
+
+      send_add_node(c, n);
+
+      for(node2 = c->node->subnet_tree->head; node2; node2 = node2->next)
         {
-          /* Notify others of this connection */
+          s = (subnet_t *)node2->data;
+          send_add_subnet(c, s);
+        }
+    }
 
-          if(n->connection)
-            send_add_node(n->connection, c->node);
+  /* Send all known edges */
 
-          /* Notify new connection of everything we know */
+  for(node = edge_tree->head; node; node = node->next)
+    {
+      e = (edge_t *)node->data;
 
-          send_add_node(c, n);
+      if(e == c->edge)
+        continue;
 
-          for(node2 = c->node->subnet_tree->head; node2; node2 = node2->next)
-            {
-              s = (subnet_t *)node2->data;
-              send_add_subnet(c, s);
-            }
-        }
+      send_add_edge(c, e);
     }
+
+  /* Notify others of this connection */
+
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      other = (connection_t *)node->data;
+
+      if(other == c)
+        continue;
+      
+      send_add_node(other, c->node);
+      send_add_edge(other, c->edge);
+    }
+
+  /* Run MST and SSSP algorithms */
+  
+  mst_kruskal();
+  sssp_bfs(0);
 cp
   return 0;
 }
@@ -671,7 +714,7 @@ int add_subnet_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
     {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
       return -1;
     }
 
@@ -679,7 +722,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
@@ -687,7 +730,7 @@ cp
 
   if(!(s = str2net(subnetstr)))
     {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
@@ -695,7 +738,7 @@ cp
 
   if(!(owner = lookup_node(name)))
     {
-      syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
+      syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
              name, c->name, c->hostname);
       return -1;
     }
@@ -738,7 +781,7 @@ int del_subnet_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
     {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
       return -1;
     }
 
@@ -746,7 +789,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
@@ -754,7 +797,7 @@ cp
 
   if(!(s = str2net(subnetstr)))
     {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
@@ -762,8 +805,8 @@ cp
 
   if(!(owner = lookup_node(name)))
     {
-      syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
-             name, c->name, c->hostname);
+      syslog(LOG_ERR, _("Got %s from %s (%s) for %s which is not in our connection list"),
+             "DEL_SUBNET", c->name, c->hostname, name);
       return -1;
     }
 
@@ -773,8 +816,8 @@ cp
   
   if(!find)
     {
-      syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which does not appear in his subnet tree"),
-             name, c->name, c->hostname);
+      syslog(LOG_ERR, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
+             "DEL_SUBNET", c->name, c->hostname, name);
       return -1;
     }
   
@@ -812,7 +855,7 @@ int add_node_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
     {
-       syslog(LOG_ERR, _("Got bad ADD_NODE from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_NODE", c->name, c->hostname);
        return -1;
     }
 
@@ -820,18 +863,10 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad ADD_NODE from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_NODE", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
-  /* Check if somebody tries to add ourself */
-
-  if(!strcmp(name, myself->name))
-    {
-      syslog(LOG_ERR, _("Got ADD_NODE from %s (%s) for ourself!"), c->name, c->hostname);
-      return -1;
-    }
-    
   /* Check if node already exists */
   
   n = lookup_node(name);
@@ -839,6 +874,11 @@ cp
   if(n)
     {
       /* Check if it matches */
+
+      if(n->address != address || n->port != port)
+        syslog(LOG_DEBUG, _("Got %s from %s (%s) for %s which does not match existing entry"), "ADD_NODE", c->name, c->hostname, n->name);
+
+      return 0;
     }
   else
     {
@@ -880,7 +920,7 @@ int del_node_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
     {
-      syslog(LOG_ERR, _("Got bad DEL_NODE from %s (%s)"),
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_NODE",
              c->name, c->hostname);
       return -1;
     }
@@ -889,7 +929,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad DEL_NODE from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_NODE", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
@@ -897,7 +937,7 @@ cp
 
   if(!strcmp(name, myself->name))
     {
-      syslog(LOG_ERR, _("Got DEL_NODE from %s (%s) for ourself!"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) for ourself!"), "DEL_NODE",
              c->name, c->hostname);
       return -1;
     }
@@ -908,7 +948,7 @@ cp
 
   if(!n)
     {
-      syslog(LOG_WARNING, _("Got DEL_NODE from %s (%s) for %s which does not exist"), c->name, c->hostname, n->name);
+      syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not exist"), "DEL_NODE", c->name, c->hostname, n->name);
       return 0;
     }
   
@@ -916,8 +956,7 @@ cp
   
   if(address != n->address || port != n->port)
     {
-      syslog(LOG_WARNING, _("Got DEL_NODE from %s (%s) for %s which doesn't match"), c->name, c->hostname, n->name);
-      return 0;
+      syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not match existing entry"), "DEL_NODE", c->name, c->hostname, n->name);
     }
 
   /* Tell the rest about the deleted node */
@@ -932,10 +971,209 @@ cp
   /* Delete the node */
   
   node_del(n);
+
+  mst_kruskal();
+  sssp_bfs(0);
+cp
+  return 0;
+}
+
+/* Edges */
+
+int send_add_edge(connection_t *c, edge_t *e)
+{
+cp
+  return send_request(c, "%d %s %s %lx %d", ADD_NODE,
+                      e->from->name, e->to->name, e->options, e->weight);
+}
+
+int add_edge_h(connection_t *c)
+{
+  connection_t *other;
+  edge_t *e;
+  node_t *from, *to;
+  char from_name[MAX_STRING_SIZE];
+  char to_name[MAX_STRING_SIZE];
+  long int options;
+  int weight;
+  avl_node_t *node;
+cp
+  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx %d", from_name, to_name, &options, &weight) != 4)
+    {
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
+       return -1;
+    }
+
+  /* Check if names are valid */
+
+  if(check_id(from_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  if(check_id(to_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  /* Lookup nodes */
+
+  from = lookup_node(from_name);
+  
+  if(!from)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  to = lookup_node(to_name);
+  
+  if(!to)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  /* Check if edge already exists */
+  
+  e = lookup_edge(from, to);
+  
+  if(e)
+    {
+      if(e->weight != weight || e->options != options)
+        {
+          syslog(LOG_ERR, _("Got %s from %s (%s) which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
+          return -1;
+        }
+      
+      return 0;
+    }
+  else
+    {
+      e = new_edge();
+      e->from = from;
+      e->to = to;
+      e->options = options;
+      e->weight = weight;
+      edge_add(e);
+    }
+
+  /* Tell the rest about the new edge */
+
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      other = (connection_t *)node->data;
+      if(other->status.active && other != c)
+        send_add_edge(other, e);
+    }
+
+  /* Run MST before or after we tell the rest? */
+
+  mst_kruskal();
+  sssp_bfs(0);
+cp
+  return 0;
+}
+
+int send_del_edge(connection_t *c, edge_t *e)
+{
+cp
+  return send_request(c, "%d %s %s %lx %d", DEL_EDGE,
+                      e->from->name, e->to->name, e->options, e->weight);
+}
+
+int del_edge_h(connection_t *c)
+{
+  edge_t *e;
+  char from_name[MAX_STRING_SIZE];
+  char to_name[MAX_STRING_SIZE];
+  node_t *from, *to;
+  long int options;
+  int weight;
+  connection_t *other;
+  avl_node_t *node;
+cp
+  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx %d", from_name, to_name, &options, &weight) != 4)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE",
+             c->name, c->hostname);
+      return -1;
+    }
+
+  /* Check if names are valid */
+
+  if(check_id(from_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  if(check_id(to_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  /* Lookup nodes */
+
+  from = lookup_node(from_name);
+  
+  if(!from)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  to = lookup_node(to_name);
+  
+  if(!to)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  /* Check if edge exists */
+  
+  e = lookup_edge(from, to);
+  
+  if(e)
+    {
+      if(e->weight != weight || e->options != options)
+        {
+          syslog(LOG_ERR, _("Got %s from %s (%s) which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
+          return -1;
+        }
+    }
+  else
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));
+      return -1;
+    }
+
+  /* Tell the rest about the deleted edge */
+
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      other = (connection_t *)node->data;
+      if(other->status.active && other != c)
+        send_del_edge(other, e);
+    }
+
+  /* Delete the edge */
+  
+  edge_del(e);
+
+  /* Run MST before or after we tell the rest? */
+
+  mst_kruskal();
+  sssp_bfs(1);
 cp
   return 0;
 }
 
+
 /* Status and error notification routines */
 
 int send_status(connection_t *c, int statusno, char *statusstring)
@@ -954,7 +1192,7 @@ int status_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
     {
-       syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
               c->name, c->hostname);
        return -1;
     }
@@ -984,7 +1222,7 @@ int error_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
     {
-       syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
               c->name, c->hostname);
        return -1;
     }
@@ -1083,7 +1321,7 @@ int key_changed_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
     {
-      syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
              c->name, c->hostname);
       return -1;
     }
@@ -1092,7 +1330,7 @@ cp
 
   if(!n)
     {
-      syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"), "KEY_CHANGED",
              c->name, c->hostname, name);
       return -1;
     }
@@ -1121,7 +1359,7 @@ int req_key_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, from_name, to_name) != 2)
     {
-       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY",
               c->name, c->hostname);
        return -1;
     }
@@ -1130,7 +1368,7 @@ cp
 
   if(!from)
     {
-      syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "REQ_KEY",
              c->name, c->hostname, from_name);
       return -1;
     }
@@ -1139,7 +1377,7 @@ cp
   
   if(!to)
     {
-      syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "REQ_KEY",
              c->name, c->hostname, to_name);
       return -1;
     }
@@ -1186,7 +1424,7 @@ int ans_key_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_name, to_name, key) != 3)
     {
-       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY",
               c->name, c->hostname);
        return -1;
     }
@@ -1195,7 +1433,7 @@ cp
 
   if(!from)
     {
-      syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "ANS_KEY",
              c->name, c->hostname, from_name);
       return -1;
     }
@@ -1204,7 +1442,7 @@ cp
 
   if(!to)
     {
-      syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "ANS_KEY",
              c->name, c->hostname, to_name);
       return -1;
     }
@@ -1215,8 +1453,8 @@ cp
 
   if(keylength != from->keylength * 2)
     {
-      syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
-             c->name, c->hostname, from->name);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s) origin %s: %s"), "ANS_KEY",
+             c->name, c->hostname, from->name, _("invalid key length"));
       return -1;
     }
 
@@ -1265,7 +1503,7 @@ int tcppacket_h(connection_t *c)
 cp  
   if(sscanf(c->buffer, "%*d %hd", &len) != 1)
     {
-      syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname);
       return -1;
     }
 
@@ -1284,6 +1522,7 @@ int (*request_handlers[])(connection_t*) = {
   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,
 };
@@ -1296,7 +1535,7 @@ char (*request_name[]) = {
   "PING", "PONG",
   "ADD_NODE", "DEL_NODE",
   "ADD_SUBNET", "DEL_SUBNET",
-  "ADD_VERTEX", "DEL_VERTEX",
+  "ADD_EDGE", "DEL_EDGE",
   "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
   "PACKET",
 };