X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=10046d17b7b59a55445469dcf3828e2a1e909fb2;hp=f0bf18027064b998d27c864a29a955a88159ce58;hb=d7b4de0e73baf664964f6daaf63526606b6a890b;hpb=5e2ded68bfc7b3a1bfa600c1ce46144eb50e57a2

diff --git a/src/protocol.c b/src/protocol.c
index f0bf1802..10046d17 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.100 2001/07/19 12:29:40 guus Exp $
+    $Id: protocol.c,v 1.28.4.103 2001/07/21 15:34:18 guus Exp $
 */
 
 #include "config.h"
@@ -245,14 +245,10 @@ cp
           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);
@@ -266,7 +262,6 @@ cp
   /* 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;
@@ -307,7 +302,7 @@ cp
     {
       p = (connection_t *)node->data;
       
-      if(p != cl && p->status.active)
+      if(p != cl)
         {
           /* Notify others of this connection */
 
@@ -690,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
@@ -774,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
@@ -834,7 +829,7 @@ 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)"),
@@ -848,7 +843,7 @@ 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);
         }
     }
 
@@ -856,21 +851,19 @@ cp
 
   new->name = xstrdup(name);
   active_add(new);
-  id_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
@@ -921,7 +914,7 @@ 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)))
     {
@@ -940,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
@@ -1014,7 +1006,7 @@ cp
              cl->name, cl->hostname, strerror(err), errorstring);
     }
 
-  terminate_connection(cl);
+  terminate_connection(cl, 1);
 cp
   return 0;
 }
@@ -1028,7 +1020,7 @@ cp
 int termreq_h(connection_t *cl)
 {
 cp
-  terminate_connection(cl);
+  terminate_connection(cl, 1);
 cp
   return 0;
 }
@@ -1088,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);
     }