X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=36de405d5b51d04eefca9062068c16aa8f77d158;hp=d1bb524fc2e53913aa68885c029d37ae194e70d5;hb=e5047d2835f0828a9c334cc3d928c2322abfefb7;hpb=94497336efc1cc60561575e74d420e9e8e8c657e

diff --git a/src/protocol.c b/src/protocol.c
index d1bb524f..36de405d 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.110 2001/10/28 08:41:19 guus Exp $
+    $Id: protocol.c,v 1.28.4.118 2001/11/03 21:22:02 guus Exp $
 */
 
 #include "config.h"
@@ -56,6 +56,7 @@
 #include "connection.h"
 #include "node.h"
 #include "edge.h"
+#include "graph.h"
 
 #include "system.h"
 
@@ -231,11 +232,11 @@ cp
           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;
@@ -245,15 +246,13 @@ cp
 
 int send_metakey(connection_t *c)
 {
-  char *buffer;
+  char buffer[MAX_STRING_SIZE];
   int len, x;
 cp
   len = RSA_size(c->rsa_key);
 
   /* Allocate buffers for the meta key */
 
-  buffer = xmalloc(len*2+1);
-
   if(!c->outkey)
     c->outkey = xmalloc(len);
     
@@ -289,11 +288,10 @@ cp
      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, c->outkey, buffer, c->rsa_key, RSA_NO_PADDING) != len)
     {
       syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
-      free(buffer);
       return -1;
     }
 cp
@@ -305,7 +303,6 @@ cp
   /* Send the meta key */
 
   x = send_request(c, "%d %s", METAKEY, buffer);
-  free(buffer);
 
   /* Further outgoing requests are encrypted with the key we just generated */
 
@@ -328,7 +325,7 @@ cp
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
        return -1;
     }
-
+cp
   len = RSA_size(myself->connection->rsa_key);
 
   /* Check if the length of the meta key is all right */
@@ -340,7 +337,7 @@ cp
     }
 
   /* Allocate buffers for the meta key */
-
+cp
   if(!c->inkey)
     c->inkey = xmalloc(len);
 
@@ -348,11 +345,11 @@ cp
     c->inctx = xmalloc(sizeof(*c->inctx));
 
   /* Convert the challenge from hexadecimal back to binary */
-
+cp
   hex2bin(buffer,buffer,len);
 
   /* Decrypt the meta key */
-  
+cp  
   if(RSA_private_decrypt(len, buffer, c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len)	/* See challenge() */
     {
       syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
@@ -367,7 +364,7 @@ cp
     }
 
   /* All incoming requests will now be encrypted. */
-
+cp
   EVP_DecryptInit(c->inctx, EVP_bf_cfb(),
                   c->inkey + len - EVP_bf_cfb()->key_len,
                   c->inkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
@@ -381,7 +378,7 @@ cp
 
 int send_challenge(connection_t *c)
 {
-  char *buffer;
+  char buffer[MAX_STRING_SIZE];
   int len, x;
 cp
   /* CHECKME: what is most reasonable value for len? */
@@ -390,12 +387,8 @@ cp
 
   /* Allocate buffers for the challenge */
 
-  buffer = xmalloc(len*2+1);
-
-  if(c->hischallenge)
-    free(c->hischallenge);
-    
-  c->hischallenge = xmalloc(len);
+  if(!c->hischallenge)
+    c->hischallenge = xmalloc(len);
 cp
   /* Copy random data to the buffer */
 
@@ -411,7 +404,6 @@ cp
   /* Send the challenge */
 
   x = send_request(c, "%d %s", CHALLENGE, buffer);
-  free(buffer);
 cp
   return x;
 }
@@ -526,18 +518,28 @@ int send_ack(connection_t *c)
 {
   /* ACK message contains rest of the information the other end needs
      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 (%s)"), "ACK", c->name, c->hostname);
        return -1;
@@ -551,6 +553,7 @@ cp
     {
       n = new_node();
       n->name = xstrdup(c->name);
+      n->address = c->address;
       n->hostname = xstrdup(c->hostname);
       n->port = port;
 
@@ -594,13 +597,13 @@ cp
 
   */
 
-  /* Create a edge_t for this connection */
+  /* Create an edge_t for this connection */
 
   c->edge = new_edge();
   
   c->edge->from = myself;
   c->edge->to = n;
-  c->edge->metric = 1;
+  c->edge->weight = (weight + c->estimated_weight) / 2;
   c->edge->connection = c;
 
   edge_add(c->edge);
@@ -609,6 +612,8 @@ cp
 
   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);
@@ -631,13 +636,6 @@ cp
       if(n == c->node || n == myself)
         continue;
 
-      /* Notify others of this connection */
-
-      if(n->connection)
-        send_add_node(n->connection, c->node);
-
-      /* Notify new connection of everything we know */
-
       send_add_node(c, n);
 
       for(node2 = c->node->subnet_tree->head; node2; node2 = node2->next)
@@ -646,6 +644,36 @@ cp
           send_add_subnet(c, s);
         }
     }
+
+  /* Send all known edges */
+
+  for(node = edge_tree->head; node; node = node->next)
+    {
+      e = (edge_t *)node->data;
+
+      if(e == c->edge)
+        continue;
+
+      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->status.active && other != c)
+        {
+          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;
 }
@@ -699,13 +727,23 @@ cp
 
   /* Check if the owner of the new subnet is in the connection list */
 
-  if(!(owner = lookup_node(name)))
+  owner = lookup_node(name);
+
+  if(!node)
     {
       syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
-             name, c->name, c->hostname);
+             c->name, c->hostname, name);
       return -1;
     }
 
+  /* Check if we already know this subnet */
+  
+  if(lookup_subnet(owner, s))
+    {
+      free_subnet(s);
+      return 0;
+    }
+
   /* If everything is correct, add the subnet to the list of the owner */
 
   subnet_add(owner, s);
@@ -756,20 +794,20 @@ cp
       return -1;
     }
 
-  /* Check if subnet string is valid */
+  /* Check if the owner of the new subnet is in the connection list */
 
-  if(!(s = str2net(subnetstr)))
+  if(!(owner = lookup_node(name)))
     {
-      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
+      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;
     }
 
-  /* Check if the owner of the new subnet is in the connection list */
+  /* Check if subnet string is valid */
 
-  if(!(owner = lookup_node(name)))
+  if(!(s = str2net(subnetstr)))
     {
-      syslog(LOG_ERR, _("Got %s from %s (%s) for %s which is not in our connection list"),
-             "DEL_SUBNET", c->name, c->hostname, name);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
@@ -777,6 +815,8 @@ cp
 
   find = lookup_subnet(owner, s);
   
+  free_subnet(s);
+
   if(!find)
     {
       syslog(LOG_ERR, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
@@ -784,7 +824,7 @@ cp
       return -1;
     }
   
-  subnet_del(owner, s);
+  subnet_del(owner, find);
 
   /* Tell the rest */
   
@@ -837,6 +877,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
     {
@@ -914,8 +959,7 @@ cp
   
   if(address != n->address || port != n->port)
     {
-      syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which doesn't match"), "DEL_NODE", 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 */
@@ -930,30 +974,34 @@ cp
   /* Delete the node */
   
   node_del(n);
+
+  mst_kruskal();
+  sssp_bfs(0);
 cp
   return 0;
 }
 
-/* Vertices */
+/* Edges */
 
-int send_add_edge(connection_t *c, edge_t *v)
+int send_add_edge(connection_t *c, edge_t *e)
 {
 cp
-  return send_request(c, "%d %s %s %lx", ADD_NODE,
-                      v->from->name, v->to->name, v->options);
+  return send_request(c, "%d %s %s %lx %d", ADD_EDGE,
+                      e->from->name, e->to->name, e->options, e->weight);
 }
 
 int add_edge_h(connection_t *c)
 {
   connection_t *other;
-  edge_t *v;
+  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", from_name, to_name, &options) != 3)
+  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;
@@ -991,21 +1039,28 @@ cp
       return -1;
     }
 
-  /* Check if node already exists */
+  /* Check if edge already exists */
   
-  v = lookup_edge(from, to);
+  e = lookup_edge(from, to);
   
-  if(v)
+  if(e)
     {
-      /* Check if it matches */
+      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
     {
-      v = new_edge();
-      v->from = from;
-      v->to = to;
-      v->options = options;
-      edge_add(v);
+      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 */
@@ -1014,31 +1069,36 @@ cp
     {
       other = (connection_t *)node->data;
       if(other->status.active && other != c)
-        send_add_edge(other, v);
+        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 *v)
+int send_del_edge(connection_t *c, edge_t *e)
 {
 cp
-  return send_request(c, "%d %s %s %lx", DEL_EDGE,
-                      v->from->name, v->to->name, v->options);
+  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 *v;
+  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", from_name, to_name, &options) != 3)
+  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);
@@ -1079,11 +1139,15 @@ cp
 
   /* Check if edge exists */
   
-  v = lookup_edge(from, to);
+  e = lookup_edge(from, to);
   
-  if(v)
+  if(e)
     {
-      /* Check if it matches */
+      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
     {
@@ -1097,12 +1161,17 @@ cp
     {
       other = (connection_t *)node->data;
       if(other->status.active && other != c)
-        send_del_edge(other, v);
+        send_del_edge(other, e);
     }
 
   /* Delete the edge */
   
-  edge_del(v);
+  edge_del(e);
+
+  /* Run MST before or after we tell the rest? */
+
+  mst_kruskal();
+  sssp_bfs(1);
 cp
   return 0;
 }
@@ -1241,7 +1310,7 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       other = (connection_t *)node->data;
-      if(other != c && other->status.active)
+      if(other->status.active && other != c)
         send_request(other, "%d %s", KEY_CHANGED, n->name);
     }
 cp