X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=7c9a3a81369fe3394a920dc1b3c004cc7c3dfcb6;hp=ef6018020cd066f77d31801fefb459771b9aef09;hb=e1184ad15d6b2e7d58bdcb4489026dd0a35b4e5f;hpb=1e2bdc2b6d28c76c63fc9fd36169b90fa0994388

diff --git a/src/protocol.c b/src/protocol.c
index ef601802..7c9a3a81 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.98 2001/07/04 08:41:36 guus Exp $
+    $Id: protocol.c,v 1.28.4.104 2001/08/17 18:14:04 guus Exp $
 */
 
 #include "config.h"
@@ -173,12 +173,9 @@ cp
 
 int id_h(connection_t *cl)
 {
-  connection_t *old;
-  unsigned short int port;
   char name[MAX_STRING_SIZE];
-  avl_node_t *node;
 cp
-  if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &port) != 4)
+  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;
@@ -216,40 +213,6 @@ cp
       return -1;
     }
 
-  /* First check if the host is already in our
-     connection list. If so, we are probably making a loop, which
-     is not desirable.
-   */
-
-  if((old = lookup_id(cl->name)))
-    {
-      if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_NOTICE, _("%s (%s) is already in our connection list"), cl->name, cl->hostname);
-      if(cl->status.outgoing)
-        {
-          cl->status.outgoing = 0;
-          old->status.outgoing = 1;
-        }
-      terminate_connection(cl);
-      return 0;
-    }
-    
-  /* 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... */
-  
-  node = avl_unlink(connection_tree, cl);
-  cl->port = port;
-  if(!avl_insert_node(connection_tree, node))
-    {
-      old = avl_search_node(connection_tree, node)->data;
-      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;
-    }
-    
   /* Read in the public key, so that we can send a metakey */
 
   if(read_rsa_public_key(cl))
@@ -272,23 +235,39 @@ cp
      old connection that has timed out but we don't know it yet.
    */
 
-  while((old = lookup_id(cl->name)))
+  if((old = lookup_id(cl->name)))
     {
       if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
-        cl->name, old->hostname, cl->hostname);
-
-      terminate_connection(old);
+        syslog(LOG_NOTICE, _("Removing old connection for %s at %s in favour of new connection from %s"),
+               cl->name, old->hostname, cl->hostname);
+      if(old->status.outgoing)
+        {
+          cl->status.outgoing = 1;
+          old->status.outgoing = 0;
+        }
+      terminate_connection(old, 0);
+      return 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->status.active = 1;
   cl->nexthop = cl;
   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);
 
@@ -319,11 +298,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 */
 
@@ -340,7 +319,7 @@ cp
               send_add_subnet(cl, subnet);
             }
         }
-    }  
+    }
 cp
   return 0;
 }
@@ -706,7 +685,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
@@ -790,7 +769,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
@@ -850,11 +829,11 @@ cp
 
   if((old = lookup_id(name)))
     {
-      if((new->address == old->address) && (new->port == old->port))
+      if((new->address == old->address) && (new->port == old->port) && (cl == 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;
         }
@@ -864,29 +843,27 @@ cp
             syslog(LOG_NOTICE, _("Removing old entry for %s (%s) in favour of new connection"),
                    old->name, old->hostname);
 
-          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
@@ -937,12 +914,12 @@ cp
       return 0;
     }
 
-  /* 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;
     }
   
@@ -956,15 +933,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
@@ -1030,7 +1006,7 @@ cp
              cl->name, cl->hostname, strerror(err), errorstring);
     }
 
-  terminate_connection(cl);
+  terminate_connection(cl, cl->status.meta);
 cp
   return 0;
 }
@@ -1044,7 +1020,7 @@ cp
 int termreq_h(connection_t *cl)
 {
 cp
-  terminate_connection(cl);
+  terminate_connection(cl, cl->status.meta);
 cp
   return 0;
 }
@@ -1104,7 +1080,7 @@ 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 != cl && p->status.active)
         if(!(p->options & OPTION_INDIRECT) || from == myself)
           send_request(p, "%d %s", KEY_CHANGED, from->name);
     }