X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=aab226600a8b01ce48830f22bdc18ca538c0aea7;hp=cf5cd6773c3e6aa57f58be0dcae2dfbf6db14149;hb=6bd93e4c064578b545cb6dcaa28fffb229c929ff;hpb=4f9dad0972ac0f665a1b6050b059bd52f93e6221

diff --git a/src/protocol.c b/src/protocol.c
index cf5cd677..aab22660 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.92 2001/06/05 16:09:55 guus Exp $
+    $Id: protocol.c,v 1.28.4.97 2001/07/01 21:42:13 guus Exp $
 */
 
 #include "config.h"
@@ -227,22 +227,22 @@ cp
       return -1;
     }
 
-  /* First check if the host we connected to is already in our
+  /* First check if the host is already in our
      connection list. If so, we are probably making a loop, which
      is not desirable.
    */
 
-  if(cl->status.outgoing)
+  if((old = lookup_id(cl->name)))
     {
-      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)
         {
-          if(debug_lvl >= DEBUG_CONNECTIONS)
-            syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->name, cl->hostname);
           cl->status.outgoing = 0;
           old->status.outgoing = 1;
-          terminate_connection(cl);
-          return 0;
         }
+      terminate_connection(cl);
+      return 0;
     }
     
   /* Now we can add the name to the id tree */
@@ -253,8 +253,14 @@ cp
   
   node = avl_unlink(connection_tree, cl);
   cl->port = port;
-  avl_insert_node(connection_tree, node);
-
+  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))
@@ -297,6 +303,8 @@ cp
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
 
+  if(cl->status.outgoing)
+    seconds_till_retry = 5;	/* Reset retry timeout */
 cp
   /* Check some options */
   
@@ -1101,17 +1109,16 @@ cp
      This reduces unnecessary key_changed broadcasts.
   */
 
-  if(mykeyused)
+  if(from==myself && !mykeyused)
+    return 0;
+
+  for(node = connection_tree->head; node; node = node->next)
     {
-      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);
-        }
-    mykeyused = 0;
-  }
+      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);
+    }
 cp
   return 0;
 }