X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=e9ee9665de3cdd39a600d40f2028c2ea89709a8e;hp=8d9a551c939daa3901075cd6162ca90477c65397;hb=24a2c7e51a0b080c4bdb55f697b3f0458ebc3fb1;hpb=319e0cb48eb00565a11c85b901f54141f8160334

diff --git a/src/protocol.c b/src/protocol.c
index 8d9a551c..e9ee9665 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.99 2001/07/15 18:07:31 guus Exp $
+    $Id: protocol.c,v 1.28.4.106 2001/09/24 14:12:00 guus Exp $
 */
 
 #include "config.h"
@@ -173,7 +173,6 @@ cp
 
 int id_h(connection_t *cl)
 {
-  connection_t *old;
   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)
@@ -206,17 +205,6 @@ cp
     
   cl->name = xstrdup(name);
 
-  /* Make sure we don't make an outgoing connection to a host that is already in our connection list */
-
-  if(cl->status.outgoing)
-    if((old = lookup_id(cl->name)))
-      {
-        if(debug_lvl >= DEBUG_CONNECTIONS)
-          syslog(LOG_NOTICE, _("We are already connected to %s."), cl->name);
-        old->status.outgoing = 1;
-        return -1;
-      }
-    
   /* Load information about peer */
 
   if(read_host_config(cl))
@@ -250,21 +238,17 @@ cp
   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 from %s"),
-               cl->name, old->hostname, cl->hostname);
+        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);
+      terminate_connection(old, 0);
       return 0;
     }
     
-  /* Now we can add the name to the id tree */
-  
-  id_add(cl);
-
   /* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
   
   old = avl_search(active_tree, cl);
@@ -278,8 +262,8 @@ cp
   /* Activate this connection */
 
   cl->allow_request = ALL;
-  cl->status.active = 1;
   cl->nexthop = cl;
+  cl->lastbutonehop = myself;
   cl->cipher_pkttype = EVP_bf_cbc();
   cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
 
@@ -315,11 +299,11 @@ cp
 
   /* And send him all the hosts and their subnets we know... */
   
-  for(node = connection_tree->head; node; node = node->next)
+  for(node = active_tree->head; node; node = node->next)
     {
       p = (connection_t *)node->data;
       
-      if(p != cl && p->status.active)
+      if(p != cl)
         {
           /* Notify others of this connection */
 
@@ -336,7 +320,7 @@ cp
               send_add_subnet(cl, subnet);
             }
         }
-    }  
+    }
 cp
   return 0;
 }
@@ -632,10 +616,7 @@ int send_add_subnet(connection_t *cl, subnet_t *subnet)
   char *netstr;
   char *owner;
 cp
-  if((cl->options | myself->options | subnet->owner->options) & OPTION_INDIRECT)
-    owner = myself->name;
-  else
-    owner = subnet->owner->name;
+  owner = subnet->owner->name;
 
   x = send_request(cl, "%d %s %s", ADD_SUBNET,
                       owner, netstr = net2str(subnet));
@@ -702,7 +683,7 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       p = (connection_t *)node->data;
-      if(p->status.meta && p->status.active && p!= cl)
+      if(p->status.active && p!= cl)
         send_add_subnet(p, subnet);
     }
 cp
@@ -715,10 +696,7 @@ int send_del_subnet(connection_t *cl, subnet_t *subnet)
   char *netstr;
   char *owner;
 cp
-  if(cl->options & OPTION_INDIRECT)
-    owner = myself->name;
-  else
-    owner = subnet->owner->name;
+  owner = subnet->owner->name;
 
   x = send_request(cl, "%d %s %s", DEL_SUBNET, owner, netstr = net2str(subnet));
   free(netstr);
@@ -786,7 +764,7 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       p = (connection_t *)node->data;
-      if(p->status.meta && p->status.active && p!= cl)
+      if(p->status.active && p!= cl)
         send_del_subnet(p, subnet);
     }
 cp
@@ -798,22 +776,19 @@ cp
 int send_add_host(connection_t *cl, connection_t *other)
 {
 cp
-  if(!((cl->options | myself->options | other->options) & OPTION_INDIRECT))
-    return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
-                      other->name, other->address, other->port, other->options);
-  else
-    return 0;
+  return send_request(cl, "%d %s %lx:%d %lx %s", ADD_HOST,
+                      other->name, other->address, other->port, other->options, other->lastbutonehop->name);
 }
 
 int add_host_h(connection_t *cl)
 {
   connection_t *old, *new, *p;
-  char name[MAX_STRING_SIZE];
+  char name[MAX_STRING_SIZE], lastbutone[MAX_STRING_SIZE];
   avl_node_t *node;
 cp
   new = new_connection();
 
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx", name, &new->address, &new->port, &new->options) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &new->address, &new->port, &new->options, lastbutone) != 5)
     {
        syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -828,61 +803,74 @@ cp
       return -1;
     }
 
+  if(check_id(lastbutone))
+    {
+      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid lastbutone 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, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
-      sighup = 1;
+      syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) for ourself!"), cl->name, cl->hostname);
       free_connection(new);
-      return 0;
+      return -1;
     }
     
   /* Fill in more of the new connection structure */
 
   new->hostname = hostlookup(htonl(new->address));
 
+  new->lastbutonehop = lookup_id(lastbutone);
+  
+  if(!new->lastbutonehop)
+    {
+      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): unknown lastbutone"), 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))
+      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, name, new->hostname);
+                   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) in favour of new connection"),
-                   old->name, old->hostname);
+            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);
+          terminate_connection(old, 0);
         }
     }
 
-  /* Hook it up into the connection */
+  /* Hook it up into the active tree */
 
   new->name = xstrdup(name);
-  connection_add(new);
-  id_add(new);
+  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.meta && p->status.active && p!=cl)
+      if(p->status.active && p!=cl)
         send_add_host(p, new);
     }
 
   /* Fill in rest of connection structure */
 
   new->nexthop = cl;
-  new->status.active = 1;
   new->cipher_pkttype = EVP_bf_cbc();
   new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
 cp
@@ -892,23 +880,20 @@ cp
 int send_del_host(connection_t *cl, connection_t *other)
 {
 cp
-  if(!((cl->options | myself->options) & OPTION_INDIRECT))
-    return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
-                      other->name, other->address, other->port, other->options);
-  else
-    return 0;
+  return send_request(cl, "%d %s %lx:%d %lx %s", DEL_HOST,
+                      other->name, other->address, other->port, other->options, other->lastbutonehop->name);
 }
 
 int del_host_h(connection_t *cl)
 {
-  char name[MAX_STRING_SIZE];
+  char name[MAX_STRING_SIZE], lastbutone[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", name, &address, &port, &options) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx "MAX_STRING, name, &address, &port, &options, lastbutone) != 5)
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
              cl->name, cl->hostname);
@@ -923,28 +908,33 @@ cp
       return -1;
     }
 
+  if(check_id(lastbutone))
+    {
+      syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid lastbutone name"), cl->name, cl->hostname);
+      return -1;
+    }
+
   /* Check if somebody tries to delete ourself */
 
   if(!strcmp(name, myself->name))
     {
-      syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
+      syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for ourself!"),
              cl->name, cl->hostname);
-      sighup = 1;
-      return 0;
+      return -1;
     }
 
-  /* Check if the new host already exists in the connnection list */
+  /* 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"),
-             name, cl->name, cl->hostname);
+             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)
+  if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop || strcmp(lastbutone, old->lastbutonehop->name))
     {
       syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
       return 0;
@@ -952,15 +942,14 @@ cp
 
   /* Ok, since EVERYTHING seems to check out all right, delete it */
 
-  old->status.active = 0;
-  terminate_connection(old);
+  terminate_connection(old, 0);
 
-  /* Tell the rest about the new host */
+  /* Tell the rest about the deleted host */
 
   for(node = connection_tree->head; node; node = node->next)
     {
       p = (connection_t *)node->data;
-      if(p->status.meta && p->status.active && p!=cl)
+      if(p->status.active && p!=cl)
         send_del_host(p, old);
     }
 cp
@@ -1026,7 +1015,7 @@ cp
              cl->name, cl->hostname, strerror(err), errorstring);
     }
 
-  terminate_connection(cl);
+  terminate_connection(cl, cl->status.meta);
 cp
   return 0;
 }
@@ -1040,7 +1029,7 @@ cp
 int termreq_h(connection_t *cl)
 {
 cp
-  terminate_connection(cl);
+  terminate_connection(cl, cl->status.meta);
 cp
   return 0;
 }
@@ -1100,9 +1089,8 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       p = (connection_t *)node->data;
-      if(p != cl && p->status.meta && p->status.active)
-        if(!(p->options & OPTION_INDIRECT) || from == myself)
-          send_request(p, "%d %s", KEY_CHANGED, from->name);
+      if(p != cl && p->status.active)
+        send_request(p, "%d %s", KEY_CHANGED, from->name);
     }
 cp
   return 0;
@@ -1130,8 +1118,7 @@ cp
   from->status.validkey = 0;
   from->status.waitingforkey = 0;
 
-  if(!(from->options | cl->options | myself->options) & OPTION_INDIRECT)
-    send_key_changed(from, cl);
+  send_key_changed(from, cl);
 cp
   return 0;
 }